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

FIX:(#1719) Fix for logging error trying to log unicode in file format, FIX: Possible fix for weeklypull / refresh causing some series to change status to None

This commit is contained in:
evilhero 2017-09-20 19:51:00 -04:00
parent edfdf98271
commit 75f243bc8d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mylar/PostProcessor.py
View File

@ -1984,7 +1984,7 @@ class PostProcessor(object):
chunk_file_format = chunk_f.sub(' ', chunk_f_f)
self._log("No version # found for series - tag will not be available for renaming.")
logger.fdebug(module + ' No version # found for series, removing from filename')
logger.fdebug(module + ' New format is now: ' + str(chunk_file_format))
logger.fdebug('%s New format is now: %s' % (module, chunk_file_format))
else:
chunk_file_format = mylar.FILE_FORMAT
@ -1993,15 +1993,15 @@ class PostProcessor(object):
chunk_f = re.compile(r'\s+')
chunk_file_format = chunk_f.sub(' ', chunk_f_f)
logger.fdebug(module + ' Not an annual - removing from filename parameters')
logger.fdebug(module + ' New format: ' + str(chunk_file_format))
logger.fdebug('%s New format: %s' % (module, chunk_file_format))
else:
logger.fdebug(module + ' Chunk_file_format is: ' + str(chunk_file_format))
logger.fdebug('%s Chunk_file_format is: %s' % (module, chunk_file_format))
if '$Annual' not in chunk_file_format:
#if it's an annual, but $Annual isn't specified in file_format, we need to
#force it in there, by default in the format of $Annual $Issue
prettycomiss = "Annual " + str(prettycomiss)
logger.fdebug(module + ' prettycomiss: ' + str(prettycomiss))
prettycomiss = "Annual %s" % prettycomiss
logger.fdebug('%s prettycomiss: %s' % (module, prettycomiss))
ofilename = None

6
mylar/importer.py
View File

@ -987,7 +987,11 @@ def issue_collection(issuedata, nostatus):
#logger.fdebug('status is : ' + str(newValueDict))
else:
#logger.fdebug('Existing status for issue #' + str(issue['Issue_Number']) + ' : ' + str(iss_exists['Status']))
newValueDict['Status'] = iss_exists['Status']
if any([iss_exists['Status'] is None, iss_exists['Status'] == 'None']):
is_status = 'Skipped'
else:
is_status = iss_exists['Status']
newValueDict['Status'] = is_status
else:
#logger.fdebug("Not changing the status at this time - reverting to previous module after to re-append existing status")

2
mylar/updater.py
View File

@ -424,7 +424,7 @@ def upcoming_update(ComicID, ComicName, IssueNumber, IssueDate, forcecheck=None,
if ComicID[:1] == "G":
mylar.importer.GCDimport(ComicID, pullupd)
else:
cchk = mylar.importer.updateissuedata(ComicID, ComicName, calledfrom='weeklycheck')#mylar.importer.addComictoDB(ComicID,mismatch,pullupd)
cchk = mylar.importer.updateissuedata(ComicID, ComicName, calledfrom='weeklycheck') #mylar.importer.addComictoDB(ComicID,mismatch,pullupd)
else:
logger.fdebug('It has not been longer than 5 hours since we last did this...we will wait so we do not hammer things.')
else: