mirror
/
mylar
mirror of https://github.com/evilhero/mylar
1
0
Fork 0
Code Issues Releases Wiki Activity

FIX: When post-processing and verifying series that had more than one match on watchlist, would error out if comparing TPB to print, and/or vice-versa, FIX: When searching using 32P and the series pack option was not enabled, would incorrectly parse the pack information as a valid result

This commit is contained in:
evilhero 2019-01-10 14:49:12 -05:00
parent 625a36abe7
commit e1a1d3fea8
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mylar/PostProcessor.py
View File

@ -553,10 +553,19 @@ class PostProcessor(object):
nm+=1
continue
else:
if cs['WatchValues']['Type'] == 'TPB' and cs['WatchValues']['Total'] > 1:
just_the_digits = re.sub('[^0-9]', '', watchmatch['series_volume']).strip()
else:
just_the_digits = watchmatch['justthedigits']
try:
if cs['WatchValues']['Type'] == 'TPB' and cs['WatchValues']['Total'] > 1:
if watchmatch['series_volume'] is not None:
just_the_digits = re.sub('[^0-9]', '', watchmatch['series_volume']).strip()
else:
just_the_digits = re.sub('[^0-9]', '', watchmatch['justthedigits']).strip()
else:
just_the_digits = watchmatch['justthedigits']
except Exception as e:
logger.warn('[Exception: %s] Unable to properly match up/retrieve issue number (or volume) for this [CS: %s] [WATCHMATCH: %s]' % (e, cs, watchmatch))
nm+=1
continue
if just_the_digits is not None:
temploc= just_the_digits.replace('_', ' ')
temploc = re.sub('[\#\']', '', temploc)

6
mylar/search.py
View File

@ -805,6 +805,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
done = False
log2file = ""
pack0day = False
pack_warning = False
if not bb == "no results":
for entry in bb['entries']:
#logger.fdebug('entry: %s' % entry) #<--- uncomment this to see what the search result(s) are
@ -827,6 +828,11 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
else:
logger.fdebug('The search result issue [%s] does not match up for some reason to our search result [%s]' % (entry['issues'], findcomiciss))
continue
elif any([entry['pack'] == '1', entry['pack'] == '2']) and allow_packs is False:
if pack_warning is False:
logger.fdebug('(possibly more than one) Pack detected, but option not enabled for this series. Ignoring subsequent pack results (to enable: on the series details page -> Edit Settings -> Enable Pack Downloads)')
pack_warning = True
continue
logger.fdebug("checking search result: " + entry['title'])
#some nzbsites feel that comics don't deserve a nice regex to strip the crap from the header, the end result is that we're