diff --git a/sickbeard/providers/bitsoup.py b/sickbeard/providers/bitsoup.py index 1dce5355..c12c0898 100644 --- a/sickbeard/providers/bitsoup.py +++ b/sickbeard/providers/bitsoup.py @@ -145,7 +145,7 @@ class BitSoupProvider(generic.TorrentProvider): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + 'episodenumber': ep_obj.scene_episode} + ' %s' % add_string search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) diff --git a/sickbeard/providers/freshontv.py b/sickbeard/providers/freshontv.py index 874a934f..121bb826 100755 --- a/sickbeard/providers/freshontv.py +++ b/sickbeard/providers/freshontv.py @@ -166,7 +166,7 @@ class FreshOnTVProvider(generic.TorrentProvider): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + 'episodenumber': ep_obj.scene_episode} + ' %s' % add_string search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) diff --git a/sickbeard/providers/hdtorrents.py b/sickbeard/providers/hdtorrents.py index a372a29e..2618f174 100644 --- a/sickbeard/providers/hdtorrents.py +++ b/sickbeard/providers/hdtorrents.py @@ -167,7 +167,7 @@ class HDTorrentsProvider(generic.TorrentProvider): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + 'episodenumber': ep_obj.scene_episode} + ' %s' % add_string search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) diff --git a/sickbeard/providers/nextgen.py b/sickbeard/providers/nextgen.py index de5ab0c9..f95db283 100644 --- a/sickbeard/providers/nextgen.py +++ b/sickbeard/providers/nextgen.py @@ -178,7 +178,7 @@ class NextGenProvider(generic.TorrentProvider): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + 'episodenumber': ep_obj.scene_episode} + ' %s' % add_string search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) diff --git a/sickbeard/providers/scc.py b/sickbeard/providers/scc.py index 36439489..cdc45924 100644 --- a/sickbeard/providers/scc.py +++ b/sickbeard/providers/scc.py @@ -145,7 +145,7 @@ class SCCProvider(generic.TorrentProvider): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + 'episodenumber': ep_obj.scene_episode} + ' %s' % add_string search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) diff --git a/sickbeard/providers/speedcd.py b/sickbeard/providers/speedcd.py index 9839b880..4da4cfff 100644 --- a/sickbeard/providers/speedcd.py +++ b/sickbeard/providers/speedcd.py @@ -139,7 +139,7 @@ class SpeedCDProvider(generic.TorrentProvider): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + 'episodenumber': ep_obj.scene_episode} + ' %s' % add_string search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) diff --git a/sickbeard/providers/t411.py b/sickbeard/providers/t411.py index 45f6e4ed..adaf8d86 100644 --- a/sickbeard/providers/t411.py +++ b/sickbeard/providers/t411.py @@ -23,6 +23,7 @@ import re import datetime import sickbeard import generic + from lib import requests from sickbeard.common import USER_AGENT, Quality, cpu_presets from sickbeard import logger @@ -30,6 +31,9 @@ from sickbeard import tvcache from sickbeard import show_name_helpers from sickbeard.bs4_parser import BS4Parser from sickbeard import db +from sickbeard import helpers +from sickbeard import classes +from sickbeard.helpers import sanitizeSceneName class T411Provider(generic.TorrentProvider): urls = {'base_url': 'http://www.t411.me/', @@ -161,7 +165,8 @@ class T411Provider(generic.TorrentProvider): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): ep_string = show_name_helpers.sanitizeSceneName(show_name) + '.' + \ sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + 'episodenumber': ep_obj.scene_episode} + ' %s' % add_string + search_string['Episode'].append(re.sub('\s+', '.', ep_string)) return [search_string] diff --git a/sickbeard/providers/torrentbytes.py b/sickbeard/providers/torrentbytes.py index dd7f39d9..34342834 100644 --- a/sickbeard/providers/torrentbytes.py +++ b/sickbeard/providers/torrentbytes.py @@ -139,7 +139,7 @@ class TorrentBytesProvider(generic.TorrentProvider): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + 'episodenumber': ep_obj.scene_episode} + ' %s' % add_string search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) diff --git a/sickbeard/providers/torrentday.py b/sickbeard/providers/torrentday.py index eacaa21e..42f85056 100644 --- a/sickbeard/providers/torrentday.py +++ b/sickbeard/providers/torrentday.py @@ -165,7 +165,7 @@ class TorrentDayProvider(generic.TorrentProvider): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + 'episodenumber': ep_obj.scene_episode} + ' %s' % add_string search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) diff --git a/sickbeard/providers/torrentleech.py b/sickbeard/providers/torrentleech.py index 8dfb1731..5e89e61c 100644 --- a/sickbeard/providers/torrentleech.py +++ b/sickbeard/providers/torrentleech.py @@ -144,7 +144,7 @@ class TorrentLeechProvider(generic.TorrentProvider): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} + 'episodenumber': ep_obj.scene_episode} + ' %s' % add_string search_string['Episode'].append(re.sub('\s+', ' ', ep_string))