diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py index bbf78164..6bd2aec3 100644 --- a/sickbeard/providers/kat.py +++ b/sickbeard/providers/kat.py @@ -12,7 +12,7 @@ # SickRage is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with SickRage. If not, see . @@ -177,16 +177,20 @@ class KATProvider(generic.TorrentProvider): if not (ep_obj.show.air_by_date or ep_obj.show.sports): for show_name in set(allPossibleShowNames(self.show)): if ep_obj.show.air_by_date or ep_obj.show.sports: - ep_string = show_name + str(ep_obj.airdate).split('-')[0] + ' category:tv' #2) showName Season X + 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] + search_string['Season'].append(ep_string) + elif ep_obj.show.anime: + ep_string = show_name + ' ' + "%d" % 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 - search_string['Season'].append(ep_string) - - if ep_obj.show.air_by_date or ep_obj.show.sports: - ep_string = show_name + ' Season ' + str(ep_obj.airdate).split('-')[0] + ' category:tv' #2) showName Season X - else: - ep_string = show_name + ' Season ' + str(ep_obj.scene_season) + ' -Ep*' + ' category:tv' #2) showName Season X - search_string['Season'].append(ep_string) + 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 + search_string['Season'].append(ep_string) + ep_string = show_name + ' Season ' + str( + ep_obj.scene_season) + ' -Ep*' + ' category:tv' # 2) showName Season X + search_string['Season'].append(ep_string) return [search_string] @@ -196,7 +200,7 @@ class KATProvider(generic.TorrentProvider): if self.show.air_by_date: for show_name in set(allPossibleShowNames(self.show)): ep_string = sanitizeSceneName(show_name) + ' ' + \ - str(ep_obj.airdate).replace('-','|') + str(ep_obj.airdate).replace('-', '|') search_string['Episode'].append(ep_string) elif self.show.sports: for show_name in set(allPossibleShowNames(self.show)): @@ -204,13 +208,18 @@ class KATProvider(generic.TorrentProvider): 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) + ' ' + \ + "%i" % 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 + 'episodenumber': ep_obj.scene_episode} + ' %s category:tv' % add_string search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) return [search_string] @@ -250,10 +259,11 @@ class KATProvider(generic.TorrentProvider): for tr in torrent_rows[1:]: try: - link = urlparse.urljoin(self.url,(tr.find('div', {'class': 'torrentname'}).find_all('a')[1])['href']) + link = urlparse.urljoin(self.url, + (tr.find('div', {'class': 'torrentname'}).find_all('a')[1])['href']) id = tr.get('id')[-7:] title = (tr.find('div', {'class': 'torrentname'}).find_all('a')[1]).text \ - or (tr.find('div', {'class': 'torrentname'}).find_all('a')[2]).text + or (tr.find('div', {'class': 'torrentname'}).find_all('a')[2]).text url = tr.find('a', 'imagnet')['href'] verified = True if tr.find('a', 'iverify') else False trusted = True if tr.find('img', {'alt': 'verified'}) else False @@ -318,7 +328,7 @@ class KATProvider(generic.TorrentProvider): proxies = { "http": sickbeard.PROXY_SETTING, "https": sickbeard.PROXY_SETTING, - } + } r = self.session.get(url, proxies=proxies, verify=False) else: @@ -454,7 +464,7 @@ class KATCache(tvcache.TVCache): if not title or not url: return None - logger.log(u"Attempting to cache item:[" + title +"]", logger.DEBUG) + logger.log(u"Attempting to cache item:[" + title + "]", logger.DEBUG) return self._addCacheEntry(title, url)