mirror/mylar
1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2024-12-25 09:11:46 +00:00
Code Issues Releases Wiki Activity

FIX:(#1528) Post-Processing would fail on one-off storyarc when storyarc directory was not enabled

Browse source
This commit is contained in:
evilhero 2017-01-06 13:18:38 -05:00
parent 9519153db3
commit 409cc7a382
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mylar/PostProcessor.py
View file

@ -718,10 +718,11 @@ class PostProcessor(object):
break break
passit = True passit = True
if passit == False: if passit == False:
tmpfilename = helpers.conversion(arcmatch['comicfilename'])
if arcmatch['sub']: if arcmatch['sub']:
clocation = os.path.join(arcmatch['comiclocation'], arcmatch['sub'], helpers.conversion(arcmatch['comicfilename'])) clocation = os.path.join(arcmatch['comiclocation'], arcmatch['sub'], tmpfilename)
else: else:
clocation = os.path.join(arcmatch['comiclocation'], helpers.conversion(arcmatch['comicfilename'])) clocation = os.path.join(arcmatch['comiclocation'], tmpfilename)
logger.info('[' + k + ' #' + issuechk['IssueNumber'] + '] MATCH: ' + clocation + ' / ' + str(issuechk['IssueID']) + ' / ' + str(v[i]['ArcValues']['IssueID'])) logger.info('[' + k + ' #' + issuechk['IssueNumber'] + '] MATCH: ' + clocation + ' / ' + str(issuechk['IssueID']) + ' / ' + str(v[i]['ArcValues']['IssueID']))
if v[i]['ArcValues']['Publisher'] is None: if v[i]['ArcValues']['Publisher'] is None:
arcpublisher = v[i]['ArcValues']['ComicPublisher'] arcpublisher = v[i]['ArcValues']['ComicPublisher']
@ -729,6 +730,7 @@ class PostProcessor(object):
arcpublisher = v[i]['ArcValues']['Publisher'] arcpublisher = v[i]['ArcValues']['Publisher']
manual_arclist.append({"ComicLocation": clocation, manual_arclist.append({"ComicLocation": clocation,
"Filename": tmpfilename,
"ComicID": v[i]['WatchValues']['ComicID'], "ComicID": v[i]['WatchValues']['ComicID'],
"IssueID": v[i]['ArcValues']['IssueID'], "IssueID": v[i]['ArcValues']['IssueID'],
"IssueNumber": v[i]['ArcValues']['IssueNumber'], "IssueNumber": v[i]['ArcValues']['IssueNumber'],
@ -785,6 +787,10 @@ class PostProcessor(object):
logger.info(module + ' Sucessfully wrote metadata to .cbz (' + ofilename + ') - Continuing..') logger.info(module + ' Sucessfully wrote metadata to .cbz (' + ofilename + ') - Continuing..')
self._log('Sucessfully wrote metadata to .cbz (' + ofilename + ') - proceeding...') self._log('Sucessfully wrote metadata to .cbz (' + ofilename + ') - proceeding...')
dfilename = ofilename
else:
dfilename = ml['filename']
checkdirectory = filechecker.validateAndCreateDirectory(grdst, True, module=module) checkdirectory = filechecker.validateAndCreateDirectory(grdst, True, module=module)
if not checkdirectory: if not checkdirectory:
logger.warn(module + ' Error trying to validate/create directory. Aborting this process at this time.') logger.warn(module + ' Error trying to validate/create directory. Aborting this process at this time.')
@ -793,11 +799,9 @@ class PostProcessor(object):
return self.queue.put(self.valreturn) return self.queue.put(self.valreturn)
dfilename = ofilename
#send to renamer here if valid. #send to renamer here if valid.
if mylar.RENAME_FILES: if mylar.RENAME_FILES:
renamed_file = helpers.rename_param(ml['ComicID'], ml['ComicName'], ml['IssueNumber'], ofilename, issueid=ml['IssueID'], arc=ml['StoryArc']) renamed_file = helpers.rename_param(ml['ComicID'], ml['ComicName'], ml['IssueNumber'], dfilename, issueid=ml['IssueID'], arc=ml['StoryArc'])
if renamed_file: if renamed_file:
dfilename = renamed_file['nfilename'] dfilename = renamed_file['nfilename']
logger.fdebug(module + ' Renaming file to conform to configuration: ' + ofilename) logger.fdebug(module + ' Renaming file to conform to configuration: ' + ofilename)
@ -810,21 +814,20 @@ class PostProcessor(object):
elif int(ml['ReadingOrder']) >= 10 and int(ml['ReadingOrder']) <= 99: readord = "0" + str(ml['ReadingOrder']) elif int(ml['ReadingOrder']) >= 10 and int(ml['ReadingOrder']) <= 99: readord = "0" + str(ml['ReadingOrder'])
else: readord = str(ml['ReadingOrder']) else: readord = str(ml['ReadingOrder'])
dfilename = str(readord) + "-" + os.path.split(dfilename)[1] dfilename = str(readord) + "-" + os.path.split(dfilename)[1]
else:
dfilename = dfilename
grab_dst = os.path.join(grdst, dfilename) grab_dst = os.path.join(grdst, dfilename)
logger.fdebug(module + ' Destination Path : ' + grab_dst) logger.fdebug(module + ' Destination Path : ' + grab_dst)
if metaresponse: if metaresponse:
src_location = odir src_location = odir
grab_src = os.path.join(src_location,ofilename)
else: else:
src_location = self.nzb_folder src_location = ofilename
grab_src = ofilename
grab_src = os.path.join(src_location, ofilename)
logger.fdebug(module + ' Source Path : ' + grab_src) logger.fdebug(module + ' Source Path : ' + grab_src)
logger.info(module + '[ONE-OFF MODE][' + mylar.ARC_FILEOPS.upper() + '] ' + str(ofilename) + ' into directory : ' + str(grab_dst)) logger.info(module + '[ONE-OFF MODE][' + mylar.ARC_FILEOPS.upper() + '] ' + grab_src + ' into directory : ' + grab_dst)
#this is also for issues that are part of a story arc, and don't belong to a watchlist series (ie. one-off's) #this is also for issues that are part of a story arc, and don't belong to a watchlist series (ie. one-off's)
try: try:
@ -832,7 +835,7 @@ class PostProcessor(object):
if not fileoperation: if not fileoperation:
raise OSError raise OSError
except (OSError, IOError): except (OSError, IOError):
logger.fdebug(module + '[ONE-OFF MODE][' + mylar.ARC_FILEOPS.upper() + '] Failure ' + src + ' - check directories and manually re-run.') logger.fdebug(module + '[ONE-OFF MODE][' + mylar.ARC_FILEOPS.upper() + '] Failure ' + grab_src + ' - check directories and manually re-run.')
return return
#tidyup old path #tidyup old path
@ -1832,7 +1835,6 @@ class PostProcessor(object):
logger.warn('Unable to locate IssueID within givin Story Arc. Ensure everything is up-to-date (refreshed) for the Arc.') logger.warn('Unable to locate IssueID within givin Story Arc. Ensure everything is up-to-date (refreshed) for the Arc.')
else: else:
logger.info('here')
if arcinfo['Publisher'] is None: if arcinfo['Publisher'] is None:
arcpub = arcinfo['IssuePublisher'] arcpub = arcinfo['IssuePublisher']
else: else:
@ -1840,7 +1842,6 @@ class PostProcessor(object):
grdst = helpers.arcformat(arcinfo['StoryArc'], helpers.spantheyears(arcinfo['StoryArcID']), arcpub) grdst = helpers.arcformat(arcinfo['StoryArc'], helpers.spantheyears(arcinfo['StoryArcID']), arcpub)
logger.info('grdst:' + grdst) logger.info('grdst:' + grdst)
logger.info('there')
checkdirectory = filechecker.validateAndCreateDirectory(grdst, True, module=module) checkdirectory = filechecker.validateAndCreateDirectory(grdst, True, module=module)
if not checkdirectory: if not checkdirectory:
logger.warn(module + ' Error trying to validate/create directory. Aborting this process at this time.') logger.warn(module + ' Error trying to validate/create directory. Aborting this process at this time.')

2
mylar/helpers.py
View file

@ -2369,7 +2369,7 @@ def arcformat(arc, spanyears, publisher):
dstloc = os.path.join(mylar.DESTINATION_DIR, 'StoryArcs', arcpath) dstloc = os.path.join(mylar.DESTINATION_DIR, 'StoryArcs', arcpath)
elif mylar.COPY2ARCDIR: elif mylar.COPY2ARCDIR:
logger.warn('Story arc directory is not configured. Defaulting to grabbag directory: ' + mylar.GRABBAG_DIR) logger.warn('Story arc directory is not configured. Defaulting to grabbag directory: ' + mylar.GRABBAG_DIR)
dstloc = mylar.GRABBAG_DIR dstloc = os.path.join(mylar.GRABBAG_DIR, arcpath)
else: else:
dstloc = None dstloc = None