jmcomic 2.5.34__tar.gz → 2.5.36__tar.gz

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

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

{jmcomic-2.5.34 → jmcomic-2.5.36}/src/jmcomic/__init__.py

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

{jmcomic-2.5.34 → jmcomic-2.5.36}/src/jmcomic/api.py

@@ -48,6 +48,7 @@ def download_album(jm_album_id,
                    option=None,
                    downloader=None,
                    callback=None,
+                   check_exception=True,
                    ) -> Union[__DOWNLOAD_API_RET, Set[__DOWNLOAD_API_RET]]:
     """
     下载一个本子（album），包含其所有的章节（photo）
@@ -58,6 +59,7 @@ def download_album(jm_album_id,
     :param option: 下载选项
     :param downloader: 下载器类
     :param callback: 返回值回调函数，可以拿到 album 和 downloader
+    :param check_exception: 是否检查异常, 如果为True，会检查downloader是否有下载异常，并上抛PartialDownloadFailedException
     :return: 对于的本子实体类，下载器（如果是上述的批量情况，返回值为download_batch的返回值）
     """
 
@@ -69,14 +71,17 @@ def download_album(jm_album_id,
 
         if callback is not None:
             callback(album, dler)
-
+        if check_exception:
+            dler.raise_if_has_exception()
         return album, dler
 
 
 def download_photo(jm_photo_id,
                    option=None,
                    downloader=None,
-                   callback=None):
+                   callback=None,
+                   check_exception=True,
+                   ):
     """
     下载一个章节（photo），参数同 download_album
     """
@@ -88,7 +93,8 @@ def download_photo(jm_photo_id,
 
         if callback is not None:
             callback(photo, dler)
-
+        if check_exception:
+            dler.raise_if_has_exception()
         return photo, dler
 
 

{jmcomic-2.5.34 → jmcomic-2.5.36}/src/jmcomic/jm_client_impl.py

@@ -566,7 +566,7 @@ class JmHtmlClient(AbstractJmClient):
 
             cls.raise_request_error(
                 resp,
-                f'{reason}'
+                f'{reason}({content})'
                 + (f': {url}' if url is not None else '')
             )
 

{jmcomic-2.5.34 → 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.34 → 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.34 → jmcomic-2.5.36}/src/jmcomic/jm_downloader.py

@@ -1,6 +1,31 @@
 from .jm_option import *
 
 
+def catch_exception(func):
+    from functools import wraps
+
+    @wraps(func)
+    def wrapper(self, *args, **kwargs):
+        self: JmDownloader
+        try:
+            return func(self, *args, **kwargs)
+        except Exception as e:
+            detail: JmBaseEntity = args[0]
+            if detail.is_image():
+                detail: JmImageDetail
+                jm_log('image.failed', f'图片下载失败: [{detail.download_url}], 异常: [{e}]')
+                self.download_failed_image.append((detail, e))
+
+            elif detail.is_photo():
+                detail: JmPhotoDetail
+                jm_log('photo.failed', f'章节下载失败: [{detail.id}], 异常: [{e}]')
+                self.download_failed_photo.append((detail, e))
+
+            raise e
+
+    return wrapper
+
+
 # noinspection PyMethodMayBeStatic
 class DownloadCallback:
 
@@ -50,48 +75,50 @@ class JmDownloader(DownloadCallback):
 
     def __init__(self, option: JmOption) -> None:
         self.option = option
+        self.client = option.build_jm_client()
         # 下载成功的记录dict
         self.download_success_dict: Dict[JmAlbumDetail, Dict[JmPhotoDetail, List[Tuple[str, JmImageDetail]]]] = {}
         # 下载失败的记录list
-        self.download_failed_list: List[Tuple[JmImageDetail, BaseException]] = []
+        self.download_failed_image: List[Tuple[JmImageDetail, BaseException]] = []
+        self.download_failed_photo: List[Tuple[JmPhotoDetail, BaseException]] = []
 
     def download_album(self, album_id):
-        client = self.client_for_album(album_id)
-        album = client.get_album_detail(album_id)
-        self.download_by_album_detail(album, client)
+        album = self.client.get_album_detail(album_id)
+        self.download_by_album_detail(album)
         return album
 
-    def download_by_album_detail(self, album: JmAlbumDetail, client: JmcomicClient):
+    def download_by_album_detail(self, album: JmAlbumDetail):
         self.before_album(album)
         if album.skip:
             return
-        self.execute_by_condition(
+        self.execute_on_condition(
             iter_objs=album,
-            apply=lambda photo: self.download_by_photo_detail(photo, client),
+            apply=self.download_by_photo_detail,
             count_batch=self.option.decide_photo_batch_count(album)
         )
         self.after_album(album)
 
     def download_photo(self, photo_id):
-        client = self.client_for_photo(photo_id)
-        photo = client.get_photo_detail(photo_id)
-        self.download_by_photo_detail(photo, client)
+        photo = self.client.get_photo_detail(photo_id)
+        self.download_by_photo_detail(photo)
         return photo
 
-    def download_by_photo_detail(self, photo: JmPhotoDetail, client: JmcomicClient):
-        client.check_photo(photo)
+    @catch_exception
+    def download_by_photo_detail(self, photo: JmPhotoDetail):
+        self.client.check_photo(photo)
 
         self.before_photo(photo)
         if photo.skip:
             return
-        self.execute_by_condition(
+        self.execute_on_condition(
             iter_objs=photo,
-            apply=lambda image: self.download_by_image_detail(image, client),
+            apply=self.download_by_image_detail,
             count_batch=self.option.decide_image_batch_count(photo)
         )
         self.after_photo(photo)
 
-    def download_by_image_detail(self, image: JmImageDetail, client: JmcomicClient):
+    @catch_exception
+    def download_by_image_detail(self, image: JmImageDetail):
         img_save_path = self.option.decide_image_filepath(image)
 
         image.save_path = img_save_path
@@ -110,22 +137,15 @@ class JmDownloader(DownloadCallback):
         if use_cache is True and image.exists:
             return
 
-        try:
-            client.download_by_image_detail(
-                image,
-                img_save_path,
-                decode_image=decode_image,
-            )
-        except BaseException as e:
-            jm_log('image.failed', f'图片下载失败: [{image.download_url}], 异常: {e}')
-            # 保存失败记录
-            self.download_failed_list.append((image, e))
-            raise
+        self.client.download_by_image_detail(
+            image,
+            img_save_path,
+            decode_image=decode_image,
+        )
 
         self.after_image(image, img_save_path)
 
-    # noinspection PyMethodMayBeStatic
-    def execute_by_condition(self,
+    def execute_on_condition(self,
                              iter_objs: DetailEntity,
                              apply: Callable,
                              count_batch: int,
@@ -166,20 +186,6 @@ class JmDownloader(DownloadCallback):
         """
         return detail
 
-    # noinspection PyUnusedLocal
-    def client_for_album(self, jm_album_id) -> JmcomicClient:
-        """
-        默认情况下，所有的JmDownloader共用一个JmcomicClient
-        """
-        return self.option.build_jm_client()
-
-    # noinspection PyUnusedLocal
-    def client_for_photo(self, jm_photo_id) -> JmcomicClient:
-        """
-        默认情况下，所有的JmDownloader共用一个JmcomicClient
-        """
-        return self.option.build_jm_client()
-
     @property
     def all_success(self) -> bool:
         """
@@ -189,7 +195,7 @@ class JmDownloader(DownloadCallback):
 
         注意！如果使用了filter机制，例如通过filter只下载3张图片，那么all_success也会为False
         """
-        if len(self.download_failed_list) != 0:
+        if self.has_download_failures:
             return False
 
         for album, photo_dict in self.download_success_dict.items():
@@ -202,6 +208,10 @@ class JmDownloader(DownloadCallback):
 
         return True
 
+    @property
+    def has_download_failures(self):
+        return len(self.download_failed_image) != 0 or len(self.download_failed_photo) != 0
+
     # 下面是回调方法
 
     def before_album(self, album: JmAlbumDetail):
@@ -259,6 +269,23 @@ class JmDownloader(DownloadCallback):
             downloader=self,
         )
 
+    def raise_if_has_exception(self):
+        if not self.has_download_failures:
+            return
+        msg_ls = ['部分下载失败', '', '']
+
+        if len(self.download_failed_photo) != 0:
+            msg_ls[1] = f'共{len(self.download_failed_photo)}个章节下载失败: {self.download_failed_photo}'
+
+        if len(self.download_failed_image) != 0:
+            msg_ls[2] = f'共{len(self.download_failed_image)}个图片下载失败: {self.download_failed_image}'
+
+        ExceptionTool.raises(
+            '\n'.join(msg_ls),
+            {'downloader': self},
+            PartialDownloadFailedException,
+        )
+
     # 下面是对with语法的支持
 
     def __enter__(self):
@@ -283,7 +310,7 @@ class DoNotDownloadImage(JmDownloader):
     不会下载任何图片的Downloader，用作测试
     """
 
-    def download_by_image_detail(self, image: JmImageDetail, client: JmcomicClient):
+    def download_by_image_detail(self, image: JmImageDetail):
         # ensure make dir
         self.option.decide_image_filepath(image)
 
@@ -297,12 +324,13 @@ class JustDownloadSpecificCountImage(JmDownloader):
     count_lock = Lock()
     count = 0
 
-    def download_by_image_detail(self, image: JmImageDetail, client: JmcomicClient):
+    @catch_exception
+    def download_by_image_detail(self, image: JmImageDetail):
         # ensure make dir
         self.option.decide_image_filepath(image)
 
         if self.try_countdown():
-            return super().download_by_image_detail(image, client)
+            return super().download_by_image_detail(image)
 
     def try_countdown(self):
         if self.count < 0:

{jmcomic-2.5.34 → jmcomic-2.5.36}/src/jmcomic/jm_entity.py

@@ -125,10 +125,9 @@ class DetailEntity(JmBaseEntity, IndexedEntity):
         return f'[{self.id}] {self.oname}'
 
     def __str__(self):
-        return f'{self.__class__.__name__}' \
-               '{' \
-               f'{self.id}: {self.title}' \
-               '}'
+        return f'''{self.__class__.__name__}({self.__alias__()}-{self.id}: "{self.title}")'''
+
+    __repr__ = __str__
 
     @classmethod
     def __alias__(cls):
@@ -165,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):
 
@@ -258,6 +283,11 @@ class JmImageDetail(JmBaseEntity, Downloadable):
     def is_image(cls):
         return True
 
+    def __str__(self):
+        return f'''{self.__class__.__name__}(image-[{self.download_url}])'''
+
+    __repr__ = __str__
+
 
 class JmPhotoDetail(DetailEntity, Downloadable):
 

{jmcomic-2.5.34 → jmcomic-2.5.36}/src/jmcomic/jm_exception.py

@@ -15,6 +15,7 @@ class JmcomicException(Exception):
     def __str__(self):
         return self.msg
 
+
 class ResponseUnexpectedException(JmcomicException):
     description = '响应不符合预期异常'
 
@@ -44,7 +45,6 @@ class RegularNotMatchException(JmcomicException):
 
 class JsonResolveFailException(ResponseUnexpectedException):
     description = 'Json解析异常'
-    pass
 
 
 class MissingAlbumPhotoException(ResponseUnexpectedException):
@@ -57,9 +57,15 @@ class MissingAlbumPhotoException(ResponseUnexpectedException):
 
 class RequestRetryAllFailException(JmcomicException):
     description = '请求重试全部失败异常'
-    pass
 
 
+class PartialDownloadFailedException(JmcomicException):
+    description = '部分章节或图片下载失败异常'
+
+    @property
+    def downloader(self):
+        return self.from_context(ExceptionTool.CONTEXT_KEY_DOWNLOADER)
+
 class ExceptionTool:
     """
     抛异常的工具
@@ -71,6 +77,7 @@ class ExceptionTool:
     CONTEXT_KEY_HTML = 'html'
     CONTEXT_KEY_RE_PATTERN = 'pattern'
     CONTEXT_KEY_MISSING_JM_ID = 'missing_jm_id'
+    CONTEXT_KEY_DOWNLOADER = 'downloader'
 
     @classmethod
     def raises(cls,

{jmcomic-2.5.34 → 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.34 → jmcomic-2.5.36/src/jmcomic.egg-info}/PKG-INFO

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