From 72848d9d72ab3c2d4ea67fa7c21be865d7610209 Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Wed, 22 Nov 2023 23:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E8=BD=BD=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/version.txt             |  2 +-
 utils/download_progress.py | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/js/version.txt b/js/version.txt
index 8df5f76..f46cb8c 100644
--- a/js/version.txt
+++ b/js/version.txt
@@ -1 +1 @@
-3.9.49beta3
\ No newline at end of file
+3.9.49beta4
\ No newline at end of file
diff --git a/utils/download_progress.py b/utils/download_progress.py
index ca78341..7247db3 100644
--- a/utils/download_progress.py
+++ b/utils/download_progress.py
@@ -53,8 +53,14 @@ def file_download(fileUrl, filePath):
         os.remove(filePath)
     # response = requests.get(fileUrl, headers=headers, stream=True, verify=False)
     response = requests.get(fileUrl, headers=headers, stream=True)
-    fileSize = int(response.headers['content-length'])  # 文件大小
+    is_chunked = response.headers.get('Transfer-Encoding') or ''
+    if is_chunked == 'chunked':
+        logger.info('chunked文件不支持获取总文件大小，tqdm模块才能分段下载')
+        return False
+    fileSize = int(response.headers.get('content-length') or 0)  # 文件大小
     logger.info(f'fileSize:{fileSize}')
+    if fileSize < 1:
+        return False
 
     tmpSize = 0
     n = 0
@@ -175,7 +181,11 @@ if __name__ == '__main__':
     # urlTxt = 'download/urls.txt'
     # with open(urlTxt, "r") as f:
     #     fileUrls = [line.strip() for line in f.readlines()]
+    response = requests.get('https://ghproxy.liuzhicong.com/https://github.com/hjdhnx/dr_py/archive/refs/heads/main.zip', headers=headers, stream=True)
+    print(response.headers)
+    fileSize = int(response.headers.get('content-length'))  # 文件大小
+    logger.info(f'fileSize:{fileSize}')
 
-    files = [{'url': 'https://ghproxy.liuzhicong.com/https://github.com/hjdhnx/dr_py/archive/refs/heads/main.zip',
-              'name': 'dr_py.zip'}]
-    file_downloads(files, 'tmp')
+    # files = [{'url': 'https://ghproxy.liuzhicong.com/https://github.com/hjdhnx/dr_py/archive/refs/heads/main.zip',
+    #           'name': 'dr_py.zip'}]
+    # file_downloads(files, 'tmp')