From 5075891c3fccbb16e5de6107e7553f4182d0fbfb Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 21 Jul 2023 17:17:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=BC=82=E5=B8=B8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=92=8C=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index b7623a9..7f959a4 100644 --- a/main.py +++ b/main.py @@ -6,7 +6,7 @@ from PIL import Image import io -def get_html(url, max_retries=3): +def get_html(url, file_name, max_retries=3): session = requests.Session() adapter = requests.adapters.HTTPAdapter(max_retries=max_retries) session.mount("http://", adapter) @@ -18,7 +18,7 @@ def get_html(url, max_retries=3): return response.text except Exception as e: print(f"Error occurred while fetching HTML from {url}: {e}") - raise Exception("获取网页html失败") + raise Exception(f"{file_name}, 获取网页html失败") def download_image(img_url, max_retries=5): @@ -70,6 +70,9 @@ def set_img_obj_data(img_obj): def concatenate_images_vertically(img_obj_list, output_file): + """ + 垂直拼接图片,并保存到本地目录 + """ try: # 计算拼接后的长图宽度和总高度 max_width = max( @@ -106,7 +109,7 @@ def process_batch(lines): if line: # 解析出 HTML 文件名和 URL 地址 file_name, _, url = line.partition(" - ") - html_content = get_html(url) + html_content = get_html(url, file_name) img_url_list = get_img_urls(html_content) img_obj_list = create_img_obj_list(img_url_list, file_name)