perf(download.py): 优化文件下载异常提示

1. 优化错误信息提示
2. 更新翻译内容
This commit is contained in:
JoeanAmier 2024-08-18 14:05:05 +08:00
parent 77b1d05ad8
commit 76e40b6ddf
4 changed files with 23 additions and 11 deletions

Binary file not shown.

View File

@ -190,8 +190,11 @@ msgstr "{0} already exists, skipping download"
msgid "文件 {0} 下载成功"
msgstr "file {0} download successful"
msgid "网络异常,{0} 下载失败"
msgstr "Network error, {0} download failed"
msgid "网络异常,{0} 请求失败,错误信息: {1}"
msgstr "Network error, {0} request failed, error message: {1}"
msgid "网络异常,{0} 下载失败,错误信息: {1}"
msgstr "Network error, {0} download failed, error message: {1}"
msgid "共 {0} 个小红书作品待处理..."
msgstr "{0} works from Xiaohongshu are awaiting processing..."

View File

@ -190,7 +190,10 @@ msgstr ""
msgid "文件 {0} 下载成功"
msgstr ""
msgid "网络异常,{0} 下载失败"
msgid "网络异常,{0} 请求失败,错误信息: {1}"
msgstr ""
msgid "网络异常,{0} 下载失败,错误信息: {1}"
msgstr ""
msgid "共 {0} 个小红书作品待处理..."

View File

@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
from aiofiles import open
from httpx import HTTPError
from source.module import ERROR
from source.module import ERROR, WARNING
from source.module import Manager
from source.module import logging
from source.module import retry as re_download
@ -132,19 +132,22 @@ class Download:
try:
length, suffix = await self.__head_file(url, headers, format_, )
except HTTPError as error:
logging(log, str(error), ERROR)
logging(
log,
self.message(
"网络异常,{0} 请求失败").format(name),
"网络异常,{0} 请求失败,错误信息: {1}").format(name, error),
ERROR,
)
logging(
log,
f"{url} Head Headers: {headers.get("Range")}",
WARNING,
)
return False
temp = self.temp.joinpath(f"{name}.{suffix}")
real = path.joinpath(f"{name}.{suffix}")
self.__update_headers_range(headers, temp, )
try:
# print(f"{url} Stream Headers:", headers.get("Range")) # 调试代码
async with self.client.stream("GET", url, headers=headers, ) as response:
response.raise_for_status()
# self.__create_progress(
@ -162,15 +165,19 @@ class Download:
logging(log, self.message("文件 {0} 下载成功").format(real.name))
return True
except HTTPError as error:
self.manager.delete(temp)
# self.manager.delete(temp)
# self.__create_progress(bar, None)
logging(log, str(error), ERROR)
logging(
log,
self.message(
"网络异常,{0} 下载失败").format(name),
"网络异常,{0} 下载失败,错误信息: {1}").format(name, error),
ERROR,
)
logging(
log,
f"{url} Stream Headers: {headers.get("Range")}",
WARNING,
)
return False
@staticmethod
@ -192,7 +199,6 @@ class Download:
headers: dict[str, str],
suffix: str,
) -> [int, str]:
# print(f"{url} Head Headers:", headers.get("Range")) # 调试代码
response = await self.client.head(
url,
headers=headers,