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

mylar/helpers.py

@@ -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'])
 

mylar/importer.py

@@ -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'])