diff --git a/gui/slick/interfaces/default/home.tmpl b/gui/slick/interfaces/default/home.tmpl index 17520e79..fe1403b4 100644 --- a/gui/slick/interfaces/default/home.tmpl +++ b/gui/slick/interfaces/default/home.tmpl @@ -280,10 +280,13 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name)) #set $cur_downloaded = 0 #set $cur_total = 0 #set $download_stat_tip = '' - #if None is not $curShow.status and re.search(r'(?i)(?:new|returning)\s*series', $curShow.status) - #set $display_status = 'Continuing' - #else - #set $display_status = $curShow.status + #set $display_status = $curShow.status + #if None is not $display_status + #if re.search(r'(?i)(?:new|returning)\s*series', $curShow.status) + #set $display_status = 'Continuing' + #else if re.search(r'(?i)(?:nded)', $curShow.status) + #set $display_status = 'Ended' + #end if #end if #if $curShow.indexerid in $show_stat: @@ -604,11 +607,17 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name)) -#if None is not $curShow.status and re.search(r'(?i)(?:new|returning)\s*series', $curShow.status) - Continuing -#else: - $curShow.status +#set $display_status = $curShow.status +#if None is not $display_status + #if re.search(r'(?i)(?:new|returning)\s*series', $curShow.status) + #set $display_status = 'Continuing' + #else if re.search(r'(?i)(?:nded)', $curShow.status) + #set $display_status = 'Ended' + #end if #end if + + $display_status + diff --git a/lib/tvdb_api/tvdb_api.py b/lib/tvdb_api/tvdb_api.py index 00a3bf89..a640ed5e 100644 --- a/lib/tvdb_api/tvdb_api.py +++ b/lib/tvdb_api/tvdb_api.py @@ -870,9 +870,12 @@ class Tvdb: else: url = self.config['url_epInfo'] % (sid, language) - epsEt = self._getetsrc(url, language=language) + try: + epsEt = self._getetsrc(url, language=language) + episodes = epsEt["episode"] + except: + return False - episodes = epsEt["episode"] if not isinstance(episodes, list): episodes = [episodes] diff --git a/lib/tvrage_api/tvrage_api.py b/lib/tvrage_api/tvrage_api.py index 74dd0791..0d9ca3ae 100644 --- a/lib/tvrage_api/tvrage_api.py +++ b/lib/tvrage_api/tvrage_api.py @@ -604,9 +604,13 @@ class TVRage: log().debug('Getting all episodes of %s' % (sid)) self.config['params_epInfo']['sid'] = sid - epsEt = self._getetsrc(self.config['url_epInfo'], self.config['params_epInfo']) - seasons = epsEt['episodelist']['season'] + try: + epsEt = self._getetsrc(self.config['url_epInfo'], self.config['params_epInfo']) + seasons = epsEt['episodelist']['season'] + except: + return False + if not isinstance(seasons, list): seasons = [seasons]