jmcomic 2.6.7__py3-none-any.whl → 2.6.9__py3-none-any.whl

jmcomic/__init__.py

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

jmcomic/jm_client_impl.py

@@ -15,6 +15,7 @@ class AbstractJmClient(
                  postman: Postman,
                  domain_list: List[str],
                  retry_times=0,
+                 domain_retry_strategy=None,
                  ):
         """
         创建JM客户端
@@ -26,9 +27,11 @@ class AbstractJmClient(
         super().__init__(postman)
         self.retry_times = retry_times
         self.domain_list = domain_list
-        self.domain_retry_strategy = None
+        self.domain_retry_strategy = domain_retry_strategy
         self.CLIENT_CACHE = None
         self._username = None  # help for favorite_folder method
+        if domain_retry_strategy:
+            domain_retry_strategy(self)
         self.enable_cache()
         self.after_init()
 

jmcomic/jm_client_interface.py

@@ -293,6 +293,14 @@ class JmImageClient:
         # https://cdn-msp2.18comic.vip/media/photos/498976/00027.gif
         return data_original.endswith('.gif')
 
+    def download_album_cover(self, album_id, save_path: str, size: str = ''):
+        self.download_image(
+            img_url=JmcomicText.get_album_cover_url(album_id, size=size),
+            img_save_path=save_path,
+            scramble_id=None,
+            decode_image=False,
+        )
+
 
 class JmSearchAlbumClient:
     """

jmcomic/jm_option.py

@@ -158,7 +158,8 @@ class DirRule:
         if rule.startswith(('A', 'P')):
             return cls.parse_detail_rule
 
-        ExceptionTool.raises(f'不支持的rule配置: "{rule}"')
+        return cls.parse_f_string_rule
+        # ExceptionTool.raises(f'不支持的rule配置: "{rule}"')
 
     @classmethod
     def apply_rule_to_filename(cls, album, photo, rule: str) -> str:
@@ -362,7 +363,13 @@ class JmOption:
         """
         return self.new_jm_client(**kwargs)
 
-    def new_jm_client(self, domain_list=None, impl=None, cache=None, **kwargs) -> Union[JmHtmlClient, JmApiClient]:
+    def new_jm_client(self,
+                      domain_list=None,
+                      impl=None,
+                      cache=None,
+                      domain_retry_strategy=None,
+                      **kwargs
+                      ) -> Union[JmHtmlClient, JmApiClient]:
         """
         创建新的Client（客户端），不同Client之间的元数据不共享
         """
@@ -423,6 +430,7 @@ class JmOption:
             postman=postman,
             domain_list=decide_domain_list(),
             retry_times=retry_times,
+            domain_retry_strategy=domain_retry_strategy,
         )
 
         # enable cache

jmcomic/jm_plugin.py

@@ -111,7 +111,7 @@ class JmOptionPlugin:
     def decide_filepath(self,
                         album: Optional[JmAlbumDetail],
                         photo: Optional[JmPhotoDetail],
-                        filename_rule: str, suffix: str, base_dir: Optional[str],
+                        filename_rule: Optional[str], suffix: Optional[str], base_dir: Optional[str],
                         dir_rule_dict: Optional[dict]
                         ):
         """
@@ -1219,7 +1219,7 @@ class ReplacePathStringPlugin(JmOptionPlugin):
 
 
 class AdvancedRetryPlugin(JmOptionPlugin):
-    plugin_key = 'advanced-retry'
+    plugin_key = 'advanced_retry'
 
     def __init__(self, option: JmOption):
         super().__init__(option)
@@ -1234,15 +1234,18 @@ class AdvancedRetryPlugin(JmOptionPlugin):
         new_jm_client: Callable = self.option.new_jm_client
 
         def hook_new_jm_client(*args, **kwargs):
-            client: JmcomicClient = new_jm_client(*args, **kwargs)
-            client.domain_retry_strategy = self.request_with_retry
-            client.domain_req_failed_counter = {}
-            from threading import Lock
-            client.domain_counter_lock = Lock()
-            return client
+            return new_jm_client(*args, **kwargs, domain_retry_strategy=self)
 
         self.option.new_jm_client = hook_new_jm_client
 
+    def __call__(self, client: AbstractJmClient, *args, **kwargs):
+        if args:
+            return self.request_with_retry(client, *args, **kwargs)
+        # init
+        from threading import Lock
+        client.domain_req_failed_counter = {}
+        client.domain_counter_lock = Lock()
+
     def request_with_retry(self,
                            client: AbstractJmClient,
                            request: Callable,
@@ -1306,3 +1309,25 @@ class AdvancedRetryPlugin(JmOptionPlugin):
     def failed_count(client: JmcomicClient, domain: str) -> int:
         # noinspection PyUnresolvedReferences
         return client.domain_req_failed_counter.get(domain, 0)
+
+
+class DownloadCoverPlugin(JmOptionPlugin):
+    plugin_key = 'download_cover'
+
+    def invoke(self,
+               dir_rule: dict,
+               size='',
+               photo: JmPhotoDetail = None,
+               album: JmAlbumDetail = None,
+               downloader=None,
+               **kwargs) -> None:
+        album_id = album.id if album else photo.album_id
+        save_path = self.decide_filepath(
+            album, photo,
+            None, None, None,
+            dir_rule
+        )
+        if self.option.download.cache and os.path.exists(save_path):
+            self.log(f'album-{album_id}的封面已存在，跳过下载: [{save_path}]', 'skip')
+            return
+        downloader.client.download_album_cover(album_id, save_path, size)

jmcomic/jm_toolkit.py

@@ -368,6 +368,26 @@ class JmcomicText:
         length = len(text)
         return text if length <= limit else (text[:limit] + f'...({length - limit}')
 
+    @classmethod
+    def get_album_cover_url(cls,
+                            album_id: Union[str, int],
+                            image_domain: Optional[str] = None,
+                            size: str = '',
+                            ) -> str:
+        """
+        根据本子id生成封面url
+
+        :param album_id: 本子id
+        :param image_domain: 图片cdn域名（可传入裸域或含协议的域名）
+        :param size: 尺寸后缀，例如搜索列表页会使用 size="_3x4" 的封面图
+        """
+        if image_domain is None:
+            import random
+            image_domain = random.choice(JmModuleConfig.DOMAIN_IMAGE_LIST)
+
+        path = f'/media/albums/{cls.parse_to_jm_id(album_id)}{size}.jpg'
+        return cls.format_url(path, image_domain)
+
 
 # 支持dsl: #{???} -> os.getenv(???)
 JmcomicText.dsl_replacer.add_dsl_and_replacer(r'\$\{(.*?)\}', JmcomicText.match_os_env)

{jmcomic-2.6.7.dist-info → jmcomic-2.6.9.dist-info}/METADATA

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

jmcomic-2.6.9.dist-info/RECORD

@@ -0,0 +1,18 @@
+jmcomic/__init__.py,sha256=uYzq8cX-BV_LQ5RFpXSWdmW9yA00SSwdpVQlRA_Olio,902
+jmcomic/api.py,sha256=ZduhXDmh4lg1dkXHs7UTAaPpYNO7kcdPCDH5JJT9KSI,4253
+jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
+jmcomic/jm_client_impl.py,sha256=UpzqO3LD567U7ETs6SpSdCKQS4mvtbCbN6sVwU6DXxk,42301
+jmcomic/jm_client_interface.py,sha256=HJPmaY0xdSghPKuTh2CvVjlgJmoW1rubqjysHcOGDHQ,19701
+jmcomic/jm_config.py,sha256=8GDETnzQObZabd441Boc--Mb--J2kr7HLxxViKB0DvI,17213
+jmcomic/jm_downloader.py,sha256=azYkIN-1OuEivZ1TGGDaYo1FkcO5KatSb0g4GVdKSPY,11041
+jmcomic/jm_entity.py,sha256=ZyXVy3mOl9qkxlw6hyshVS3RR-yKfO5BkJHtyBAoKQE,20053
+jmcomic/jm_exception.py,sha256=x3KGMLlQS2zi1GX7z5G58zJN2EwLkI4mAURkxZYjEvA,5055
+jmcomic/jm_option.py,sha256=jczCX9gmSaTcl1BJLVYe9YN8GIdFYNQQVwDSh4oymto,21503
+jmcomic/jm_plugin.py,sha256=9_EfTOVCk4ey1QQiKjYhFnd6j9XG-YM8rXiN21w-KrU,45374
+jmcomic/jm_toolkit.py,sha256=2ltGKeJORZ7ARTrC-29nkO9TSu8Kzxdrqj6O28PIw28,31297
+jmcomic-2.6.9.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.6.9.dist-info/METADATA,sha256=PUBkNLrDi6UFgp86Y8h3sFrygyAQBRfKkEDN7Zvsvfs,9572
+jmcomic-2.6.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jmcomic-2.6.9.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.6.9.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.6.9.dist-info/RECORD,,

jmcomic-2.6.7.dist-info/RECORD

@@ -1,18 +0,0 @@
-jmcomic/__init__.py,sha256=Rg9DJ3YptC-BImHcbNB4cqM6-ZZMMtPGy2hw3-G7hZY,902
-jmcomic/api.py,sha256=ZduhXDmh4lg1dkXHs7UTAaPpYNO7kcdPCDH5JJT9KSI,4253
-jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
-jmcomic/jm_client_impl.py,sha256=sDrhqlO6zHAR0vlGFoKXmQ85l89BwksfG8BHGk7eXJ4,42165
-jmcomic/jm_client_interface.py,sha256=4TDz-V8XLWPPxogLI-xiiHug4n6iir6UNeiKx9-KTXM,19410
-jmcomic/jm_config.py,sha256=8GDETnzQObZabd441Boc--Mb--J2kr7HLxxViKB0DvI,17213
-jmcomic/jm_downloader.py,sha256=azYkIN-1OuEivZ1TGGDaYo1FkcO5KatSb0g4GVdKSPY,11041
-jmcomic/jm_entity.py,sha256=ZyXVy3mOl9qkxlw6hyshVS3RR-yKfO5BkJHtyBAoKQE,20053
-jmcomic/jm_exception.py,sha256=x3KGMLlQS2zi1GX7z5G58zJN2EwLkI4mAURkxZYjEvA,5055
-jmcomic/jm_option.py,sha256=T__PXJgzITdjyr2PMdk98jYMIKkUVGUA30p5lsMOTvQ,21244
-jmcomic/jm_plugin.py,sha256=OekMjPVS25PMLcHV0r434BBvy0vbszlNiU5wODCZ3js,44524
-jmcomic/jm_toolkit.py,sha256=9vwk4Q2gfh_04BhJxEoSsZcDT6ICh-wsN70WR4LSD9I,30511
-jmcomic-2.6.7.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.6.7.dist-info/METADATA,sha256=cuqBqo5Bp2GHItulju3coNt5dU9_UMtY1vcN0G0m0jk,9572
-jmcomic-2.6.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jmcomic-2.6.7.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.6.7.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.6.7.dist-info/RECORD,,