From 029704f12c74434c7afaa6386dc38d577ba853f8 Mon Sep 17 00:00:00 2001 From: Dustyn Gibson <miigotu@gmail.com> Date: Sat, 25 Jul 2015 00:04:48 -0700 Subject: [PATCH] Clean up some code in kat.py --- sickbeard/providers/kat.py | 59 +++++++++++++++----------------------- 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py index 3d50c8155..4e6d2f93b 100644 --- a/sickbeard/providers/kat.py +++ b/sickbeard/providers/kat.py @@ -165,20 +165,17 @@ class KATProvider(generic.TorrentProvider): search_string = {'Season': []} for show_name in set(allPossibleShowNames(self.show)): + ep_string = sanitizeSceneName(show_name) + ' ' if ep_obj.show.air_by_date or ep_obj.show.sports: - ep_string = show_name + ' ' + str(ep_obj.airdate).split('-')[0] - search_string['Season'].append(ep_string) - ep_string = show_name + ' Season ' + str(ep_obj.airdate).split('-')[0] + ep_string += str(ep_obj.airdate).split('-')[0] search_string['Season'].append(ep_string) elif ep_obj.show.anime: - ep_string = show_name + ' ' + "%02d" % ep_obj.scene_absolute_number + ep_string += "%02d" % ep_obj.scene_absolute_number search_string['Season'].append(ep_string) else: - ep_string = show_name + ' S%02d' % int(ep_obj.scene_season) + ' -S%02d' % int( - ep_obj.scene_season) + 'E' + ' category:tv' #1) showName SXX -SXXE + ep_string = '%s S%02d -S%02dE category:tv' % (sanitizeSceneName(show_name), ep_obj.scene_season, ep_obj.scene_season) #1) showName SXX -SXXE search_string['Season'].append(ep_string) - ep_string = show_name + ' "Season ' + str( - ep_obj.scene_season) + '" -Ep*' + ' category:tv' # 2) showName "Season X" + ep_string = '%s "Season %d" -Ep* category:tv' % (sanitizeSceneName(show_name), ep_obj.scene_season) # 2) showName "Season X" search_string['Season'].append(ep_string) return [search_string] @@ -186,40 +183,30 @@ class KATProvider(generic.TorrentProvider): def _get_episode_search_strings(self, ep_obj, add_string=''): search_string = {'Episode': []} - if self.show.air_by_date: - for show_name in set(allPossibleShowNames(self.show)): - ep_string = sanitizeSceneName(show_name) + ' ' + \ - str(ep_obj.airdate).replace('-', ' ') - search_string['Episode'].append(ep_string) - elif self.show.sports: - for show_name in set(allPossibleShowNames(self.show)): - ep_string = sanitizeSceneName(show_name) + ' ' + \ - str(ep_obj.airdate).replace('-', '|') + '|' + \ - ep_obj.airdate.strftime('%b') - search_string['Episode'].append(ep_string) - elif self.show.anime: - for show_name in set(allPossibleShowNames(self.show)): - ep_string = sanitizeSceneName(show_name) + ' ' + \ - "%02i" % int(ep_obj.scene_absolute_number) - search_string['Episode'].append(ep_string) - else: - for show_name in set(allPossibleShowNames(self.show)): - ep_string = sanitizeSceneName(show_name) + ' ' + \ - sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + '|' + \ - sickbeard.config.naming_ep_type[0] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + ' %s category:tv' % add_string - search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) + for show_name in set(allPossibleShowNames(self.show)): + ep_string = sanitizeSceneName(show_name) + ' ' + if self.show.air_by_date: + ep_string += str(ep_obj.airdate).replace('-', ' ') + elif self.show.sports: + ep_string += str(ep_obj.airdate).replace('-', ' ') + '|' + ep_obj.airdate.strftime('%b') + elif self.show.anime: + ep_string += "%02d" % ep_obj.scene_absolute_number + else: + ep_string += sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, + 'episodenumber': ep_obj.scene_episode} + '|' + \ + sickbeard.config.naming_ep_type[0] % {'seasonnumber': ep_obj.scene_season, + 'episodenumber': ep_obj.scene_episode} + ' category:tv' + if add_string: + ep_string += ' ' + add_string + + search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) return [search_string] def _get_size(self, item): title, url, id, seeders, leechers, size, pubdate = item - if not size: - return -1 - - return size + return size or -1 def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0, epObj=None): -- GitLab