");var k=c.children("div"),d=k.height(),h=k.html(c.data("oCnt")).css("height","").height();k.css("height",d);
+k.animate({height:h},f,function(){k.height("auto");g()});c.removeClass(a.o.hideClass).addClass(a.o.showClass);break;case "block":a.blockMode(c,"show",f,g)}a.status=1;if(!0==a.o.lockHide)return c.find("[data-ctrl]").remove(),"";if("block"==a.mode)c.off("click.coll").on("click.coll",function(b){b.preventDefault();a.hide(c)});else 0!=c.find("[data-ctrl]").length||e.isFunction(a.o.controlBtn)||c.append(a.ctrlHtml),a.ctrlBtn=e.isFunction(a.o.controlBtn)?a.o.controlBtn.call(a.e):e(c.find("[data-ctrl]")),
+a.ctrlBtn.off("click.coll").on("click.coll",function(b){b.preventDefault();a.hide(c)}).html(a.o.hideText)},hide:function(b,f){var a=this,c=e(b);"undefined"===typeof f&&(f=a.o.speed);var g=function(){e.isFunction(a.o.afterHide)&&a.o.afterHide.call(a.e,a)};e.isFunction(a.o.beforeHide)&&a.o.beforeHide.call(a.e,a);c.find("[data-ctrl]").remove();switch(a.mode){case "chars":var d=e.trim(c.text());a.remaining.chars=d.length-a.o.truncate;d.length>a.o.truncate&&(c.data("tHTML",c.html()),d=a.pad(d.slice(0,
+a.o.truncate),d.slice(a.o.truncate,d.length)),c.html(d).removeClass(a.o.showClass).addClass(a.o.hideClass),g());break;case "words":d=e.trim(c.text());d=d.split(" ");a.remaining.words=d.length-a.o.truncate;d.length>a.o.truncate&&(c.data("tHTML",c.html()),d=a.pad(d.slice(0,a.o.truncate).join(" "),d.slice(a.o.truncate,d.length).join(" ")),c.html(d).removeClass(a.o.showClass).addClass(a.o.hideClass),g());break;case "lines":0==c.children("div").length&&c.wrapInner("
");d=c.children("div").css("height",
+"");d.html(d.text());var h=d.height();"undefined"===typeof c.data("lHeight")?(temp=d.clone(),lHeight=temp.text("a").insertAfter(d).height(),c.data("lHeight",lHeight),d.next().remove()):lHeight=c.data("lHeight");lines=h/lHeight;a.remaining.lines=lines-a.o.truncate;0
'+this.o.ellipsis+""+(e.isFunction(this.o.ctrlBtn)?"":this.ctrlHtml)+''+f+""},blockMode:function(b,f,a,c){var g=["fadeOut","slideUp","fadeIn","slideDown"],d="fade"==this.o.effect?0:1,g="hide"==f?g[d]:g[d+2];if(e.isFunction(this.o.target))this.o.target.call(this.e)[g](a,c);else if(e.fn[this.o.target])e(b)[this.o.target]()[g](a,
+c);"show"==f?(b.removeClass(this.o.showClass).addClass(this.o.hideClass),this.o.changeText&&b.text(this.o.hideText)):(b.removeClass(this.o.hideClass).addClass(this.o.showClass),this.o.changeText&&b.text(this.o.showText))},reInit:function(b){b.find("[data-ctrl]").remove();b.html(this.e.data("oCnt"));0==this.status?this.hide(b,0):this.show(b,0)}};e.fn.collapser=function(b){return this.each(function(){e.data(this,"collapser")||e.data(this,"collapser",new l(this,b))})}})(jQuery,window,document);
\ No newline at end of file
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 79af0236..352e89a6 100755
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -153,6 +153,9 @@ TRASH_ROTATE_LOGS = False
HOME_SEARCH_FOCUS = True
SORT_ARTICLE = False
DEBUG = False
+DISPLAY_BACKGROUND = False
+DISPLAY_BACKGROUND_TRANSPARENT = None
+DISPLAY_ALL_SEASONS = True
USE_LISTVIEW = False
METADATA_XBMC = None
@@ -524,7 +527,7 @@ def initialize(consoleLogging=True):
AUTOPOSTPROCESSER_FREQUENCY, DEFAULT_AUTOPOSTPROCESSER_FREQUENCY, MIN_AUTOPOSTPROCESSER_FREQUENCY, \
ANIME_DEFAULT, NAMING_ANIME, USE_ANIDB, ANIDB_USERNAME, ANIDB_PASSWORD, ANIDB_USE_MYLIST, \
ANIME_SPLIT_HOME, SCENE_DEFAULT, BACKLOG_DAYS, ANIME_TREAT_AS_HDTV, \
- COOKIE_SECRET, USE_IMDB_INFO
+ COOKIE_SECRET, USE_IMDB_INFO, DISPLAY_BACKGROUND, DISPLAY_BACKGROUND_TRANSPARENT, DISPLAY_ALL_SEASONS
if __INITIALIZED__:
return False
@@ -595,6 +598,9 @@ def initialize(consoleLogging=True):
TIME_PRESET_W_SECONDS = check_setting_str(CFG, 'GUI', 'time_preset', '%I:%M:%S %p')
TIME_PRESET = TIME_PRESET_W_SECONDS.replace(u":%S", u"")
TIMEZONE_DISPLAY = check_setting_str(CFG, 'GUI', 'timezone_display', 'network')
+ DISPLAY_BACKGROUND = bool(check_setting_int(CFG, 'General', 'display_background', 0))
+ DISPLAY_BACKGROUND_TRANSPARENT = check_setting_str(CFG, 'General', 'display_background_transparent', 'transparent')
+ DISPLAY_ALL_SEASONS = bool(check_setting_int(CFG, 'General', 'display_all_seasons', 1))
ACTUAL_LOG_DIR = check_setting_str(CFG, 'General', 'log_dir', 'Logs')
# put the log dir inside the data dir, unless an absolute path
@@ -1472,6 +1478,9 @@ def save_config():
new_config['General']['sort_article'] = int(SORT_ARTICLE)
new_config['General']['proxy_setting'] = PROXY_SETTING
new_config['General']['proxy_indexers'] = int(PROXY_INDEXERS)
+ new_config['General']['display_background'] = int(DISPLAY_BACKGROUND)
+ new_config['General']['display_background_transparent'] = DISPLAY_BACKGROUND_TRANSPARENT
+ new_config['General']['display_all_seasons'] = int(DISPLAY_ALL_SEASONS)
new_config['General']['use_listview'] = int(USE_LISTVIEW)
new_config['General']['metadata_xbmc'] = METADATA_XBMC
diff --git a/sickbeard/databases/mainDB.py b/sickbeard/databases/mainDB.py
index 59616b50..fe4ea879 100644
--- a/sickbeard/databases/mainDB.py
+++ b/sickbeard/databases/mainDB.py
@@ -27,7 +27,7 @@ from sickbeard import encodingKludge as ek
from sickbeard.name_parser.parser import NameParser, InvalidNameException, InvalidShowException
MIN_DB_VERSION = 9 # oldest db version we support migrating from
-MAX_DB_VERSION = 20001
+MAX_DB_VERSION = 20002
class MainSanityCheck(db.DBSanityCheck):
@@ -960,6 +960,16 @@ class DBIncreaseTo20001(db.SchemaUpgrade):
return self.checkDBVersion()
+class AddTvShowOverview(db.SchemaUpgrade):
+ def execute(self):
+ backup_database(self.checkDBVersion())
+
+ logger.log(u'Adding column overview to tv_shows')
+ self.addColumn('tv_shows', 'overview', 'TEXT', '')
+
+ self.setDBVersion(20002)
+ return self.checkDBVersion()
+
# 10001 -> 10000
class RemoveDefaultEpStatusFromTvShows(db.SchemaUpgrade):
def execute(self):
diff --git a/sickbeard/db.py b/sickbeard/db.py
index 0818f5c1..0ef25659 100644
--- a/sickbeard/db.py
+++ b/sickbeard/db.py
@@ -412,7 +412,7 @@ def MigrationCode(myDB):
10001: sickbeard.mainDB.RemoveDefaultEpStatusFromTvShows,
20000: sickbeard.mainDB.DBIncreaseTo20001,
- # 20001: sickbeard.mainDB.AddCoolSickGearFeature2,
+ 20001: sickbeard.mainDB.AddTvShowOverview,
# 20002: sickbeard.mainDB.AddCoolSickGearFeature3,
}
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index 28d8e8b4..362eac75 100644
--- a/sickbeard/tv.py
+++ b/sickbeard/tv.py
@@ -98,6 +98,7 @@ class TVShow(object):
self._scene = 0
self._rls_ignore_words = ""
self._rls_require_words = ""
+ self._overview = ''
self.dirty = True
@@ -141,6 +142,7 @@ class TVShow(object):
scene = property(lambda self: self._scene, dirty_setter("_scene"))
rls_ignore_words = property(lambda self: self._rls_ignore_words, dirty_setter("_rls_ignore_words"))
rls_require_words = property(lambda self: self._rls_require_words, dirty_setter("_rls_require_words"))
+ overview = property(lambda self: self._overview, dirty_setter('_overview'))
@property
def is_anime(self):
@@ -832,6 +834,9 @@ class TVShow(object):
if self.is_anime:
self.release_groups = BlackAndWhiteList(self.indexerid)
+ if not self.overview:
+ self.overview = sqlResults[0]['overview']
+
logger.log(str(self.indexerid) + u': Show info [%s] loaded from database' % self.name)
# Get IMDb_info from database
@@ -895,6 +900,7 @@ class TVShow(object):
self.startyear = int(str(myEp["firstaired"]).split('-')[0])
self.status = getattr(myEp, 'status', '')
+ self.overview = getattr(myEp, 'overview', '')
def load_imdb_info(self):
@@ -1184,7 +1190,8 @@ class TVShow(object):
"imdb_id": self.imdbid,
"last_update_indexer": self.last_update_indexer,
"rls_ignore_words": self.rls_ignore_words,
- "rls_require_words": self.rls_require_words
+ 'rls_require_words': self.rls_require_words,
+ 'overview': self.overview
}
myDB = db.DBConnection()
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 76842872..79186380 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -3365,7 +3365,8 @@ class ConfigGeneral(Config):
handle_reverse_proxy=None, home_search_focus=None, sort_article=None, auto_update=None, notify_on_update=None,
proxy_setting=None, proxy_indexers=None, anon_redirect=None, git_path=None, git_remote=None, calendar_unprotected=None,
fuzzy_dating=None, trim_zero=None, date_preset=None, date_preset_na=None, time_preset=None,
- indexer_timeout=None, rootDir=None, theme_name=None, default_home=None, use_imdb_info=None):
+ indexer_timeout=None, rootDir=None, theme_name=None, default_home=None, use_imdb_info=None,
+ display_background=None, display_background_transparent=None, display_all_seasons=None):
results = []
@@ -3384,6 +3385,9 @@ class ConfigGeneral(Config):
sickbeard.LAUNCH_BROWSER = config.checkbox_to_value(launch_browser)
sickbeard.HOME_SEARCH_FOCUS = config.checkbox_to_value(home_search_focus)
sickbeard.USE_IMDB_INFO = config.checkbox_to_value(use_imdb_info)
+ sickbeard.DISPLAY_BACKGROUND = config.checkbox_to_value(display_background)
+ sickbeard.DISPLAY_BACKGROUND_TRANSPARENT = display_background_transparent
+ sickbeard.DISPLAY_ALL_SEASONS = config.checkbox_to_value(display_all_seasons)
sickbeard.SORT_ARTICLE = config.checkbox_to_value(sort_article)
sickbeard.CPU_PRESET = cpu_preset
sickbeard.ANON_REDIRECT = anon_redirect
- #end for
- #end if
- #if 'year' in $show.imdb_info:
- #echo ('(%s) - ' % $show.imdb_info['year'], '')['' == $show.imdb_info['year']]##echo ('%s minutes' % $show.imdb_info['runtimes'], '')['' == $show.imdb_info['runtimes']]#
- #end if
- ![[imdb]]($sbRoot/images/imdb.png){kind=small}
+ .config['icon']){kind=small}
+ ![[xem]]($sbRoot/images/xem.png){kind=small}
+ 
+#if $showLoc[1]:
+ $showLoc[0]
+#else:
+ $showLoc[0]
+#end if
+ $sickbeard.helpers.human(sickbeard.helpers.get_size($showLoc[0]))
+#set $filecount = $epCounts[$Overview.QUAL] + $epCounts[$Overview.GOOD]
+ $filecount Files
+#if $show.exceptions:
+ Scene Names
+#end if
+#if $sickbeard.USE_SUBTITLES
+ #if int($show.subtitles) == 1:
+ Subtitles
+ #end if
+#end if
+#if $show.flatten_folders == 1 or $sickbeard.NAMING_FORCE_FOLDERS:
+ Flat Folders
+#end if
+#if int($show.air_by_date) == 1:
+ Air-by-Date
+#end if
+#if int($show.is_sports) == 1:
+ Sports
+#end if
+#if int($show.is_anime) == 1:
+ Anime
+#end if
+#if int($show.dvdorder) == 1:
+ DVD Order
+#end if
+#if int($show.scene) == 1:
+ Scene Numbering
+#end if
+#if $anyQualities + $bestQualities
+ #if int($show.archive_firstmatch) == 1
+ Archive First Match
#end if
-#end if[1 == int($show.paused)]#){kind=small}
[1 == int($show.archive_firstmatch)]#){kind=small}
[1 == $show.flatten_folders or $sickbeard.NAMING_FORCE_FOLDERS]#){kind=small}
[1 == int($show.air_by_date)]#){kind=small}
[1 == int($show.dvdorder)]#){kind=small}
[1 == int($show.scene)]#){kind=small}
[1 == int($show.subtitles)]#){kind=small}
[1 == int($show.is_sports)]#){kind=small}
[1 == int($show.is_anime)]#){kind=small}
- #end if
- #end for
- #end if
+ #end if
+ #end for
+ #end if
