优化异常处理

Author: hect0x7

src/jmcomic/jm_client_impl.py

@@ -959,10 +959,7 @@ def require_resp_success(cls, resp: JmApiResp, url: Optional[str] = None):
 
         # 1. 检查是否 album_missing
         # json: {'code': 200, 'data': []}
-        data = resp.model().data
-        if isinstance(data, list) and len(data) == 0:
-            ExceptionTool.raise_missing(resp, JmcomicText.parse_to_jm_id(url))
-
+        # 最新api已不存在这种情况，无需检查
         # 2. 是否是特殊的内容
         # 暂无
 

src/jmcomic/jm_client_interface.py

@@ -122,18 +122,24 @@ def decoded_data(self) -> str:
     def encoded_data(self) -> str:
         return self.json()['data']
 
+    def require_have_data(self):
+        data = self.encoded_data
+        if isinstance(data, list) and len(data) == 0 and self.json().get('errorMsg', None):
+            ExceptionTool.raises_resp(f'data返回值异常: {self.text}', self)
+
     @property
     def res_data(self) -> Any:
         self.require_success()
+        self.require_have_data()
         from json import loads
         return loads(self.decoded_data)
 
     @property
     def model_data(self) -> AdvancedDict:
         self.require_success()
+        self.require_have_data()
         return AdvancedDict(self.res_data)
 
-
 # album-comment
 class JmAlbumCommentResp(JmJsonResp):
 

src/jmcomic/jm_option.py

@@ -1,4 +1,5 @@
 from .jm_client_impl import *
+from .jm_toolkit import JmcomicText
 
 
 class CacheRegistry:
@@ -130,9 +131,9 @@ def parse_bd_rule(self, album, photo, rule):
     @classmethod
     def parse_f_string_rule(cls, album, photo, rule: str):
         properties = {}
-        if album:
+        if album is not None:
             properties.update(album.get_properties_dict())
-        if photo:
+        if photo is not None:
             properties.update(photo.get_properties_dict())
         return rule.format(**properties)