From 59c5ed245fbe10dadef0da1e538aecbc53c53147 Mon Sep 17 00:00:00 2001 From: hjdhnx Date: Sat, 18 Nov 2023 16:09:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=B8=8B=E8=BD=BD=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/version.txt | 2 +- utils/download_progress.py | 5 +++++ utils/update.py | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/js/version.txt b/js/version.txt index a268f2e..0c0d721 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.9.48beta27 \ No newline at end of file +3.9.48beta28 \ No newline at end of file diff --git a/utils/download_progress.py b/utils/download_progress.py index 097602d..2533f8b 100644 --- a/utils/download_progress.py +++ b/utils/download_progress.py @@ -164,6 +164,11 @@ def file_downloads(files, save_path='download'): logger.info( "\n{} file{} download successfully, {} file{} download failed!".format(sn, 's' * (sn > 1), fn, 's' * (fn > 1))) + if fn > 0: + return False + else: + return True + if __name__ == '__main__': # urlTxt = 'download/urls.txt' diff --git a/utils/update.py b/utils/update.py index 04694aa..3993833 100644 --- a/utils/update.py +++ b/utils/update.py @@ -226,7 +226,9 @@ def download_new_version(update_proxy='https://ghproxy.liuzhicong.com/'): # f.write(rb) # 2023/11/18 改为带进度条的下载 - file_downloads([{'url': url, 'name': 'dr_py.zip'}], tmp_path) + download_ok = file_downloads([{'url': url, 'name': 'dr_py.zip'}], tmp_path) + if not download_ok: + return '带进度条的下载升级文件失败。具体参考后台日志' # print(f'开始解压文件:{download_path}') logger.info(f'开始解压文件:{download_path}')