修改 status_codes 为 is_success, 不再支持字典, 改为支持动态脚本

YichaoDeng · Dec 20, 2023 · c0840ef · c0840ef
1 parent 094d0fe
commit c0840ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/bricks/lib/request.py b/bricks/lib/request.py
@@ -29,7 +29,7 @@ def __init__(
             allow_redirects: bool = True,
             proxies: Optional[str] = None,
             proxy: Optional[dict] = None,
-            status_codes: Optional[dict] = ...,
+            is_success: Optional[str] = ...,
             retry: int = 0,
             max_retry: int = 5,
     ) -> None:
@@ -44,7 +44,7 @@ def __init__(
         self.allow_redirects = allow_redirects
         self.proxies = proxies
         self.proxy = proxy
-        self.status_codes = status_codes
+        self.is_success = is_success
         self.retry = retry
         self.max_retry = max_retry
 

diff --git a/bricks/lib/response.py b/bricks/lib/response.py
@@ -322,16 +322,14 @@ def ok(self):
 
         :return:
         """
-        status_codes = self.request.status_codes
+        is_success = self.request.is_success
 
         # None -> 所有状态码, 除了 -1 , -1 代表请求过程中发生了错误
-        if status_codes is None:
+        if is_success is None:
             return self.status_code != -1
 
-        elif isinstance(status_codes, dict):
-            mode = status_codes.get('mode', 'include')
-            default = 1 if mode == 'include' else 0
-            return bool(status_codes.get(self.status_code, default))
+        elif isinstance(is_success, str):
+            return eval(is_success, {"status_code": self.status_code, "response": self})
 
         # 默认 -> 200 到 400
         else:

diff --git a/bricks/spider/form.py b/bricks/spider/form.py
@@ -72,7 +72,7 @@ class Download(RenderNode):
     allow_redirects: bool = True
     proxies: Optional[str] = None
     proxy: Optional[dict] = None
-    status_codes: Optional[dict] = ...
+    is_success: Optional[str] = ...
     retry: int = 0
     max_retry: int = 5
     archive: bool = False
@@ -90,7 +90,7 @@ def to_request(self) -> Request:
             allow_redirects=self.allow_redirects,
             proxies=self.proxies,
             proxy=self.proxy,
-            status_codes=self.status_codes,
+            is_success=self.is_success,
             retry=self.retry,
             max_retry=self.max_retry
         )