mirror/mylar
1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2024-12-24 08:42:37 +00:00
Code Issues Releases Wiki Activity

FIX: Prevent the $VolumeN tag from being removed from the 'Advanced Settings - Folder Format' string when adding a new comic with Volume Number = None

Browse source
This commit is contained in:
davalanche 2017-01-30 22:18:27 -06:00 committed by evilhero
parent 9493bea29e
commit 1c737b691c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mylar/importer.py Executable file → Normal file
View file

@ -345,7 +345,11 @@ def addComictoDB(comicid, mismatch=None, pullupd=None, imported=None, ogcname=No
if comversion == 'None':
chunk_f_f = re.sub('\$VolumeN', '', mylar.FOLDER_FORMAT)
chunk_f = re.compile(r'\s+')
mylar.FOLDER_FORMAT = chunk_f.sub(' ', chunk_f_f)
chunk_folder_format = chunk_f.sub(' ', chunk_f_f)
logger.fdebug('No version # found for series, removing from folder format')
logger.fdebug("new folder format: " + str(chunk_folder_format))
else:
chunk_folder_format = mylar.FOLDER_FORMAT
#do work to generate folder path
@ -362,7 +366,7 @@ def addComictoDB(comicid, mismatch=None, pullupd=None, imported=None, ogcname=No
if mylar.FOLDER_FORMAT == '':
comlocation = os.path.join(mylar.DESTINATION_DIR, comicdir, " (" + SeriesYear + ")")
else:
comlocation = os.path.join(mylar.DESTINATION_DIR, helpers.replace_all(mylar.FOLDER_FORMAT, values))
comlocation = os.path.join(mylar.DESTINATION_DIR, helpers.replace_all(chunk_folder_format, values))
#comlocation = mylar.DESTINATION_DIR + "/" + comicdir + " (" + comic['ComicYear'] + ")"