try_parse_json_object

Author: hect0x7

src/jmcomic/jm_client_interface.py

@@ -116,6 +116,13 @@ def json(self) -> Dict:
     def is_success(self) -> bool:
         return super().is_success and self.json()['code'] == 200
 
+    def json(self) -> Dict:
+        try:
+            text = self.resp.text
+            return JmcomicText.try_parse_json_object(text)
+        except Exception as e:
+            ExceptionTool.raises_resp(f'json解析失败: {e}', self, JsonResolveFailException)
+
     @property
     @field_cache()
     def decoded_data(self) -> str:

src/jmcomic/jm_toolkit.py

@@ -61,6 +61,8 @@ class JmcomicText:
 
     # 提取接口返回值信息
     pattern_ajax_favorite_msg = compile(r'</button>(.*?)</div>')
+    # 提取api接口返回值里的json，防止返回值里有无关日志导致json解析报错
+    pattern_api_response_json_object = re.compile(r'\{.*?}')
 
     @classmethod
     def parse_to_jm_domain(cls, text: str):
@@ -344,6 +346,18 @@ def try_mkdir(cls, save_dir: str):
             raise e
         return save_dir
 
+    # noinspection PyTypeChecker
+    @classmethod
+    def try_parse_json_object(cls, text: str) -> dict:
+        import json
+        text = text.strip()
+        if text.startswith('{') and text.endswith('}'):
+            # fast case
+            return json.loads(text)
+
+        for match in cls.pattern_api_response_json_object.finditer(text):
+            return json.loads(match.group(0))
+
 
 # 支持dsl: #{???} -> os.getenv(???)
 JmcomicText.dsl_replacer.add_dsl_and_replacer(r'\$\{(.*?)\}', JmcomicText.match_os_env)