jmcomic 2.5.35__tar.gz → 2.5.36__tar.gz

{jmcomic-2.5.35/src/jmcomic.egg-info → jmcomic-2.5.36}/PKG-INFO

@@ -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.35 → jmcomic-2.5.36}/src/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-2.5.35 → jmcomic-2.5.36}/src/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-2.5.35 → jmcomic-2.5.36}/src/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-2.5.35 → jmcomic-2.5.36}/src/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-2.5.35 → jmcomic-2.5.36}/src/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 → jmcomic-2.5.36/src/jmcomic.egg-info}/PKG-INFO

@@ -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