More fixes for strftime and findpropers

This commit is contained in:
echel0n 2014-04-29 08:16:17 -07:00
parent cc0296783b
commit 77bc5c7291
11 changed files with 20 additions and 20 deletions

View file

@ -264,10 +264,10 @@ class GenericProvider:
logger.log(u'Searching "%s" for "%s" as "%s"' % (self.name, ep_obj.prettyName(), ep_obj.scene_prettyName()))
if seasonSearch:
for curString in self._get_season_search_strings(ep_obj.scene_season, ep_obj.scene_episode):
for curString in self._get_season_search_strings(ep_obj.scene_season, ep_obj.airdate if show.air_by_date or show.sports else ep_obj.scene_episode):
itemList += self._doSearch(curString, show=show)
else:
for curString in self._get_episode_search_strings(ep_obj.scene_season, ep_obj.scene_episode):
for curString in self._get_episode_search_strings(ep_obj.scene_season, ep_obj.airdate if show.air_by_date or show.sports else ep_obj.scene_episode):
itemList += self._doSearch(curString, show=show)
for item in itemList:

View file

@ -306,10 +306,10 @@ class HDTorrentsProvider(generic.TorrentProvider):
return []
for sqlshow in sqlResults:
curshow = helpers.findCertainshow(sickbeard.showList, int(sqlshow["showid"]))
self.show = self.show = curshow = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
curEp = curshow.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))
searchString = self._get_episode_search_strings(curshow, curEp.scene_season, curEp.scene_episode, add_string='PROPER|REPACK')
searchString = self._get_episode_search_strings(curEp.scene_season, curEp.airdate if curshow.air_by_date or curshow.sports else curEp.scene_episode, add_string='PROPER|REPACK')
for item in self._doSearch(searchString[0], show=curshow):
title, url = self._get_title_and_url(item)

View file

@ -255,7 +255,7 @@ class IPTorrentsProvider(generic.TorrentProvider):
return []
for sqlshow in sqlResults:
curshow = helpers.findCertainshow(sickbeard.showList, int(sqlshow["showid"]))
self.show = curshow = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
curEp = curshow.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))
searchString = self._get_episode_search_strings(curshow, curEp.scene_season, curEp.scene_episode, curshow.air_by_date or curshow.sports, add_string='PROPER|REPACK')

View file

@ -380,10 +380,10 @@ class KATProvider(generic.TorrentProvider):
return []
for sqlshow in sqlResults:
curshow = helpers.findCertainshow(sickbeard.showList, int(sqlshow["showid"]))
self.show = curshow = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
curEp = curshow.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))
searchString = self._get_episode_search_strings(curshow, curEp.scene_season, curEp.scene_episode, add_string='PROPER|REPACK')
searchString = self._get_episode_search_strings(curEp.scene_season, curEp.airdate if curshow.air_by_date or curshow.sports else curEp.scene_episode, add_string='PROPER|REPACK')
for item in self._doSearch(searchString[0], show=curshow):
title, url = self._get_title_and_url(item)

View file

@ -303,9 +303,9 @@ class NextGenProvider(generic.TorrentProvider):
return []
for sqlshow in sqlResults:
curshow = helpers.findCertainshow(sickbeard.showList, int(sqlshow["showid"]))
self.show = curshow = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
curEp = curshow.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))
searchString = self._get_episode_search_strings(curshow, curEp.scene_season, curEp.scene_episode, add_string='PROPER|REPACK')
searchString = self._get_episode_search_strings(curEp.scene_season, curEp.airdate if curshow.air_by_date or curshow.sports else curEp.scene_episode, add_string='PROPER|REPACK')
for item in self._doSearch(searchString[0], show=curshow):
title, url = self._get_title_and_url(item)

View file

@ -275,7 +275,7 @@ class PublicHDProvider(generic.TorrentProvider):
return []
for sqlshow in sqlResults:
curshow = helpers.findCertainshow(sickbeard.showList, int(sqlshow["showid"]))
self.show = curshow = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
curEp = curshow.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))
season = curEp.scene_season
@ -283,7 +283,7 @@ class PublicHDProvider(generic.TorrentProvider):
if curshow.air_by_date or curshow.sports:
episode = curEp.airdate
searchString = self._get_episode_search_strings(curshow, curEp.scene_season, curEp.scene_episode, add_string='PROPER|REPACK')
searchString = self._get_episode_search_strings(curEp.scene_season, curEp.airdate if curshow.air_by_date or curshow.sports else curEp.scene_episode, add_string='PROPER|REPACK')
for item in self._doSearch(searchString[0], show=curshow):
title, url = self._get_title_and_url(item)

View file

@ -277,7 +277,7 @@ class SCCProvider(generic.TorrentProvider):
return []
for sqlshow in sqlResults:
curshow = helpers.findCertainshow(sickbeard.showList, int(sqlshow["showid"]))
self.show = curshow = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
curEp = curshow.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))
season = curEp.scene_season
@ -285,7 +285,7 @@ class SCCProvider(generic.TorrentProvider):
if curshow.air_by_date or curshow.sports:
episode = curEp.airdate
searchString = self._get_episode_search_strings(curshow, curEp.scene_season, curEp.scene_episode, add_string='PROPER|REPACK')
searchString = self._get_episode_search_strings(curEp.scene_season, curEp.airdate if curshow.air_by_date or curshow.sports else curEp.scene_episode, add_string='PROPER|REPACK')
for item in self._doSearch(searchString[0], show=curshow):
title, url = self._get_title_and_url(item)

View file

@ -233,7 +233,7 @@ class SpeedCDProvider(generic.TorrentProvider):
return []
for sqlshow in sqlResults:
curshow = helpers.findCertainshow(sickbeard.showList, int(sqlshow["showid"]))
self.show = curshow = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
curEp = curshow.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))
season = curEp.scene_season

View file

@ -373,10 +373,10 @@ class ThePirateBayProvider(generic.TorrentProvider):
return []
for sqlshow in sqlResults:
curshow = helpers.findCertainshow(sickbeard.showList, int(sqlshow["showid"]))
self.show = curshow = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
curEp = curshow.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))
searchString = self._get_episode_search_strings(curshow, curEp.scene_season, curEp.scene_episode, add_string='PROPER|REPACK')
searchString = self._get_episode_search_strings(curEp.scene_season, curEp.airdate if curshow.air_by_date or curshow.sports else curEp.scene_episode, add_string='PROPER|REPACK')
for item in self._doSearch(searchString[0], show=curshow):
title, url = self._get_title_and_url(item)

View file

@ -252,7 +252,7 @@ class TorrentDayProvider(generic.TorrentProvider):
return []
for sqlshow in sqlResults:
curshow = helpers.findCertainshow(sickbeard.showList, int(sqlshow["showid"]))
self.show = curshow = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
curEp = curshow.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))
season = curEp.scene_season
@ -260,7 +260,7 @@ class TorrentDayProvider(generic.TorrentProvider):
if curshow.air_by_date or curshow.sports:
episode = curEp.airdate
searchString = self._get_episode_search_strings(curshow, curEp.scene_season, curEp.scene_episode, add_string='PROPER|REPACK')
searchString = self._get_episode_search_strings(curEp.scene_season, curEp.airdate if curshow.air_by_date or curshow.sports else curEp.scene_episode, add_string='PROPER|REPACK')
for item in self._doSearch(searchString[0], show=curshow):
title, url = self._get_title_and_url(item)

View file

@ -253,10 +253,10 @@ class TorrentLeechProvider(generic.TorrentProvider):
return []
for sqlshow in sqlResults:
curshow = helpers.findCertainshow(sickbeard.showList, int(sqlshow["showid"]))
self.show = curshow = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
curEp = curshow.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))
searchString = self._get_episode_search_strings(curshow, curEp.scene_season, curEp.scene_episode, add_string='PROPER|REPACK')
searchString = self._get_episode_search_strings(curEp.scene_season, curEp.airdate if curshow.air_by_date or curshow.sports else curEp.scene_episode, add_string='PROPER|REPACK')
for item in self._doSearch(searchString[0], show=curshow):
title, url = self._get_title_and_url(item)