jmcomic 2.0.5__py3-none-any.whl → 2.0.6__py3-none-any.whl

jmcomic/__init__.py

@@ -2,6 +2,6 @@
 # 被依赖方 <--- 使用方
 # config <--- entity <--- toolkit <--- client <--- option
 
-__version__ = '2.0.5'
+__version__ = '2.0.6'
 
 from .api import *

jmcomic/jm_client_impl.py

@@ -95,9 +95,18 @@ class AbstractJmClient(
 
             setattr(self, func_name, wrap_func)
 
-        wrap_func_cache('get_photo_detail', 'album_cache_dict')
-        wrap_func_cache('get_album_detail', 'photo_cache_dict')
-        wrap_func_cache('search_album', 'search_album_cache_dict')
+        for func in {
+            'get_photo_detail',
+            'get_album_detail',
+            'search_album',
+        }:
+            wrap_func_cache(func, func + '.cache.dict')
+
+    def get_jmcomic_url(self, postman=None):
+        return JmModuleConfig.get_jmcomic_url(postman or self.get_root_postman())
+
+    def get_jmcomic_domain_all(self, postman=None):
+        return JmModuleConfig.get_jmcomic_domain_all(postman or self.get_root_postman())
 
 
 # 基于网页实现的JmClient

jmcomic/jm_config.py

@@ -3,11 +3,23 @@ def default_jm_debug(topic: str, msg: str):
     print(f'{format_ts()}:【{topic}】{msg}')
 
 
+def default_postman_constructor(session, **kwargs):
+    from common import Postmans
+
+    kwargs.setdefault('impersonate', 'chrome110')
+    kwargs.setdefault('headers', JmModuleConfig.headers())
+
+    if session is True:
+        return Postmans.new_session(**kwargs)
+
+    return Postmans.new_postman(**kwargs)
+
+
 class JmModuleConfig:
     # 网站相关
     PROT = "https://"
     DOMAIN = None
-    JM_REDIRECT_URL = f'{PROT}jm365.xyz/3YeBdF'  # 永久網域，怕走失的小伙伴收藏起来
+    JM_REDIRECT_URL = f'{PROT}jm365.work/3YeBdF'  # 永久網域，怕走失的小伙伴收藏起来
     JM_PUB_URL = f'{PROT}jmcomic2.bet'
     JM_CDN_IMAGE_URL_TEMPLATE = PROT + 'cdn-msp.{domain}/media/photos/{photo_id}/{index:05}{suffix}'  # index 从1开始
     JM_IMAGE_SUFFIX = ['.jpg', '.webp', '.png', '.gif']
@@ -40,6 +52,7 @@ class JmModuleConfig:
     # debug
     enable_jm_debug = True
     debug_executor = default_jm_debug
+    postman_constructor = default_postman_constructor
 
     @classmethod
     def domain(cls, postman=None):
@@ -84,15 +97,17 @@ class JmModuleConfig:
     def disable_jm_debug(cls):
         cls.enable_jm_debug = False
 
+    @classmethod
+    def new_postman(cls, session=False, **kwargs):
+        return cls.postman_constructor(session, **kwargs)
+
     @classmethod
     def get_jmcomic_url(cls, postman=None):
         """
         访问禁漫的永久网域，从而得到一个可用的禁漫网址
         @return: https://jm-comic2.cc
         """
-        if postman is None:
-            from common import Postmans
-            postman = Postmans.new_session()
+        postman = postman or cls.new_postman(session=True)
 
         resp = postman.get(cls.JM_REDIRECT_URL)
         url = resp.url
@@ -105,9 +120,7 @@ class JmModuleConfig:
         访问禁漫发布页，得到所有禁漫的域名
         @return：['18comic.vip', ..., 'jm365.xyz/ZNPJam'], 最后一个是【APP軟件下載】
         """
-        if postman is None:
-            from common import Postmans
-            postman = Postmans.get_impl_clazz('cffi').create()
+        postman = postman or cls.new_postman(session=True)
 
         resp = postman.get(cls.JM_PUB_URL)
         if resp.status_code != 200:

{jmcomic-2.0.5.dist-info → jmcomic-2.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jmcomic
-Version: 2.0.5
+Version: 2.0.6
 Summary: Python API For JMComic (禁漫天堂)
 Home-page: https://github.com/hect0x7/JMComic-Crawler-Python
 Author: hect0x7

jmcomic-2.0.6.dist-info/RECORD

@@ -0,0 +1,13 @@
+jmcomic/__init__.py,sha256=NGI9lVZSXarXZ-NkTiyKuV_UryivzWCMmIBXYec1vBw,159
+jmcomic/api.py,sha256=iXmXyLKWMUBtehLurKoTP-lr_Q7b-lA7Eg7BTYphLNk,4867
+jmcomic/jm_client_impl.py,sha256=JMoohpYMzL34Odtr8eVKyHB8uaxet31YGZho26Z0-pw,10808
+jmcomic/jm_client_interface.py,sha256=AD-v7ZJ7C5uWYBlfdRdT7vMq8dELlVuTa8ekBSK7xPU,5734
+jmcomic/jm_config.py,sha256=epuPrMKFAHdmYiB5osjWBP2rQIyAqtxZvjM8FlAsbX4,4948
+jmcomic/jm_entity.py,sha256=xK0NJaA3C5noTQQXmnoFA-Ln3gqmbMlR7p4aRgBHbuw,9152
+jmcomic/jm_option.py,sha256=PLBThV_3Sjzt-1daCYIcbRVvS-7iVC5qCy_BmLB8mxc,9298
+jmcomic/jm_toolkit.py,sha256=hUBdP3BERsRMuCBg1fKjYO4PVE5VBMOv3OJ1x07qr2U,11284
+jmcomic-2.0.6.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.0.6.dist-info/METADATA,sha256=Z5Y8dqt71_btU09Lqi2MaS_LlKqzYdCs9BbLzK0bPTI,3633
+jmcomic-2.0.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+jmcomic-2.0.6.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.0.6.dist-info/RECORD,,

jmcomic-2.0.5.dist-info/RECORD

@@ -1,13 +0,0 @@
-jmcomic/__init__.py,sha256=qnuVj0MGkNleKmttLcoNNehDuidbzNInRhmRgzseHZA,159
-jmcomic/api.py,sha256=iXmXyLKWMUBtehLurKoTP-lr_Q7b-lA7Eg7BTYphLNk,4867
-jmcomic/jm_client_impl.py,sha256=FaBmRyEncXNfSwS3jPV-4DboRck4DD53JUhmrLRU9p0,10552
-jmcomic/jm_client_interface.py,sha256=AD-v7ZJ7C5uWYBlfdRdT7vMq8dELlVuTa8ekBSK7xPU,5734
-jmcomic/jm_config.py,sha256=vACMrVO_zbdA2aFxKAEB8CNtdUXM7zsvePpqeOqsNC0,4582
-jmcomic/jm_entity.py,sha256=xK0NJaA3C5noTQQXmnoFA-Ln3gqmbMlR7p4aRgBHbuw,9152
-jmcomic/jm_option.py,sha256=PLBThV_3Sjzt-1daCYIcbRVvS-7iVC5qCy_BmLB8mxc,9298
-jmcomic/jm_toolkit.py,sha256=hUBdP3BERsRMuCBg1fKjYO4PVE5VBMOv3OJ1x07qr2U,11284
-jmcomic-2.0.5.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.0.5.dist-info/METADATA,sha256=iJrZ2F0uLxPVXdOnrxi017n4XCOOzZ8qCcXZgnyamrA,3633
-jmcomic-2.0.5.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-jmcomic-2.0.5.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.0.5.dist-info/RECORD,,