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

fix

Browse Source
This commit is contained in:
caiwx86 2023-02-12 14:21:13 +08:00
parent 481a8583ed
commit 5c41ec9dd7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/base/BaseComicEntity.py
View File

@ -141,7 +141,7 @@ class baseComic:
is_next = verUtils.verNextCBZ(list_img) is_next = verUtils.verNextCBZ(list_img)
repeat = 1 repeat = 1
while not is_next and repeat <= 2: while not is_next and repeat <= 2:
download_images(list_img,ci.getDirComicChapter(), files_name=files_name,timeout=20) download_images(list_img,ci.getDirComicChapter(), files_name=files_name,concurrency=5,timeout=60)
is_next = len(",".join(os.listdir(ci.getDirComicChapter())).split(".jpg"))-1 == len(list_img) is_next = len(",".join(os.listdir(ci.getDirComicChapter())).split(".jpg"))-1 == len(list_img)
if not is_next: if not is_next:
sleep_time = 3+int(repeat)*2 sleep_time = 3+int(repeat)*2

3
utils/downloader.py
View File

@ -68,7 +68,7 @@ def download_image(image_url, dst_dir, file_name, timeout=20, proxy_type=None, p
print("## Fail: {} {}".format(image_url, e.args)) print("## Fail: {} {}".format(image_url, e.args))
def download_images(image_urls, dst_dir,timeout=20, proxy_type=None, proxy=None,files_name=None): def download_images(image_urls, dst_dir,timeout=30,concurrency=None, proxy_type=None, proxy=None,files_name=None):
""" """
Download image according to given urls and automatically rename them in order. Download image according to given urls and automatically rename them in order.
:param timeout: :param timeout:
@ -80,6 +80,7 @@ def download_images(image_urls, dst_dir,timeout=20, proxy_type=None, proxy=None,
:param concurrency: number of requests process simultaneously :param concurrency: number of requests process simultaneously
:return: none :return: none
""" """
if concurrency == None:
concurrency = len(image_urls) concurrency = len(image_urls)
with concurrent.futures.ThreadPoolExecutor(max_workers=concurrency) as executor: with concurrent.futures.ThreadPoolExecutor(max_workers=concurrency) as executor:
future_list = list() future_list = list()