cobweb-launcher 3.1.32__tar.gz → 3.1.33__tar.gz

{cobweb-launcher-3.1.32 → cobweb-launcher-3.1.33}/PKG-INFO

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

{cobweb-launcher-3.1.32 → cobweb-launcher-3.1.33}/cobweb/base/request.py

@@ -311,6 +311,7 @@ class Request:
         """
         self.scheme = None
         self.netloc = None
+        self.response = None
         self.detector_info = None
         self.content_length = None
         self._validate_url(url)
@@ -469,31 +470,32 @@ class Request:
             _end = min(downloaded + chunk_size - 1, self.total_size - 1)
             detect_settings.setdefault("headers", {})['Range'] = f"bytes={_start}-{_end}"
 
-            response = requests.request(
+            self.response = requests.request(
                 method=self.method,
                 url=self.url,
                 **detect_settings
             )
 
-            if response.status_code == 206:
-                chunk_data = response.content
+            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.total_size} ({downloaded / self.total_size * 100:.1f}%)")
 
-            elif response.status_code == 416:  # Range Not Satisfiable
+            elif self.response.status_code == 416:  # Range Not Satisfiable
                 logging.info("Range请求超出范围")
                 break
 
             else:
-                logging.debug(f"Range请求失败: {response.status_code}")
+                logging.debug(f"Range请求失败: {self.response.status_code}")
                 if retry_count < max_retries:
                     retry_count += 1
                     time.sleep(0.5)
                     continue
 
-            response.close()
+            self.response.close()
+            self.response = None
 
     def detect_accept_ranges(self) -> bool:
         detect_settings = self.request_settings.copy()
@@ -505,38 +507,38 @@ 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()
-
+        # 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(
-                method=self.method,
-                url=self.url,
-                **test_range_settings
-            )
-            head_data = test_response.content
-            content_type = test_response.headers.get("Content-Type")
+        # 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(
+            method=self.method,
+            url=self.url,
+            **test_range_settings
+        )
+        head_data = test_response.content
+        content_type = test_response.headers.get("Content-Type")
 
-            if test_response.status_code == 206:
-                if len(head_data) != 64:
-                    logging.debug(f"⚠️ Range请求返回长度不匹配: 期望64, 实际{len(head_data)}")
-                    supports_range = False
-                else:
-                    detector = FileTypeDetector()
-                    self.detector_info = detector.get_detailed_info(
-                        url=self.url, content_type=content_type, data=head_data
-                    )
-            else:
+        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]
 
-            test_response.close()
+            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
 
     def detect_file_type(self) -> Dict[str, Any]:

{cobweb-launcher-3.1.32 → cobweb-launcher-3.1.33}/cobweb_launcher.egg-info/PKG-INFO

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

{cobweb-launcher-3.1.32 → cobweb-launcher-3.1.33}/setup.py

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