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 #216 from iron8core/scc_fix_archive

Browse source 
Fix archive search and correct logging for foreign searches
This commit is contained in:
echel0n 2014-04-29 15:22:25 -07:00
commit 5ef7a0fb30
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sickbeard/providers/scc.py
View file

@ -155,13 +155,13 @@ class SCCProvider(generic.TorrentProvider):
if mode == 'Season': if mode == 'Season':
searchURL = self.urls['archive'] % (search_string) searchURL = self.urls['archive'] % (search_string)
data = self.getURL(searchURL, headers=self.headers) data = [self.getURL(searchURL, headers=self.headers)]
else: else:
searchURL = self.urls['search'] % (search_string, self.categories) searchURL = self.urls['search'] % (search_string, self.categories)
nonsceneSearchURL = self.urls['nonscene'] % (search_string) nonsceneSearchURL = self.urls['nonscene'] % (search_string)
foreignSearchURL = self.urls['foreign'] % (search_string) foreignSearchURL = self.urls['foreign'] % (search_string)
data = [self.getURL(searchURL, headers=self.headers), data = [self.getURL(searchURL, headers=self.headers),
self.getURL(nonsceneSearchURL, headers=self.headers), self.getURL(nonsceneSearchURL, headers=self.headers),
self.getURL(foreignSearchURL, headers=self.headers)] self.getURL(foreignSearchURL, headers=self.headers)]
logger.log(u"Search string: " + nonsceneSearchURL, logger.DEBUG) logger.log(u"Search string: " + nonsceneSearchURL, logger.DEBUG)
logger.log(u"Search string: " + foreignSearchURL, logger.DEBUG) logger.log(u"Search string: " + foreignSearchURL, logger.DEBUG)
@ -174,10 +174,10 @@ class SCCProvider(generic.TorrentProvider):
try: try:
for dataItem in data: for dataItem in data:
html = BeautifulSoup(dataItem, features=["html5lib", "permissive"]) html = BeautifulSoup(dataItem, features=["html5lib", "permissive"])
torrent_table = html.find('table', attrs={'id': 'torrents-table'}) torrent_table = html.find('table', attrs={'id': 'torrents-table'})
torrent_rows = torrent_table.find_all('tr') if torrent_table else [] torrent_rows = torrent_table.find_all('tr') if torrent_table else []
#Continue only if one Release is found #Continue only if one Release is found
if len(torrent_rows) < 2: if len(torrent_rows) < 2:
if html.title: if html.title:
@ -186,31 +186,34 @@ class SCCProvider(generic.TorrentProvider):
source = self.name source = self.name
logger.log(u"The Data returned from " + source + " does not contain any torrent", logger.DEBUG) logger.log(u"The Data returned from " + source + " does not contain any torrent", logger.DEBUG)
continue continue
for result in torrent_table.find_all('tr')[1:]: for result in torrent_table.find_all('tr')[1:]:
try: try:
link = result.find('td', attrs={'class': 'ttr_name'}).find('a') link = result.find('td', attrs={'class': 'ttr_name'}).find('a')
url = result.find('td', attrs={'class': 'td_dl'}).find('a') url = result.find('td', attrs={'class': 'td_dl'}).find('a')
title = link.string title = link.string
if re.search('\.\.\.', title):
details_html = BeautifulSoup(self.getURL(self.url + "/" + link['href']))
title = re.search('(?<=").+(?<!")', details_html.title.string).group(0)
download_url = self.urls['download'] % url['href'] download_url = self.urls['download'] % url['href']
id = int(link['href'].replace('details?id=', '')) id = int(link['href'].replace('details?id=', ''))
seeders = int(result.find('td', attrs={'class': 'ttr_seeders'}).string) seeders = int(result.find('td', attrs={'class': 'ttr_seeders'}).string)
leechers = int(result.find('td', attrs={'class': 'ttr_leechers'}).string) leechers = int(result.find('td', attrs={'class': 'ttr_leechers'}).string)
except (AttributeError, TypeError): except (AttributeError, TypeError):
continue continue
if mode != 'RSS' and seeders == 0: if mode != 'RSS' and seeders == 0:
continue continue
if not title or not download_url: if not title or not download_url:
continue continue
item = title, download_url, id, seeders, leechers item = title, download_url, id, seeders, leechers
if re.search('<title>SceneAccess \| Non-Scene</title>', dataItem): if re.search('<title>SceneAccess \| Non-Scene</title>', dataItem):
logger.log(u"Found result: " + title + "(" + nonsceneSearchURL + ")", logger.DEBUG) logger.log(u"Found result: " + title + "(" + nonsceneSearchURL + ")", logger.DEBUG)
elif re.search('<title>SceneAccess \| Non-Scene</title>', dataItem): elif re.search('<title>SceneAccess \| Foreign</title>', dataItem):
logger.log(u"Found result: " + title + "(" + foreignSearchURL + ")", logger.DEBUG) logger.log(u"Found result: " + title + "(" + foreignSearchURL + ")", logger.DEBUG)
else: else:
logger.log(u"Found result: " + title + "(" + searchURL + ")", logger.DEBUG) logger.log(u"Found result: " + title + "(" + searchURL + ")", logger.DEBUG)