cobweb-launcher 3.1.32__py3-none-any.whl → 3.1.33__py3-none-any.whl

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.dist-info → cobweb_launcher-3.1.33.dist-info}/METADATA

@@ -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.dist-info → cobweb_launcher-3.1.33.dist-info}/RECORD

@@ -5,7 +5,7 @@ cobweb/base/__init__.py,sha256=NanSxJr0WsqjqCNOQAlxlkt-vQEsERHYBzacFC057oI,222
 cobweb/base/common_queue.py,sha256=hYdaM70KrWjvACuLKaGhkI2VqFCnd87NVvWzmnfIg8Q,1423
 cobweb/base/item.py,sha256=1bS4U_3vzI2jzSSeoEbLoLT_5CfgLPopWiEYtaahbvw,1674
 cobweb/base/logger.py,sha256=Vsg1bD4LXW91VgY-ANsmaUu-mD88hU_WS83f7jX3qF8,2011
-cobweb/base/request.py,sha256=_NRqwZJGwlWgxSzSQjuDEilT0_ckPPRrxpUKUReKTq4,20934
+cobweb/base/request.py,sha256=NOGoheNTnFJV3AuQi5Gi54wVtMDQf1Fw6MsuBslPH3k,21004
 cobweb/base/response.py,sha256=L3sX2PskV744uz3BJ8xMuAoAfGCeh20w8h0Cnd9vLo0,11377
 cobweb/base/seed.py,sha256=ddaWCq_KaWwpmPl1CToJlfCxEEnoJ16kjo6azJs9uls,5000
 cobweb/base/task_queue.py,sha256=2MqGpHGNmK5B-kqv7z420RWyihzB9zgDHJUiLsmtzOI,6402
@@ -34,8 +34,8 @@ cobweb/utils/decorators.py,sha256=ZwVQlz-lYHgXgKf9KRCp15EWPzTDdhoikYUNUCIqNeM,11
 cobweb/utils/dotting.py,sha256=L-jGSApdnFIP4jUWH6p5qIme0aJ1vyDrxAx8wOJWvcs,1960
 cobweb/utils/oss.py,sha256=wmToIIVNO8nCQVRmreVaZejk01aCWS35e1NV6cr0yGI,4192
 cobweb/utils/tools.py,sha256=14TCedqt07m4z6bCnFAsITOFixeGr8V3aOKk--L7Cr0,879
-cobweb_launcher-3.1.32.dist-info/LICENSE,sha256=z1rxSIGOyzcSb3orZxFPxzx-0C1vTocmswqBNxpKfEk,1063
-cobweb_launcher-3.1.32.dist-info/METADATA,sha256=8SmVQDWc48GUGuhEUx8cjOtjD4LtgNG9-2_n0UeJgGc,6051
-cobweb_launcher-3.1.32.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-cobweb_launcher-3.1.32.dist-info/top_level.txt,sha256=4GETBGNsKqiCUezmT-mJn7tjhcDlu7nLIV5gGgHBW4I,7
-cobweb_launcher-3.1.32.dist-info/RECORD,,
+cobweb_launcher-3.1.33.dist-info/LICENSE,sha256=z1rxSIGOyzcSb3orZxFPxzx-0C1vTocmswqBNxpKfEk,1063
+cobweb_launcher-3.1.33.dist-info/METADATA,sha256=rduVZ1FDZbCFRdSYWwap8vXp9H85tEj78KgjONWQFwo,6051
+cobweb_launcher-3.1.33.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+cobweb_launcher-3.1.33.dist-info/top_level.txt,sha256=4GETBGNsKqiCUezmT-mJn7tjhcDlu7nLIV5gGgHBW4I,7
+cobweb_launcher-3.1.33.dist-info/RECORD,,