From 62fe079e4f5b7d1342abaac0f913dc58bab4946f Mon Sep 17 00:00:00 2001 From: evilhero Date: Wed, 13 Apr 2016 23:56:33 -0400 Subject: [PATCH] FIX:(#1249) 'Sub' key error when performing Recheck Files/Post-Processing, FIX: Fix for proper volume detection when parsing search results --- mylar/filechecker.py | 3 ++- mylar/search.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mylar/filechecker.py b/mylar/filechecker.py index bdf120c0..2272b41c 100755 --- a/mylar/filechecker.py +++ b/mylar/filechecker.py @@ -166,7 +166,7 @@ class FileChecker(object): }) comiccnt +=1 else: - #failiure + #failure self.failed_files.append({'parse_status': 'failure', 'sub': runresults['sub'], 'comicfilename': runresults['comicfilename'], @@ -857,6 +857,7 @@ class FileChecker(object): logger.info('[NO MATCH] ' + filename + ' [WATCHLIST:' + self.watchcomic + ']') return {'process_status': 'fail', 'comicfilename': filename, + 'sub': series_info['sub'], 'comiclocation': series_info['comiclocation'], 'series_name': series_info['series_name'], 'issue_number': series_info['issue_number'], diff --git a/mylar/search.py b/mylar/search.py index 7f47ff6e..ddeee47f 100755 --- a/mylar/search.py +++ b/mylar/search.py @@ -660,7 +660,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa #this is the crap we ignore. Continue (commented else, as it spams the logs) #logger.fdebug('this starts with FOR : ' + str(subs) + '. This is not present in the series - ignoring.') continue - logger.fdebug('Detected crap within header. Ignoring this portion of the result in order to see if it\'s a valid match.') + logger.fdebug('Detected crap within header. Ignoring this portion of the result in order to see if it\'s a valid match.') ComicTitle = subs break @@ -914,6 +914,8 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa continue if fndcomicversion: + if origvol: + fndcomicversion = origvol cleantitle = re.sub(fndcomicversion, '', cleantitle).strip() logger.fdebug('Newly finished reformed cleantitle (with NO volume label): ' + cleantitle) versionfound = "yes"