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

Merge branch 'origin/dev'

Browse Source
This commit is contained in:
echel0n 2014-05-13 10:11:29 -07:00
commit ff2e81c8e8
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sickbeard/search.py
View File

@ -220,6 +220,7 @@ def pickBestResult(results, show, quality_list=None):
if not bestResult or bestResult.quality < cur_result.quality and cur_result.quality != Quality.UNKNOWN: if not bestResult or bestResult.quality < cur_result.quality and cur_result.quality != Quality.UNKNOWN:
bestResult = cur_result bestResult = cur_result
elif bestResult.quality == cur_result.quality: elif bestResult.quality == cur_result.quality:
if "proper" in cur_result.name.lower() or "repack" in cur_result.name.lower(): if "proper" in cur_result.name.lower() or "repack" in cur_result.name.lower():
bestResult = cur_result bestResult = cur_result
@ -514,24 +515,28 @@ def searchProviders(queueItem, show, season, episodes, seasonSearch=False, manua
if len(foundResults[provider.name][curEp]) == 0: if len(foundResults[provider.name][curEp]) == 0:
continue continue
result = pickBestResult(foundResults[provider.name][curEp], show) bestResult = pickBestResult(foundResults[provider.name][curEp], show)
if result:
finalResults.append(result)
logger.log(u"Checking if we should snatch " + result.name, logger.DEBUG) # if all results were rejected move on to the next episode
any_qualities, best_qualities = Quality.splitQuality(show.quality) if not bestResult:
continue
# if there is a redownload that's higher than this then we definitely need to keep looking finalResults.append(bestResult)
if best_qualities and result.quality == max(best_qualities):
logger.log(u"Found a highest quality archive match to snatch [" + result.name + "]", logger.DEBUG)
queueItem.results = [result]
return queueItem
# if there's no redownload that's higher (above) and this is the highest initial download then we're good logger.log(u"Checking if we should snatch " + bestResult.name, logger.DEBUG)
elif any_qualities and result.quality in any_qualities: any_qualities, best_qualities = Quality.splitQuality(show.quality)
logger.log(u"Found a initial quality match to snatch [" + result.name + "]", logger.DEBUG)
queueItem.results = [result] # if there is a redownload that's higher than this then we definitely need to keep looking
return queueItem if best_qualities and bestResult.quality == max(best_qualities):
logger.log(u"Found a highest quality archive match to snatch [" + bestResult.name + "]", logger.DEBUG)
queueItem.results = [bestResult]
return queueItem
# if there's no redownload that's higher (above) and this is the highest initial download then we're good
elif any_qualities and bestResult.quality in any_qualities:
logger.log(u"Found a initial quality match to snatch [" + bestResult.name + "]", logger.DEBUG)
queueItem.results = [bestResult]
return queueItem
# remove duplicates and insures snatch of highest quality from results # remove duplicates and insures snatch of highest quality from results
for i1, result1 in enumerate(finalResults): for i1, result1 in enumerate(finalResults):