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

fix

Browse Source
This commit is contained in:
caiwx86 2024-10-28 13:09:57 +08:00
parent 63c63e30b6
commit 0a8b66ed36
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Comics/_utils/items.py
View File

@ -5,7 +5,7 @@
import os,Comics.settings as settings,logging import os,Comics.settings as settings,logging
from scrapy.item import Item, Field from scrapy.item import Item, Field
from Comics._utils.utils import ComicPath from Comics._utils.utils import ComicPath
from Comics._utils.utils import imageUtils,fileUtils from Comics._utils.utils import imageUtils
from itemloaders.processors import TakeFirst from itemloaders.processors import TakeFirst
# 繁体中文转为简体中文 # 繁体中文转为简体中文

9
Comics/pipelines.py
View File

@ -106,8 +106,9 @@ class ImgDownloadPipeline(BaseImagesPipeline):
cbz_path = super().get_file_path(item, result_type="cbz") cbz_path = super().get_file_path(item, result_type="cbz")
chapter_dir = ComicPath(item=item).file_path(result_type=ComicPath().MAPPING_IMAGES_DIR) chapter_dir = ComicPath(item=item).file_path(result_type=ComicPath().MAPPING_IMAGES_DIR)
images_file = oldUtils().old_images(folder=chapter_dir) images_file = oldUtils().old_images(folder=chapter_dir)
images_urls = ComicLoader(item=item).get_image_urls()
# 校验数据是正确 # 校验数据是正确
if len(images_file) != len(ComicLoader(item=item).get_image_urls()): return if len(images_file) != len(images_urls): return
super().update_icon(item) super().update_icon(item)
# CBZ文件是否已存在 # CBZ文件是否已存在
if fu.exists(cbz_path): if fu.exists(cbz_path):
@ -119,9 +120,7 @@ class ImgDownloadPipeline(BaseImagesPipeline):
self.pack_icon(item) self.pack_icon(item)
else: else:
# ComicInfoXml 生成 # ComicInfoXml 生成
comic_pages = ComicInfoXml().scrapy_xml_by_json(item, save_dir=super().get_file_path(item=item, result_type="images_dir")) ComicInfoXml().scrapy_xml_by_json(item, save_dir= chapter_dir)
if CBZUtils.packComicChapterCBZ(src_dir= super().get_file_path(item, result_type="images_dir"), if CBZUtils.packComicChapterCBZ(src_dir= chapter_dir, dts_path= cbz_path, comic_info_images= images_urls, remove=True):
dts_path= cbz_path,
comic_info_images= comic_pages, remove=True):
super().update_icon(item) super().update_icon(item)
self.pack_icon(item) self.pack_icon(item)