cobweb-launcher 3.1.36__tar.gz → 3.1.38__tar.gz

{cobweb-launcher-3.1.36 → cobweb-launcher-3.1.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 3.1.36
+Version: 3.1.38
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-3.1.36 → cobweb-launcher-3.1.38}/cobweb/base/request.py

@@ -440,12 +440,31 @@ class Request:
 
         return result
 
+    def _log_download_progress(self, start_time, downloaded):
+        try:
+            elapsed_time = time.time() - start_time
+            elapsed_time_str = time.strftime("%H:%M:%S", time.gmtime(elapsed_time))
+            progress = downloaded / self.content_length
+            downloaded_mb = downloaded / (1024 * 1024)
+            total_mb = self.content_length / (1024 * 1024)
+            speed = downloaded / elapsed_time / 1024
+            filled_length = int(50 * progress)
+            bar = '█' * filled_length + '-' * (50 - filled_length)
+            logging.info(
+                f"\n\r\rDownloading {self.url}: |{bar}| {progress * 100:.1f}% "
+                f"{downloaded_mb:.1f}/{total_mb:.1f} MB [Time:{elapsed_time_str}, Speed {speed:.2f} KB/s]"
+            )
+        except Exception:
+            pass
+
     def range_download(self, start: int = 0, chunk_size: int = 1024, file_type_detect: bool = True):
         # 分块下载
         downloaded = start
         retry_count = 0
         max_retries = 3
 
+        start_time = time.time()
+
         detect_settings = self.request_settings.copy()
         detect_settings.pop('stream', None)
 
@@ -469,33 +488,38 @@ class Request:
             _start = downloaded
             _end = min(downloaded + chunk_size - 1, self.content_length - 1)
             detect_settings.setdefault("headers", {})['Range'] = f"bytes={_start}-{_end}"
-
-            self.response = requests.request(
-                method=self.method,
-                url=self.url,
-                **detect_settings
-            )
-
-            if self.response.status_code == 206:
-                chunk_data = self.response.content
-                yield chunk_data
-                downloaded += len(chunk_data)
-                retry_count = 0  # 重置重试计数
-                logging.info(f"下载进度: {downloaded}/{self.content_length} ({downloaded / self.content_length * 100:.1f}%)")
-
-            elif self.response.status_code == 416:  # Range Not Satisfiable
-                logging.info("Range请求超出范围")
-                break
-
-            else:
-                logging.debug(f"Range请求失败: {self.response.status_code}")
+            try:
+
+                self.response = requests.request(
+                    method=self.method,
+                    url=self.url,
+                    **detect_settings
+                )
+
+                if self.response.status_code == 206:
+                    chunk_data = self.response.content
+                    yield chunk_data
+                    downloaded += len(chunk_data)
+                    retry_count = 0  # 重置重试计数
+                    self._log_download_progress(
+                        start_time=start_time,
+                        downloaded=downloaded
+                    )
+                elif self.response.status_code == 416:  # Range Not Satisfiable
+                    logging.info("Range请求超出范围")
+                    break
+
+            except Exception as e:
+                logging.exception(f"请求失败 - URL: {self.url}, 错误: {e}, 当前重试次数: {retry_count}")
+            finally:
+                self.response.close()
+                self.response = None
                 if retry_count < max_retries:
+                    time.sleep(0.5 * retry_count)
                     retry_count += 1
-                    time.sleep(0.5)
                     continue
-
-            self.response.close()
-            self.response = None
+                else:
+                    raise ValueError(f"超过当前最大重试次数，请求失败！当前重试次数: {retry_count}")
 
     def detect_accept_ranges(self) -> bool:
         detect_settings = self.request_settings.copy()
@@ -507,13 +531,7 @@ class Request:
             raise ValueError("HTTP状态码错误")
 
         self.content_length = int(head_response.headers.get('content-length', 0))
-        # accept_ranges = str(head_response.headers.get('accept-ranges')).lower()
-        supports_range = True
 
-        # 根据检测结果使用不同下载方式
-        # if accept_ranges == 'none' or not self.content_length:
-        #     supports_range = False
-        # else:
         test_range_settings = detect_settings.copy()
         test_range_settings.setdefault("headers", {})['Range'] = "bytes=0-63"
         test_response = requests.request(
@@ -524,19 +542,23 @@ class Request:
         head_data = test_response.content
         content_type = test_response.headers.get("Content-Type")
 
-        if test_response.status_code == 206:
-            if len(head_data) != 64:
-                supports_range = False
-                self.response = test_response
-                logging.debug(f"⚠️ Range请求返回长度不匹配: 期望64, 实际{len(head_data)}")
-                head_data = head_data[:64]
+        if test_response.status_code == 206 and len(head_data) == 64:
+            supports_range = True
+        elif test_response.status_code == 200:
+            supports_range = False
+            self.response = test_response
+            head_data = head_data[:64]
+            logging.debug(f"Range请求方式不支持, 实际{len(head_data)}")
+        else:
+            supports_range = False
+            logging.error(f"Range请求失败: {test_response.status_code}")
 
+        if not self.detector_info:
+            self.response = test_response
             detector = FileTypeDetector()
             self.detector_info = detector.get_detailed_info(
                 url=self.url, content_type=content_type, data=head_data
             )
-        else:
-            supports_range = False
 
         test_response.close()
         return supports_range

{cobweb-launcher-3.1.36 → cobweb-launcher-3.1.38}/cobweb_launcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 3.1.36
+Version: 3.1.38
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-3.1.36 → cobweb-launcher-3.1.38}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="cobweb-launcher",
-    version="3.1.36",
+    version="3.1.38",
     packages=find_packages(),
     url="https://github.com/Juannie-PP/cobweb",
     license="MIT",