补充异常信息和代码注释
This commit is contained in:
parent
f41105b9c1
commit
5075891c3f
9
main.py
9
main.py
@ -6,7 +6,7 @@ from PIL import Image
|
|||||||
import io
|
import io
|
||||||
|
|
||||||
|
|
||||||
def get_html(url, max_retries=3):
|
def get_html(url, file_name, max_retries=3):
|
||||||
session = requests.Session()
|
session = requests.Session()
|
||||||
adapter = requests.adapters.HTTPAdapter(max_retries=max_retries)
|
adapter = requests.adapters.HTTPAdapter(max_retries=max_retries)
|
||||||
session.mount("http://", adapter)
|
session.mount("http://", adapter)
|
||||||
@ -18,7 +18,7 @@ def get_html(url, max_retries=3):
|
|||||||
return response.text
|
return response.text
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error occurred while fetching HTML from {url}: {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):
|
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):
|
def concatenate_images_vertically(img_obj_list, output_file):
|
||||||
|
"""
|
||||||
|
垂直拼接图片,并保存到本地目录
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
# 计算拼接后的长图宽度和总高度
|
# 计算拼接后的长图宽度和总高度
|
||||||
max_width = max(
|
max_width = max(
|
||||||
@ -106,7 +109,7 @@ def process_batch(lines):
|
|||||||
if line:
|
if line:
|
||||||
# 解析出 HTML 文件名和 URL 地址
|
# 解析出 HTML 文件名和 URL 地址
|
||||||
file_name, _, url = line.partition(" - ")
|
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_url_list = get_img_urls(html_content)
|
||||||
img_obj_list = create_img_obj_list(img_url_list, file_name)
|
img_obj_list = create_img_obj_list(img_url_list, file_name)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user