jmcomic 2.5.1__py3-none-any.whl → 2.5.3__py3-none-any.whl

jmcomic/__init__.py

@@ -2,7 +2,7 @@
 # 被依赖方 <--- 使用方
 # config <--- entity <--- toolkit <--- client <--- option <--- downloader
 
-__version__ = '2.5.1'
+__version__ = '2.5.3'
 
 from .api import *
 from .jm_plugin import *

jmcomic/jm_client_impl.py

@@ -78,8 +78,10 @@ class AbstractJmClient(
         :param kwargs: 请求方法的kwargs
         """
         if domain_index >= len(self.domain_list):
-            self.fallback(request, url, domain_index, retry_count, **kwargs)
-
+            return self.fallback(request, url, domain_index, retry_count, **kwargs)
+        
+        url_backup = url
+        
         if url.startswith('/'):
             # path → url
             domain = self.domain_list[domain_index]
@@ -120,9 +122,9 @@ class AbstractJmClient(
             self.before_retry(e, kwargs, retry_count, url)
 
         if retry_count < self.retry_times:
-            return self.request_with_retry(request, url, domain_index, retry_count + 1, callback, **kwargs)
+            return self.request_with_retry(request, url_backup, domain_index, retry_count + 1, callback, **kwargs)
         else:
-            return self.request_with_retry(request, url, domain_index + 1, 0, callback, **kwargs)
+            return self.request_with_retry(request, url_backup, domain_index + 1, 0, callback, **kwargs)
 
     # noinspection PyMethodMayBeStatic
     def raise_if_resp_should_retry(self, resp):
@@ -209,7 +211,7 @@ class AbstractJmClient(
     def fallback(self, request, url, domain_index, retry_count, **kwargs):
         msg = f"请求重试全部失败: [{url}], {self.domain_list}"
         jm_log('req.fallback', msg)
-        ExceptionTool.raises(msg)
+        ExceptionTool.raises(msg, {}, RequestRetryAllFailException)
 
     # noinspection PyMethodMayBeStatic
     def append_params_to_url(self, url, params):

jmcomic/jm_config.py

@@ -117,10 +117,10 @@ class JmModuleConfig:
 
     # 移动端API域名
     DOMAIN_API_LIST = str_to_list('''
+    www.jmapinode.biz
     www.jmapinode1.top
     www.jmapinode2.top
     www.jmapinode3.top
-    www.jmapinode.biz
     www.jmapinode.top
     
     ''')
@@ -144,8 +144,11 @@ class JmModuleConfig:
     REGISTRY_CLIENT = {}
     # 插件注册表
     REGISTRY_PLUGIN = {}
-    # 异常处理器
-    REGISTRY_EXCEPTION_ADVICE = {}
+    # 异常监听器
+    # key: 异常类
+    # value: 函数，参数只有异常对象，无需返回值
+    # 这个异常类（或者这个异常的子类）的实例将要被raise前，你的listener方法会被调用
+    REGISTRY_EXCEPTION_LISTENER = {}
 
     # 执行log的函数
     executor_log = default_jm_logging
@@ -311,7 +314,7 @@ class JmModuleConfig:
     # 而如果只想修改几个简单常用的配置，也可以下方的DEFAULT_XXX属性
     JM_OPTION_VER = '2.1'
     DEFAULT_CLIENT_IMPL = 'api'  # 默认Client实现类型为网页端
-    DEFAULT_CLIENT_CACHE = True  # 默认开启Client缓存，缓存级别是level_option，详见CacheRegistry
+    DEFAULT_CLIENT_CACHE = None  # 默认关闭Client缓存。缓存的配置详见 CacheRegistry
     DEFAULT_PROXIES = ProxyBuilder.system_proxy()  # 默认使用系统代理
 
     default_option_dict: dict = {
@@ -404,8 +407,8 @@ class JmModuleConfig:
         cls.REGISTRY_CLIENT[client_class.client_key] = client_class
 
     @classmethod
-    def register_exception_advice(cls, etype, eadvice):
-        cls.REGISTRY_EXCEPTION_ADVICE[etype] = eadvice
+    def register_exception_listener(cls, etype, listener):
+        cls.REGISTRY_EXCEPTION_LISTENER[etype] = listener
 
 
 jm_log = JmModuleConfig.jm_log

jmcomic/jm_exception.py

@@ -3,9 +3,7 @@ from .jm_entity import *
 
 
 class JmcomicException(Exception):
-    """
-    jmcomic 模块异常
-    """
+    description = 'jmcomic 模块异常'
 
     def __init__(self, msg: str, context: dict):
         self.msg = msg
@@ -16,19 +14,22 @@ class JmcomicException(Exception):
 
 
 class ResponseUnexpectedException(JmcomicException):
-    """
-    响应不符合预期异常
-    """
+    description = '响应不符合预期异常'
 
     @property
     def resp(self):
         return self.from_context(ExceptionTool.CONTEXT_KEY_RESP)
 
 
-class RegularNotMatchException(ResponseUnexpectedException):
-    """
-    正则表达式不匹配异常
-    """
+class RegularNotMatchException(JmcomicException):
+    description = '正则表达式不匹配异常'
+
+    @property
+    def resp(self):
+        """
+        可能为None
+        """
+        return self.context.get(ExceptionTool.CONTEXT_KEY_RESP, None)
 
     @property
     def error_text(self):
@@ -40,19 +41,23 @@ class RegularNotMatchException(ResponseUnexpectedException):
 
 
 class JsonResolveFailException(ResponseUnexpectedException):
+    description = 'Json解析异常'
     pass
 
 
 class MissingAlbumPhotoException(ResponseUnexpectedException):
-    """
-    缺少本子/章节异常
-    """
+    description = '不存在本子或章节异常'
 
     @property
     def error_jmid(self) -> str:
         return self.from_context(ExceptionTool.CONTEXT_KEY_MISSING_JM_ID)
 
 
+class RequestRetryAllFailException(JmcomicException):
+    description = '请求重试全部失败异常'
+    pass
+
+
 class ExceptionTool:
     """
     抛异常的工具
@@ -65,6 +70,13 @@ class ExceptionTool:
     CONTEXT_KEY_RE_PATTERN = 'pattern'
     CONTEXT_KEY_MISSING_JM_ID = 'missing_jm_id'
 
+    # 兼容旧版本
+
+    EXTRA_KEY_RESP = 'resp'
+    EXTRA_KEY_HTML = 'html'
+    EXTRA_KEY_RE_PATTERN = 'pattern'
+    EXTRA_KEY_MISSING_JM_ID = 'missing_jm_id'
+
     @classmethod
     def raises(cls,
                msg: str,
@@ -88,10 +100,7 @@ class ExceptionTool:
         e = etype(msg, context)
 
         # 异常处理建议
-        advice = JmModuleConfig.REGISTRY_EXCEPTION_ADVICE.get(etype, None)
-
-        if advice is not None:
-            advice(e)
+        cls.notify_all_listeners(e)
 
         raise e
 
@@ -156,3 +165,24 @@ class ExceptionTool:
             return
 
         cls.raises(msg)
+
+    @classmethod
+    def replace_old_exception_executor(cls, raises: Callable[[Callable, str, dict], None]):
+        old = cls.raises
+
+        def new(msg, context=None, _etype=None):
+            if context is None:
+                context = {}
+            raises(old, msg, context)
+
+        cls.raises = new
+
+    @classmethod
+    def notify_all_listeners(cls, e):
+        registry: Dict[Type, Callable[Type]] = JmModuleConfig.REGISTRY_EXCEPTION_LISTENER
+        if not registry:
+            return None
+
+        for accept_type, listener in registry.items():
+            if isinstance(e, accept_type):
+                listener(e)

jmcomic/jm_option.py

@@ -17,8 +17,11 @@ class CacheRegistry:
         return registry[client]
 
     @classmethod
-    def enable_client_cache_on_condition(cls, option: 'JmOption', client: JmcomicClient,
-                                         cache: Union[None, bool, str, Callable]):
+    def enable_client_cache_on_condition(cls,
+                                         option: 'JmOption',
+                                         client: JmcomicClient,
+                                         cache: Union[None, bool, str, Callable],
+                                         ):
         """
         cache parameter
 
@@ -539,7 +542,7 @@ class JmOption:
 
         pclass: Type[JmOptionPlugin]
         plugin: Optional[JmOptionPlugin] = None
-        
+
         try:
             # 构建插件对象
             plugin: JmOptionPlugin = pclass.build(self)

{jmcomic-2.5.1.dist-info → jmcomic-2.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jmcomic
-Version: 2.5.1
+Version: 2.5.3
 Summary: Python API For JMComic (禁漫天堂)
 Home-page: https://github.com/hect0x7/JMComic-Crawler-Python
 Author: hect0x7
@@ -97,8 +97,8 @@ $ jmcomic 422866
 - **可扩展性强**
 
     - 支持自定义本子/章节/图片下载前后的回调函数
-    - 支持自定义日志
     - 支持自定义类：`Downloader（负责调度）` `Option（负责配置）` `Client（负责请求）` `实体类`等
+    - 支持自定义日志、异常监听器
     - **支持Plugin插件，可以方便地扩展功能，以及使用别人的插件，目前内置插件有**：
         - `登录插件`
         - `硬件占用监控插件`

jmcomic-2.5.3.dist-info/RECORD

@@ -0,0 +1,18 @@
+jmcomic/__init__.py,sha256=xop4fs0-joR7gysv1acbzuGmGirY58HaEE6oFv8uNJU,902
+jmcomic/api.py,sha256=qOUG1B2hornxMykQp1y4E2qaRhQAg7KPBmXmptik3vM,3500
+jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
+jmcomic/jm_client_impl.py,sha256=mMkf9q2U3FCEwiWMwt_Sj97-WsqdE6UmKHE3LJsqEhA,37883
+jmcomic/jm_client_interface.py,sha256=bBKwcXkEns8fNy5IsEaljph3E_pyER3RGLG_no6cidU,17164
+jmcomic/jm_config.py,sha256=C_jfCwJ2T4sWIeyn5oRf6mPR62e-dHVwFCMqrE7Ff44,13792
+jmcomic/jm_downloader.py,sha256=ADkgEOhb8ycHWqaM5knOIpNK8yJuN5J_BEvVnx0E0C0,8556
+jmcomic/jm_entity.py,sha256=_gf8P3GDHkjUzZriQrQQ3-n_o5BZ7KZoh21qYXsQJ-0,18734
+jmcomic/jm_exception.py,sha256=6qDnPo-O6wqNBVweW-rdvMpwnvGCj2hapcLlZqTtTlg,4847
+jmcomic/jm_option.py,sha256=POfmjxJPbqo7IZhSF0lxHuKV1eKlBS7D2Z8Z0n8UQ6c,21182
+jmcomic/jm_plugin.py,sha256=67zdKtn16-BTAyji3eG0wfRx1-fxQD3oL0VnG9t5Lrc,29196
+jmcomic/jm_toolkit.py,sha256=SgVgyh-TyppL_RfeyyFjlTADF5kwjqNeNdofZHTm6Do,28360
+jmcomic-2.5.3.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.5.3.dist-info/METADATA,sha256=Tu1Og-t9nU1hSqGnRIf3W3Vx0BQA3MeWfKYTP3dGIkI,5993
+jmcomic-2.5.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+jmcomic-2.5.3.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.5.3.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.5.3.dist-info/RECORD,,

jmcomic-2.5.1.dist-info/RECORD

@@ -1,18 +0,0 @@
-jmcomic/__init__.py,sha256=lPQKl9ByTk5UpUQSI1pLFdVukIV7xpiRs462fDK6nRI,902
-jmcomic/api.py,sha256=qOUG1B2hornxMykQp1y4E2qaRhQAg7KPBmXmptik3vM,3500
-jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
-jmcomic/jm_client_impl.py,sha256=WN2Ae5yED9VLeZRbaDXzepWWUDVQaQ5uU4ROaXuaKyg,37786
-jmcomic/jm_client_interface.py,sha256=bBKwcXkEns8fNy5IsEaljph3E_pyER3RGLG_no6cidU,17164
-jmcomic/jm_config.py,sha256=GfWSzG2uA-UtUNcCHFPE5sT9LbgnEGdJ9Kx7pIshkzg,13596
-jmcomic/jm_downloader.py,sha256=ADkgEOhb8ycHWqaM5knOIpNK8yJuN5J_BEvVnx0E0C0,8556
-jmcomic/jm_entity.py,sha256=_gf8P3GDHkjUzZriQrQQ3-n_o5BZ7KZoh21qYXsQJ-0,18734
-jmcomic/jm_exception.py,sha256=RraAWFP4zC7jhgLogOHzAF08yyimbiTrXHtUobs2ES8,3847
-jmcomic/jm_option.py,sha256=3vLN9qOWPUrt3oIbvJXzfmZCNhXIGmCIu5dOKJMNk3I,21065
-jmcomic/jm_plugin.py,sha256=67zdKtn16-BTAyji3eG0wfRx1-fxQD3oL0VnG9t5Lrc,29196
-jmcomic/jm_toolkit.py,sha256=SgVgyh-TyppL_RfeyyFjlTADF5kwjqNeNdofZHTm6Do,28360
-jmcomic-2.5.1.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.5.1.dist-info/METADATA,sha256=aDz6ifAgIw7BZapWfUioLblR2RVMfPSmlPf-duVKcTM,5975
-jmcomic-2.5.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-jmcomic-2.5.1.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.5.1.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.5.1.dist-info/RECORD,,