mirror/mylar
1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2025-03-09 05:13:35 +00:00
Code Issues Releases Wiki Activity

FIX: REDACTED blacklisted publisher option

Browse source
This commit is contained in:
evilhero 2016-04-07 13:27:45 -04:00
parent 6085c9f993
commit d26fc2c743
3 changed files with 7 additions and 7 deletions

2
mylar/__init__.py
View file

@ -645,7 +645,7 @@ def initialize():
BIGGIE_PUB = check_setting_str(CFG, 'General', 'biggie_pub', '55')
flattened_blacklisted_pub = check_setting_str(CFG, 'General', 'blacklisted_publishers', [], log=False)
if len(flattened_blacklisted_pub) == 0:
if len(flattened_blacklisted_pub) == 0 or flattened_blacklisted_pub == 'None':
BLACKLISTED_PUBLISHERS = None
else:
BLACKLISTED_PUBLISHERS = list(itertools.izip(*[itertools.islice(flattened_blacklisted_pub, i, None, 1) for i in range(1)]))

8
mylar/mb.py
View file

@ -305,10 +305,10 @@ def findComic(name, mode, issue, limityear=None, explicit=None, type=None):
xmlpub = "Unknown"
logger.info('publisher: ' + xmlpub)
#ignore specific publishers on a global scale here.
if mylar.BLACKLISTED_PUBLISHERS is not None and any([x for x in mylar.BLACKLISTED_PUBLISHERS if x.lower() == xmlpub.lower()]):
#'panini' in xmlpub.lower() or 'deagostini' in xmlpub.lower() or 'Editorial Televisa' in xmlpub.lower():
logger.fdebug('Blacklisted publisher [' + xmlpub + ']. Ignoring this result.')
continue
#if mylar.BLACKLISTED_PUBLISHERS in xmlpub.lower(): #any([x for x in mylar.BLACKLISTED_PUBLISHERS if x.lower() == xmlpub.lower()]):
# #'panini' in xmlpub.lower() or 'deagostini' in xmlpub.lower() or 'Editorial Televisa' in xmlpub.lower():
# logger.fdebug('Blacklisted publisher [' + xmlpub + ']. Ignoring this result.')
# continue
try:
xmldesc = result.getElementsByTagName('description')[0].firstChild.wholeText

4
mylar/webserve.py
View file

@ -232,7 +232,7 @@ class WebInterface(object):
try:
searchresults, explicit = mb.findComic(name, mode, issue=None, explicit=explicit)
except TypeError:
logger.error('Unable to perform required pull-list search for : [name: ' + name + '][issue: ' + issue + '][mode: ' + mode + '][explicitsearch:' + explicit + ']')
logger.error('Unable to perform required pull-list search for : [name: ' + name + '][mode: ' + mode + '][explicitsearch:' + str(explicit) + ']')
return
elif type == 'comic' and mode == 'want':
try:
@ -2356,7 +2356,7 @@ class WebInterface(object):
MSCheck[key].append(str(tchk['IssueYear']))
#write out here
logger.febug(str(MSCheck))
#logger.fdebug(str(MSCheck))
#now we load in the list without the multiple entries (ie. series that appear only once in the cbl and don't have an IssueID)
Arc_Issues = myDB.select("SELECT * FROM readinglist WHERE StoryArcID=? AND IssueID is NULL GROUP BY ComicName HAVING (COUNT(ComicName) = 1)", [storyarcid])