mirror/mylar
1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2025-03-09 21:33:42 +00:00
Code Issues Releases Wiki Activity

FIX: (#218) LocMove will now take into account Replace Spaces in series directory when FFTONEWCOM_DIR is enabled, FIX: ComicVersion wouldn't hold if different than CV data on a refresh/update

Browse source
This commit is contained in:
evilhero 2013-05-25 23:18:29 -04:00
parent 69ba40e5e9
commit 1719c0b2d9
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mylar/helpers.py
View file

@ -553,7 +553,11 @@ def updateComicLocation():
comlocation = re.sub(mylar.DESTINATION_DIR, mylar.NEWCOM_DIR, dl['ComicLocation'])
else:
first = replace_all(folderformat, values)
if mylar.REPLACE_SPACES:
#mylar.REPLACE_CHAR ...determines what to replace spaces with underscore or dot
first = first.replace(' ', mylar.REPLACE_CHAR)
comlocation = os.path.join(mylar.NEWCOM_DIR,first)
else:
comlocation = re.sub(mylar.DESTINATION_DIR, mylar.NEWCOM_DIR, dl['ComicLocation'])

10
mylar/importer.py
View file

@ -62,6 +62,7 @@ def addComictoDB(comicid,mismatch=None,pullupd=None,imported=None,ogcname=None):
newValueDict = {"Status": "Loading"}
comlocation = dbcomic['ComicLocation']
filechecker.validateAndCreateDirectory(comlocation, True)
oldcomversion = dbcomic['ComicVersion'] #store the comicversion and chk if it exists before hammering.
myDB.upsert("comics", newValueDict, controlValueDict)
@ -274,10 +275,13 @@ def addComictoDB(comicid,mismatch=None,pullupd=None,imported=None,ogcname=None):
except IOError as e:
logger.error(u"Unable to save cover locally at this time.")
if comic['ComicVersion'].isdigit():
comicVol = "v" + comic['ComicVersion']
if oldcomversion is None:
if comic['ComicVersion'].isdigit():
comicVol = "v" + comic['ComicVersion']
else:
comicVol = None
else:
comicVol = None
comicVol = oldcomversion
#for description ...
#Cdesc = helpers.cleanhtml(comic['ComicDescription'])