fix

common/Constant.py

@@ -82,7 +82,7 @@ class ComicPath:
     
     #顶级路径
     @classmethod
-    def setJoinPathDir(cls,path,dir="",prefix=None,mkdir=False):
+    def setJoinPathDir(cls,path,dir="",suffix=None,mkdir=False):
         result = dir
         if isinstance(path,dict) or isinstance(path,list):
             for x in path:
@@ -93,33 +93,38 @@ class ComicPath:
             if not os.path.exists(base_dir): 
                 os.makedirs(base_dir)
                 print(f"新路径 {result} mkdir={mkdir}")
-        if prefix != None: result += "."+prefix
+        if suffix != None: result += "."+suffix
         return result
         
     @classmethod
-    def setDirConf(cls,path,prefix=None,mkdir=False): return cls.setJoinPathDir(path,pathStr.base_conf_path(),prefix=prefix,mkdir=mkdir)
+    def setDirConf(cls,path,suffix=None,mkdir=False): return cls.setJoinPathDir(path,pathStr.base_conf_path(),suffix=suffix,mkdir=mkdir)
     @classmethod
-    def setDirCBZ(cls,path,prefix=None,mkdir=False): return cls.setJoinPathDir(path,pathStr.base_cbz(),prefix=prefix,mkdir=mkdir)
+    def setDirCBZ(cls,path,suffix=None,mkdir=False): return cls.setJoinPathDir(path,pathStr.base_cbz(),suffix=suffix,mkdir=mkdir)
     @classmethod
-    def setDirImg(cls,path,prefix=None,mkdir=False): return cls.setJoinPathDir(path,pathStr.base_comic_img(),prefix=prefix,mkdir=mkdir)
+    def setDirImg(cls,path,suffix=None,mkdir=False): return cls.setJoinPathDir(path,pathStr.base_comic_img(),suffix=suffix,mkdir=mkdir)
+    @classmethod
+    def setDirOld(cls,path,suffix=None,mkdir=False): return cls.setJoinPathDir(path,pathStr.old_cbz_path,suffix=suffix,mkdir=mkdir)
     #漫画配置文件路径 
     @classmethod
     def getDirConfComic(cls): return cls.setDirConf(Comic.getOriginComicName())
     #章节配置json文件路径
     @classmethod
-    def getPathConfComicChapterJson(cls,mkdir=True): return cls.setDirConf([Comic.getOriginComicName(),Comic.getOriginChapterName()],prefix="json",mkdir=mkdir)
+    def getPathConfComicChapterJson(cls,mkdir=True): return cls.setDirConf([Comic.getOriginComicName(),Comic.getOriginChapterName()],suffix="json",mkdir=mkdir)
     #Icons json文件路径
     @classmethod
-    def getDirConfDefault(cls,path=None,prefix=None,mkdir=True): return cls.setDirConf([cls.DEFAULT_PATH,path],prefix=prefix,mkdir=mkdir)
+    def getDirConfDefault(cls,path=None,suffix=None,mkdir=True): return cls.setDirConf([cls.DEFAULT_PATH,path],suffix=suffix,mkdir=mkdir)
     #漫画进度文件
     @classmethod
-    def getPathProgressJson(cls,mkdir=True): return cls.setDirConf([cls.PROGRESS_PATH,Comic.getOriginComicName()],prefix="json",mkdir=mkdir)
+    def getPathProgressJson(cls,mkdir=True): return cls.setDirConf([cls.PROGRESS_PATH,Comic.getOriginComicName()],suffix="json",mkdir=mkdir)
     #漫画CBZ路径
     @classmethod
     def getDirCBZComic(cls): return cls.setDirCBZ(Comic.getComicName())
     #漫画章节CBZ路径     
     @classmethod
     def getDirCBZComicChapter(cls): return cls.setDirCBZ([Comic.getComicName(),Comic.getChapterName()])
+    #旧版本漫画章节CBZ路径
+    @classmethod
+    def getPathOldCBZComicChapter(cls): return cls.setDirOld([Comic.getOriginComicName(),Comic.getOriginChapterName()],suffix="CBZ")
     #排序 
     @classmethod
     def getSortDirCBZComicChapter(cls): return cls.setDirCBZ([Comic.getComicName()],str(Comic.getNumber())+" "+Comic.getChapterName())