moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2025-01-05 10:58:01 -05:00
Code Issues Releases Wiki Activity

Merge pull request #1189 from abeloin/patch-jquery_bwlists

Browse Source 
Patch jquery bwlists
This commit is contained in:
echel0n 2015-01-17 19:21:43 -08:00
commit f59d8119da
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gui/slick/interfaces/default/editShow.tmpl
View File

@ -265,22 +265,22 @@ Separate words with a comma, e.g. "word1,word2,word3"<br />
});
\$('#addToWhite').click(function() {
var group = \$('#addToPoolText').attr("value")
var group = \$('#addToPoolText').val()
if(group == "")
return
\$('#addToPoolText').attr("value", "")
\$('#addToPoolText').val("")
var option = \$("<option>")
option.attr("value",group)
option.prop("value",group)
option.html(group)
return option.appendTo('#white');
});
\$('#addToBlack').click(function() {
var group = \$('#addToPoolText').attr("value")
var group = \$('#addToPoolText').val()
if(group == "")
return
\$('#addToPoolText').attr("value", "")
\$('#addToPoolText').val("")
var option = \$("<option>")
option.attr("value",group)
option.prop("value",group)
option.html(group)
return option.appendTo('#black');
});

5
sickbeard/search.py
View File

@ -208,8 +208,9 @@ def pickBestResult(results, show=None, quality_list=None):
continue
# build the black And white list
if not bwl and cur_result.show.is_anime:
bwl = BlackAndWhiteList(cur_result.show.indexerid)
if cur_result.show.is_anime:
if not bwl:
bwl = BlackAndWhiteList(cur_result.show.indexerid)
if not bwl.is_valid(cur_result):
logger.log(cur_result.name+" does not match the blacklist or the whitelist, rejecting it. Result: " + bwl.get_last_result_msg(), logger.INFO)
continue