moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-12 02:52:20 -05:00
Code Issues Releases Wiki Activity

Fix resultType error: remove resultType as object is

Browse Source 
sickbeard.classes.Proper and not sickbeard.classes.*SearchResult
Fix 'NoneType' object has no attribute 'rls_ignore_words': See
SiCKRAGETV/sickrage-issues#328 for more info
This commit is contained in:
Alexandre Beloin 2015-01-19 21:29:19 -05:00
parent 91cb8d885c
commit 0ae2b03484
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sickbeard/properFinder.py
View File

@ -146,7 +146,7 @@ class ProperFinder():
curProper.content = None curProper.content = None
# filter release # filter release
bestResult = pickBestResult(curProper) bestResult = pickBestResult(curProper, parse_result.show)
if not bestResult: if not bestResult:
logger.log(u"Proper " + curProper.name + " were rejected by our release filters.", logger.DEBUG) logger.log(u"Proper " + curProper.name + " were rejected by our release filters.", logger.DEBUG)
continue continue

12
sickbeard/search.py
View File

@ -187,7 +187,7 @@ def filter_release_name(name, filter_words):
return False return False
def pickBestResult(results, show=None, quality_list=None): def pickBestResult(results, show, quality_list=None):
results = results if isinstance(results, list) else [results] results = results if isinstance(results, list) else [results]
logger.log(u"Picking the best result out of " + str([x.name for x in results]), logger.DEBUG) logger.log(u"Picking the best result out of " + str([x.name for x in results]), logger.DEBUG)
@ -200,12 +200,10 @@ def pickBestResult(results, show=None, quality_list=None):
if show and cur_result.show is not show: if show and cur_result.show is not show:
continue continue
# filter out possible bad torrents from providers such as ezrss if not cur_result.url.startswith('magnet'):
if cur_result.resultType == "torrent" and sickbeard.TORRENT_METHOD != "blackhole": cur_result.content = cur_result.provider.getURL(cur_result.url)
if not cur_result.url.startswith('magnet'): if not cur_result.content:
cur_result.content = cur_result.provider.getURL(cur_result.url) continue
if not cur_result.content:
continue
# build the black And white list # build the black And white list
if cur_result.show.is_anime: if cur_result.show.is_anime: