From 76e40b6ddf2c23d502b8286988921088d4ff699c Mon Sep 17 00:00:00 2001 From: JoeanAmier Date: Sun, 18 Aug 2024 14:05:05 +0800 Subject: [PATCH] =?UTF-8?q?perf(download.py):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E5=BC=82=E5=B8=B8=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 优化错误信息提示 2. 更新翻译内容 --- locale/en_GB/LC_MESSAGES/xhs.mo | Bin 12065 -> 12243 bytes locale/en_GB/LC_MESSAGES/xhs.po | 7 +++++-- locale/zh_CN/LC_MESSAGES/xhs.po | 5 ++++- source/application/download.py | 22 ++++++++++++++-------- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/locale/en_GB/LC_MESSAGES/xhs.mo b/locale/en_GB/LC_MESSAGES/xhs.mo index 830c8ebf76780268a8f41527012ae27545d923a7..5de18aa842910e8985dd593f57e5b5e2ca7fc41a 100644 GIT binary patch delta 2254 zcmZwIe@xVM9LMo@f(CffabXIjT$(@Vu+9+c=oglvNLYvlS?c-YXs#G_)Ur9eve4RE zTS=R`++@|-I+N(!V#{*NEvrRy(H}IoX7WQ^Z8V^{)z*5xzW2G-AAZLB`}lso_x*l; zzQ13(w)AgJ{1V81$0$+aCPkLnD{>kK%HkZeIaumkjdxRz;SJb@^RU;|&*RP1$8iT1 z=9;a;-FPFO#p`eod(9Fy!HGIJo@X`-zjI#1GU|Uh7fm;tO?`v21#h9gAJt*fUGGD6 zG~%4%Gvm+Za+rZ3T!;~zMgJD%B*=x`s16R}O#IZ_18)1_316xj2huy=P?XZ{|YsO38$~nY$^2x zxC9$f1M0vKevHfUXVgIaj9$+NQ3HygR#qyjxu6?c@l{N?8?#CAyQmkSvV1Kn zNn3C|c3?3M-~yaLHC)6^w_ybyz?~Sy-%-EUF&bVF+m+C;t}%3& zll?!!iAH=9HM0R^QZ|VNSj4(&OG2pRtU=ner;tDEPST^lPMas21GOV zAfatsN2m>zhY3wklX4|tTR6Ml)mEeSriSnlPY~J)&H4^vC844>Ayc+;5+xck7ch^= z{$E|En+a{3UN|KKjOiQ$pm_cMp6(^0vCU;@FQ<<$j)+#>k zuCZu#FHuh@!BwUZ)x;yjTH;aqw|rs)kty116=l5=i+u6^<&yCK747F#qL$F>r=lEC z#;+i9iA>?m^Ip|Voo|r$Q6o*PLJ3k%khJy~p|YOf%W3zhLb*1LcdXW#~thex}+hfa5myxd(G+_SXZE`9OVrO)3TKDBSSx0f6CgxiCo-Jgy0>>GZ+XY}L; zS9>Nk8MrXJuq+sh$6MpUmRMWcwkKm=YX^Hmh4bREXP=L?Jr``=w(IHG&a2&)`YBYG F^)Kdx`l|o{ delta 2089 zcmX}sS!|3^7{>9JqC2{`C_}ZjqS|7pU2Ch>u2t1G5lwJYuB@3z1nD#`h;Y#mNkfSW z=0cN(ga%DSVu=uuhKdVu(O!_)`9I$rJ;^)2bH17HEblpIUesQ!33Mk8I%AYtVib`a zVHUu+A$(AxqRcWe+BpG>XqR9r9>H;V&b2#mEbZsG9lu~XRz{nR#LGAgJF#6uy`Z82 znqth-@T&7Z=F)!SjEpr)r(NhQ!|}B1Q3D3u^ET8#51l<2NBa-PV=Rpv%)m4)brBUG z4=Pau?8g*5<=U;Teb2RDVIkl5VIpSJYaaSh6WWPYcoNmmC(OXVI1w|3n$5)}QmH;n zWi+;BBj+{iuHTqL(RD#@jHU zjviCd-uIz?7@rXCCd!dK9Lpvec&z?t?)JSo&9uQq_WX!=b<_%MXjI)XX63XK(}xKb|J4? zB}Law<2l4wb@$>E7YA z`P4PQ|H4jqTcRu|GXsf8f_?O^8L#!1Dry=$-#t-gw-Jkob%aW(_FrW=v5?SYR5aVQ zUM-v|SM5iuTkTq9{ZGUDuI5sLMSFj(#;^ zN}19-gV;du-{Eb;N+e<4Rt-X(2^HM}op_aMf?f4WG@ol+J>FTa^=mKm=c3f>#BL;N z37vKo9U?!WJ>N_WCb&KQrI?zJ&~;R)Al7>|{$QLsN2>_kfH-0vkw>I(du#=ZEt+p<}sa5&r-HD7C!+ diff --git a/locale/en_GB/LC_MESSAGES/xhs.po b/locale/en_GB/LC_MESSAGES/xhs.po index 2849281..60bec08 100644 --- a/locale/en_GB/LC_MESSAGES/xhs.po +++ b/locale/en_GB/LC_MESSAGES/xhs.po @@ -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..." diff --git a/locale/zh_CN/LC_MESSAGES/xhs.po b/locale/zh_CN/LC_MESSAGES/xhs.po index a5bf704..70605b1 100644 --- a/locale/zh_CN/LC_MESSAGES/xhs.po +++ b/locale/zh_CN/LC_MESSAGES/xhs.po @@ -190,7 +190,10 @@ msgstr "" msgid "文件 {0} 下载成功" msgstr "" -msgid "网络异常，{0} 下载失败" +msgid "网络异常，{0} 请求失败，错误信息: {1}" +msgstr "" + +msgid "网络异常，{0} 下载失败，错误信息: {1}" msgstr "" msgid "共 {0} 个小红书作品待处理..." diff --git a/source/application/download.py b/source/application/download.py index 22c318b..6c2de15 100644 --- a/source/application/download.py +++ b/source/application/download.py @@ -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,