jmcomic 2.5.35__py3-none-any.whl → 2.5.36__py3-none-any.whl

jmcomic/__init__.py

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

jmcomic/jm_client_interface.py

@@ -62,13 +62,16 @@ class JmImageResp(JmResp):
                     img_url=None,
                     ):
         img_url = img_url or self.url
+        index = img_url.find("?")
+        if index != -1:
+            img_url = img_url[0:index]
 
         if decode_image is False or scramble_id is None:
             # 不解密图片，直接保存文件
             JmImageTool.save_resp_img(
                 self,
                 path,
-                need_convert=suffix_not_equal(img_url[:img_url.find("?")], path),
+                need_convert=suffix_not_equal(img_url, path),
             )
         else:
             # 解密图片并保存文件

jmcomic/jm_config.py

@@ -414,7 +414,7 @@ class JmModuleConfig:
             'cache': None,  # see CacheRegistry
             'domain': [],
             'postman': {
-                'type': 'cffi',
+                'type': 'curl_cffi',
                 'meta_data': {
                     'impersonate': 'chrome110',
                     'headers': None,

jmcomic/jm_entity.py

@@ -164,6 +164,32 @@ class DetailEntity(JmBaseEntity, IndexedEntity):
 
         return getattr(detail, ref)
 
+    def get_properties_dict(self):
+        import inspect
+
+        prefix = self.__class__.__name__[2]
+        result = {}
+
+        # field
+        for k, v in self.__dict__.items():
+            result[prefix + k] = v
+
+        # property
+        for cls in inspect.getmro(type(self)):
+            for name, attr in cls.__dict__.items():
+                k = prefix + name
+                if k not in result and isinstance(attr, property):
+                    v = attr.__get__(self, cls)
+                    result[k] = v
+
+        # advice
+        advice_dict = JmModuleConfig.AFIELD_ADVICE if self.is_album() else JmModuleConfig.PFIELD_ADVICE
+        for name, func in advice_dict.items():
+            k = prefix + name
+            result[k] = func(self)
+
+        return result
+
 
 class JmImageDetail(JmBaseEntity, Downloadable):
 

jmcomic/jm_option.py

@@ -71,7 +71,7 @@ class DirRule:
     ]
 
     Detail = Union[JmAlbumDetail, JmPhotoDetail, None]
-    RuleFunc = Callable[[Detail], str]
+    RuleFunc = Callable
     RuleSolver = Tuple[str, RuleFunc, str]
     RuleSolverList = List[RuleSolver]
 
@@ -154,6 +154,12 @@ class DirRule:
 
     @classmethod
     def get_rule_solver(cls, rule: str) -> Optional[RuleSolver]:
+        if '{' in rule:
+            def format_path(album, photo):
+                return fix_windir_name(rule.format(**album.get_properties_dict(), **photo.get_properties_dict())).strip()
+
+            return 'F', format_path, rule
+
         # 检查dsl
         if not rule.startswith(('A', 'P')):
             return None
@@ -176,15 +182,17 @@ class DirRule:
 
         def choose_detail(key):
             if key == 'Bd':
-                return None
+                return None,
             if key == 'A':
-                return album
+                return album,
             if key == 'P':
-                return photo
+                return photo,
+            if key == 'F':
+                return album, photo
 
         key, func, _ = rule_solver
         detail = choose_detail(key)
-        return func(detail)
+        return func(*detail)
 
     @classmethod
     def apply_rule_directly(cls, album, photo, rule: str) -> str:

{jmcomic-2.5.35.dist-info → jmcomic-2.5.36.dist-info}/METADATA

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

jmcomic-2.5.36.dist-info/RECORD

@@ -0,0 +1,18 @@
+jmcomic/__init__.py,sha256=55xVXKjx01nDkNWmVG8GI3Ep6-8waNaTq9cl4Qosc1k,903
+jmcomic/api.py,sha256=ZduhXDmh4lg1dkXHs7UTAaPpYNO7kcdPCDH5JJT9KSI,4253
+jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
+jmcomic/jm_client_impl.py,sha256=m8-e_TA3vIXdUkXJcuJ0uzek4GM48y4QvBRXrT6JqUc,39633
+jmcomic/jm_client_interface.py,sha256=Bld80cYwBwIqcMSJK09g5q8U_UX3IWnQJxuRJQwmIOk,19082
+jmcomic/jm_config.py,sha256=p7g2FQMVXBnejz1sSzM15YAtJ5f91fZZeNMqFeYum5I,16772
+jmcomic/jm_downloader.py,sha256=6w9D7eoL2M85-ScH745-OZBvaC0uwGkHi6awTUzq-3E,11036
+jmcomic/jm_entity.py,sha256=x-3yUvM74C_Gof20mJw2SmZq7sSSsGNg0Cp47oZ-dFg,19968
+jmcomic/jm_exception.py,sha256=x3KGMLlQS2zi1GX7z5G58zJN2EwLkI4mAURkxZYjEvA,5055
+jmcomic/jm_option.py,sha256=oiDR4ZDOlPBWfJ8zDhedApFMRFejlGRkFvF5L4WokFU,22211
+jmcomic/jm_plugin.py,sha256=e2B_x2adghxn7f8eKAJivDWf8oLY9962Utt1-J70zBw,39902
+jmcomic/jm_toolkit.py,sha256=_qAJKbcV9jaFHRGvGU4Na2ts5h7QPGJS4uRQ05KpQ88,29166
+jmcomic-2.5.36.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.5.36.dist-info/METADATA,sha256=k6MOXm6o5l27lbHelaDInUq5xoc2s-qOClHcbjt0-Tk,8161
+jmcomic-2.5.36.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+jmcomic-2.5.36.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.5.36.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.5.36.dist-info/RECORD,,

jmcomic-2.5.35.dist-info/RECORD

@@ -1,18 +0,0 @@
-jmcomic/__init__.py,sha256=5Qyc6r1XhjnQJsvyr2bhgqDvxd0lAr-6U4SeOzAlyAs,903
-jmcomic/api.py,sha256=ZduhXDmh4lg1dkXHs7UTAaPpYNO7kcdPCDH5JJT9KSI,4253
-jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
-jmcomic/jm_client_impl.py,sha256=m8-e_TA3vIXdUkXJcuJ0uzek4GM48y4QvBRXrT6JqUc,39633
-jmcomic/jm_client_interface.py,sha256=LqJqa-4G7-F98_U9R9QTxFND_9t30B-BIQZa_o0p-KY,19005
-jmcomic/jm_config.py,sha256=rOeKMqZ3HwWk3I-vA0YTCIimBcfdZpvXj7Itg0OKfCo,16767
-jmcomic/jm_downloader.py,sha256=6w9D7eoL2M85-ScH745-OZBvaC0uwGkHi6awTUzq-3E,11036
-jmcomic/jm_entity.py,sha256=vz_nZbEtRLBRrVz97533Twf9mxB1AlwauunCvdhFa7w,19190
-jmcomic/jm_exception.py,sha256=x3KGMLlQS2zi1GX7z5G58zJN2EwLkI4mAURkxZYjEvA,5055
-jmcomic/jm_option.py,sha256=2tINFsDcncCJbd6FRtCMAidhro6faB8TBLoaSxP3uQ8,21926
-jmcomic/jm_plugin.py,sha256=e2B_x2adghxn7f8eKAJivDWf8oLY9962Utt1-J70zBw,39902
-jmcomic/jm_toolkit.py,sha256=_qAJKbcV9jaFHRGvGU4Na2ts5h7QPGJS4uRQ05KpQ88,29166
-jmcomic-2.5.35.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.5.35.dist-info/METADATA,sha256=urkZ5ZX0yGsUOhLpc8yY-LGwwMZPAu9rcQTN8cAwbtc,8161
-jmcomic-2.5.35.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-jmcomic-2.5.35.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.5.35.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.5.35.dist-info/RECORD,,