From ea069700aa9fc7b08c8f311779e1bd720491b1cc Mon Sep 17 00:00:00 2001 From: caiwx86 Date: Sun, 12 Feb 2023 14:34:29 +0800 Subject: [PATCH] fix --- utils/base/BaseComicEntity.py | 2 +- utils/downloader.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/utils/base/BaseComicEntity.py b/utils/base/BaseComicEntity.py index 1fa5c31..185a009 100644 --- a/utils/base/BaseComicEntity.py +++ b/utils/base/BaseComicEntity.py @@ -141,7 +141,7 @@ class baseComic: is_next = verUtils.verNextCBZ(list_img) repeat = 1 while not is_next and repeat <= 2: - download_images(list_img,ci.getDirComicChapter(), files_name=files_name,concurrency=5,timeout=60) + download_images(list_img,ci.getDirComicChapter(), files_name=files_name,timeout=60) is_next = len(",".join(os.listdir(ci.getDirComicChapter())).split(".jpg"))-1 == len(list_img) if not is_next: sleep_time = 3+int(repeat)*2 diff --git a/utils/downloader.py b/utils/downloader.py index 4399387..17f5149 100644 --- a/utils/downloader.py +++ b/utils/downloader.py @@ -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)) -def download_images(image_urls, dst_dir,timeout=30,concurrency=None, proxy_type=None, proxy=None,files_name=None): +def download_images(image_urls, dst_dir,timeout=30,proxy_type=None, proxy=None,files_name=None): """ Download image according to given urls and automatically rename them in order. :param timeout: @@ -80,8 +80,7 @@ def download_images(image_urls, dst_dir,timeout=30,concurrency=None, proxy_type= :param concurrency: number of requests process simultaneously :return: none """ - if concurrency == None: - concurrency = len(image_urls) + concurrency = len(image_urls) with concurrent.futures.ThreadPoolExecutor(max_workers=concurrency) as executor: future_list = list() count = 0