monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-22 01:23:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #436 from JackDandy/feature/ChangeProvSCD

Browse source 
Change provider SCD PEP8 and code convention cleanup.
This commit is contained in:
JackDandy 2015-07-03 14:21:08 +01:00
commit 2f767b28c3
2 changed files with 36 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -28,6 +28,7 @@
* Change provider KAT to use mediaExtensions from common instead of private list * Change provider KAT to use mediaExtensions from common instead of private list
* Change provider KAT provider PEP8 and code convention cleanup * Change provider KAT provider PEP8 and code convention cleanup
* Change refactor and code simplification for torrent providers * Change refactor and code simplification for torrent providers
* Change provider SCD PEP8 and code convention cleanup
* Remove HDTorrents torrent provider * Remove HDTorrents torrent provider
* Remove NextGen torrent provider * Remove NextGen torrent provider
* Add Rarbg torrent provider * Add Rarbg torrent provider

74
sickbeard/providers/speedcd.py
View file

@ -30,12 +30,12 @@ from lib.requests import exceptions
class SpeedCDProvider(generic.TorrentProvider): class SpeedCDProvider(generic.TorrentProvider):
urls = {'base_url': 'http://speed.cd/', urls = {'base_url': 'http://speed.cd/',
'login': 'http://speed.cd/take_login.php', 'login': 'http://speed.cd/take_login.php',
'detail': 'http://speed.cd/t/%s', 'detail': 'http://speed.cd/t/%s',
'search': 'http://speed.cd/V3/API/API.php', 'search': 'http://speed.cd/V3/API/API.php',
'download': 'http://speed.cd/download.php?torrent=%s', 'download': 'http://speed.cd/download.php?torrent=%s'}
}
def __init__(self): def __init__(self):
generic.TorrentProvider.__init__(self, 'Speedcd', True, False) generic.TorrentProvider.__init__(self, 'Speedcd', True, False)
@ -57,8 +57,7 @@ class SpeedCDProvider(generic.TorrentProvider):
def _doLogin(self): def _doLogin(self):
login_params = {'username': self.username, login_params = {'username': self.username,
'password': self.password 'password': self.password}
}
try: try:
response = self.session.post(self.urls['login'], data=login_params, timeout=30, verify=False) response = self.session.post(self.urls['login'], data=login_params, timeout=30, verify=False)
@ -73,23 +72,23 @@ class SpeedCDProvider(generic.TorrentProvider):
return True return True
def _get_season_search_strings(self, ep_obj): def _get_season_search_strings(self, ep_obj, **kwargs):
#If Every episode in Season is a wanted Episode then search for Season first # If Every episode in Season is a wanted Episode then search for Season first
search_string = {'Season': []} search_string = {'Season': []}
for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)):
if ep_obj.show.air_by_date or ep_obj.show.sports: if ep_obj.show.air_by_date or ep_obj.show.sports:
ep_string = show_name + ' ' + str(ep_obj.airdate).split('-')[0] ep_string = show_name + ' ' + str(ep_obj.airdate).split('-')[0]
elif ep_obj.show.anime: elif ep_obj.show.anime:
ep_string = show_name + ' ' + "%d" % ep_obj.scene_absolute_number ep_string = show_name + ' ' + '%d' % ep_obj.scene_absolute_number
else: else:
ep_string = show_name + ' S%02d' % int(ep_obj.scene_season) #1) showName SXX ep_string = show_name + ' S%02d' % int(ep_obj.scene_season) # 1) showName SXX
search_string['Season'].append(ep_string) search_string['Season'].append(ep_string)
return [search_string] return [search_string]
def _get_episode_search_strings(self, ep_obj, add_string=''): def _get_episode_search_strings(self, ep_obj, add_string='', **kwargs):
search_string = {'Episode': []} search_string = {'Episode': []}
@ -98,25 +97,25 @@ class SpeedCDProvider(generic.TorrentProvider):
if self.show.air_by_date: if self.show.air_by_date:
for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)):
ep_string = sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) \
str(ep_obj.airdate).replace('-', '|') + ' ' + str(ep_obj.airdate).replace('-', '|')
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
elif self.show.sports: elif self.show.sports:
for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)):
ep_string = sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) \
str(ep_obj.airdate).replace('-', '|') + '|' + \ + ' ' + str(ep_obj.airdate).replace('-', '|') + '|'\
ep_obj.airdate.strftime('%b') + ep_obj.airdate.strftime('%b')
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
elif self.show.anime: elif self.show.anime:
for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)):
ep_string = sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
"%i" % int(ep_obj.scene_absolute_number) '%i' % int(ep_obj.scene_absolute_number)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): for show_name in set(show_name_helpers.allPossibleShowNames(self.show)):
ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \
sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season,
'episodenumber': ep_obj.scene_episode} 'episodenumber': ep_obj.scene_episode}
search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) search_string['Episode'].append(re.sub('\s+', ' ', ep_string))
@ -133,19 +132,19 @@ class SpeedCDProvider(generic.TorrentProvider):
for mode in search_params.keys(): for mode in search_params.keys():
for search_string in search_params[mode]: for search_string in search_params[mode]:
logger.log(u"Search string: " + search_string, logger.DEBUG) logger.log(u'Search string: ' + search_string, logger.DEBUG)
search_string = '+'.join(search_string.split()) search_string = '+'.join(search_string.split())
post_data = dict({'/browse.php?': None, 'cata': 'yes', 'jxt': 4, 'jxw': 'b', 'search': search_string}, post_data = dict({'/browse.php?': None, 'cata': 'yes', 'jxt': 4, 'jxw': 'b', 'search': search_string},
**self.categories[mode]) **self.categories[mode])
parsedJSON = self.getURL(self.urls['search'], post_data=post_data, json=True) parsed_json = self.getURL(self.urls['search'], post_data=post_data, json=True)
if not parsedJSON: if not parsed_json:
continue continue
try: try:
torrents = parsedJSON.get('Fs', [])[0].get('Cn', {}).get('torrents', []) torrents = parsed_json.get('Fs', [])[0].get('Cn', {}).get('torrents', [])
except: except:
continue continue
@ -159,7 +158,7 @@ class SpeedCDProvider(generic.TorrentProvider):
seeders = int(torrent['seed']) seeders = int(torrent['seed'])
leechers = int(torrent['leech']) leechers = int(torrent['leech'])
if mode != 'RSS' and (seeders < self.minseed or leechers < self.minleech): if 'RSS' != mode and (seeders < self.minseed or leechers < self.minleech):
continue continue
if not title or not url: if not title or not url:
@ -168,7 +167,6 @@ class SpeedCDProvider(generic.TorrentProvider):
item = title, url, seeders, leechers item = title, url, seeders, leechers
items[mode].append(item) items[mode].append(item)
#For each search mode sort all the items by seeders
items[mode].sort(key=lambda tup: tup[2], reverse=True) items[mode].sort(key=lambda tup: tup[2], reverse=True)
results += items[mode] results += items[mode]
@ -186,14 +184,14 @@ class SpeedCDProvider(generic.TorrentProvider):
if url: if url:
url = str(url).replace('&amp;', '&') url = str(url).replace('&amp;', '&')
return (title, url) return title, url
def findPropers(self, search_date=datetime.datetime.today()): def findPropers(self, search_date=datetime.datetime.today()):
results = [] results = []
myDB = db.DBConnection() my_db = db.DBConnection()
sqlResults = myDB.select( sql_results = my_db.select(
'SELECT s.show_name, e.showid, e.season, e.episode, e.status, e.airdate FROM tv_episodes AS e' + 'SELECT s.show_name, e.showid, e.season, e.episode, e.status, e.airdate FROM tv_episodes AS e' +
' INNER JOIN tv_shows AS s ON (e.showid = s.indexer_id)' + ' INNER JOIN tv_shows AS s ON (e.showid = s.indexer_id)' +
' WHERE e.airdate >= ' + str(search_date.toordinal()) + ' WHERE e.airdate >= ' + str(search_date.toordinal()) +
@ -201,17 +199,17 @@ class SpeedCDProvider(generic.TorrentProvider):
' OR (e.status IN (' + ','.join([str(x) for x in Quality.SNATCHED]) + ')))' ' OR (e.status IN (' + ','.join([str(x) for x in Quality.SNATCHED]) + ')))'
) )
if not sqlResults: if not sql_results:
return [] return results
for sqlshow in sqlResults: for sqlshow in sql_results:
self.show = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"])) self.show = helpers.findCertainShow(sickbeard.showList, int(sqlshow['showid']))
if self.show: if self.show:
curEp = self.show.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"])) cur_ep = self.show.getEpisode(int(sqlshow['season']), int(sqlshow['episode']))
searchString = self._get_episode_search_strings(curEp, add_string='PROPER|REPACK') search_string = self._get_episode_search_strings(cur_ep, add_string='PROPER|REPACK')
for item in self._doSearch(searchString[0]): for item in self._doSearch(search_string[0]):
title, url = self._get_title_and_url(item) title, url = self._get_title_and_url(item)
results.append(classes.Proper(title, url, datetime.datetime.today(), self.show)) results.append(classes.Proper(title, url, datetime.datetime.today(), self.show))
@ -222,18 +220,16 @@ class SpeedCDProvider(generic.TorrentProvider):
class SpeedCDCache(tvcache.TVCache): class SpeedCDCache(tvcache.TVCache):
def __init__(self, provider):
tvcache.TVCache.__init__(self, provider) def __init__(self, this_provider):
tvcache.TVCache.__init__(self, this_provider)
# only poll Speedcd every 20 minutes max self.minTime = 20 # cache update frequency
self.minTime = 20
def _getRSSData(self): def _getRSSData(self):
search_params = {'RSS': ['']} search_params = {'RSS': ['']}
return self.provider._doSearch(search_params) return self.provider._doSearch(search_params)
provider = SpeedCDProvider() provider = SpeedCDProvider()