cwx/ComicScrapy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
caiwx86 2024-07-22 01:29:57 +08:00
parent e45f173bbb
commit 3ec9c7d8d6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Comics/pipelines.py
View File

@ -27,8 +27,7 @@ class ComicsPipeline():
if fu.exists(ComicPath(item).PATH_CBZ()): result_item = ItemExporter().export_obj(item) if fu.exists(ComicPath(item).PATH_CBZ()): result_item = ItemExporter().export_obj(item)
# 不存在漫画CBZ文件 # 不存在漫画CBZ文件
else: result_item = JsonExport(file=ComicPath(item).getDirJosnComicChapter()).export_json(ComicLoader(item).load_item(), if_return=True) else: result_item = JsonExport(file=ComicPath(item).getDirJosnComicChapter()).export_json(ComicLoader(item).load_item(), if_return=True)
c_chapter = ComicPath.chinese_convert(result_item["chapters"]) oldUtils().clean_old_files(files=result_item["chapters"], folder=ComicPath(item).file_path(result_type=ComicPath.MAPPING_CBZ_DIR), move_folder=ComicPath(item).file_path(result_type=ComicPath.MAPPING_OLD_CBZ_DIR))
oldUtils().clean_old_files(files=c_chapter, folder=ComicPath(item).file_path(result_type=ComicPath.MAPPING_CBZ_DIR), move_folder=ComicPath(item).file_path(result_type=ComicPath.MAPPING_OLD_CBZ_DIR))
return result_item return result_item
class BaseImagesPipeline(ImagesPipeline): class BaseImagesPipeline(ImagesPipeline):

12
Comics/utils.py
View File

@ -695,8 +695,6 @@ class ComicPath:
#处理成符合规定的文件名 #处理成符合规定的文件名
@classmethod @classmethod
def fix_file_name(cls, filename, replace=None): def fix_file_name(cls, filename, replace=None):
if isinstance(filename, list):
for file in filename: cls.fix_file_name(file)
if not isinstance(filename, str): if not isinstance(filename, str):
return filename return filename
in_tab = r'[?*/\|.:><]' in_tab = r'[?*/\|.:><]'
@ -870,15 +868,19 @@ class oldUtils:
if os.path.exists(folder): if os.path.exists(folder):
file_names = [f.name for f in pathlib.Path(folder).iterdir() if f.is_file()] file_names = [f.name for f in pathlib.Path(folder).iterdir() if f.is_file()]
else: else:
return None return None
old_item = [] old_item = []
for file_name in file_names: for file_name in file_names:
file_split = file_name.split(".") file_split = file_name.split(".")
file_suffix = file_split[-1] file_suffix = file_split[-1]
file_prefix = file_split[0] file_prefix = file_split[0]
if file_suffix == suffix: if file_suffix == suffix:
old_item.append(file_prefix) old_item.append(file_prefix)
new_item = ComicPath.fix_file_name(files)
new_item = []
if isinstance(files, str): new_item.append(ComicPath.chinese_convert(ComicPath.fix_file_name(file)))
else:
for file in files: new_item.append(ComicPath.chinese_convert(ComicPath.fix_file_name(file)))
only_in_new_item = [item for item in new_item if item not in old_item] only_in_new_item = [item for item in new_item if item not in old_item]
only_in_old_item = [item for item in old_item if item not in new_item] only_in_old_item = [item for item in old_item if item not in new_item]
in_new_item_and_old_item = [item for item in new_item if item in old_item] in_new_item_and_old_item = [item for item in new_item if item in old_item]