补充异常信息和代码注释

This commit is contained in:
vincent 2023-07-21 17:17:03 +08:00
parent f41105b9c1
commit 5075891c3f

View File

@ -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)