jmcomic 2.5.9__py3-none-any.whl → 2.5.11__py3-none-any.whl

jmcomic/__init__.py

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

jmcomic/jm_client_interface.py

@@ -572,3 +572,15 @@ class JmcomicClient(
         }
 
         yield from self.do_page_iter(params, page, self.categories_filter)
+
+    def is_given_type(self, ctype: Type['JmcomicClient']) -> bool:
+        """
+        Client代理的此方法会被路由到内部client的方法
+        即：ClientProxy(AClient()).is_given_type(AClient) is True
+        但是: ClientProxy(AClient()).client_key != AClient.client_key
+        """
+        if isinstance(self, ctype):
+            return True
+        if self.client_key == instance.client_key:
+            return True
+        return False

jmcomic/jm_config.py

@@ -368,7 +368,7 @@ class JmModuleConfig:
             'postman': {
                 'type': 'cffi',
                 'meta_data': {
-                    'impersonate': 'chrome',
+                    'impersonate': 'chrome110',
                     'headers': None,
                     'proxies': None,
                 }

jmcomic/jm_option.py

@@ -236,28 +236,6 @@ class JmOption:
     def decide_photo_batch_count(self, album: JmAlbumDetail):
         return self.download.threading.photo
 
-    def decide_album_dir(self, album: JmAlbumDetail) -> str:
-        """
-        该方法目前仅在 plugin-zip 中使用，不建议外部调用
-        """
-        dir_layer = []
-        dir_rule = self.dir_rule
-        for rule in dir_rule.rule_dsl.split('_'):
-            if rule == 'Bd':
-                dir_layer.append(dir_rule.base_dir)
-                continue
-
-            if rule[0] == 'A':
-                name = dir_rule.apply_rule_directly(album, None, rule)
-                dir_layer.append(name)
-
-            if rule[0] == 'P':
-                break
-
-        from os.path import join
-        # noinspection PyTypeChecker
-        return join(*dir_layer)
-
     # noinspection PyMethodMayBeStatic
     def decide_image_filename(self, image: JmImageDetail) -> str:
         """

jmcomic/jm_plugin.py

@@ -302,27 +302,19 @@ class ZipPlugin(JmOptionPlugin):
 
         if level == 'album':
             zip_path = self.get_zip_path(album, None, filename_rule, suffix, zip_dir)
-            dir_path = self.zip_album(album, photo_dict, zip_path)
-            if dir_path is not None:
-                # 要删除这个album文件夹
-                dir_zip_dict[dir_path] = zip_path
-                # 也要删除album下的photo文件夹
-                for d in files_of_dir(dir_path):
-                    dir_zip_dict[d] = None
+            self.zip_album(album, photo_dict, zip_path, dir_zip_dict)
 
         elif level == 'photo':
             for photo, image_list in photo_dict.items():
                 zip_path = self.get_zip_path(None, photo, filename_rule, suffix, zip_dir)
-                dir_path = self.zip_photo(photo, image_list, zip_path)
-                if dir_path is not None:
-                    dir_zip_dict[dir_path] = zip_path
+                self.zip_photo(photo, image_list, zip_path, dir_zip_dict)
 
         else:
             ExceptionTool.raises(f'Not Implemented Zip Level: {level}')
 
         self.after_zip(dir_zip_dict)
 
-    def zip_photo(self, photo, image_list: list, zip_path: str) -> Optional[str]:
+    def zip_photo(self, photo, image_list: list, zip_path: str, dir_zip_dict) -> Optional[str]:
         """
         压缩photo文件夹
         :returns: photo文件夹路径
@@ -333,50 +325,58 @@ class ZipPlugin(JmOptionPlugin):
 
         all_filepath = set(map(lambda t: self.unified_path(t[0]), image_list))
 
-        return self.do_zip(photo_dir,
-                           zip_path,
-                           all_filepath,
-                           f'压缩章节[{photo.photo_id}]成功 → {zip_path}',
-                           )
+        if len(all_filepath) == 0:
+            self.log('无下载文件，无需压缩', 'skip')
+            return None
+
+        from common import backup_dir_to_zip
+        backup_dir_to_zip(
+            photo_dir,
+            zip_path,
+            acceptor=lambda f: os.path.isdir(f) or self.unified_path(f) in all_filepath
+        ).close()
+
+        self.log(f'压缩章节[{photo.photo_id}]成功 → {zip_path}', 'finish')
+        dir_zip_dict[self.unified_path(photo_dir)] = zip_path
 
     @staticmethod
     def unified_path(f):
         return fix_filepath(f, os.path.isdir(f))
 
-    def zip_album(self, album, photo_dict: dict, zip_path) -> Optional[str]:
+    def zip_album(self, album, photo_dict: dict, zip_path, dir_zip_dict) -> Optional[str]:
         """
         压缩album文件夹
         :returns: album文件夹路径
         """
-        all_filepath: Set[str] = set()
-
-        def addpath(f):
-            all_filepath.update(set(f))
 
-        album_dir = self.option.decide_album_dir(album)
-        # addpath(self.option.decide_image_save_dir(photo) for photo in photo_dict.keys())
-        addpath(path for ls in photo_dict.values() for path, _ in ls)
+        # 所有下载了的图片文件的路径
+        all_filepath: Set[str] = set(path for ls in photo_dict.values() for path, _ in ls)
 
-        return self.do_zip(album_dir,
-                           zip_path,
-                           all_filepath,
-                           msg=f'压缩本子[{album.album_id}]成功 → {zip_path}',
-                           )
-
-    def do_zip(self, source_dir, zip_path, all_filepath, msg):
         if len(all_filepath) == 0:
             self.log('无下载文件，无需压缩', 'skip')
-            return None
+            return
 
+        # 该本子的所有章节的图片所在文件夹
+        photo_dir_list = [self.option.decide_image_save_dir(photo) for photo in photo_dict.keys()]
+
+        # 压缩文件对象
         from common import backup_dir_to_zip
-        backup_dir_to_zip(
-            source_dir,
-            zip_path,
-            acceptor=lambda f: os.path.isdir(f) or self.unified_path(f) in all_filepath
-        ).close()
+        import zipfile
+        zfile = zipfile.ZipFile(zip_path, 'w')
+
+        for photo_dir in photo_dir_list:
+            photo_dir = self.unified_path(photo_dir)
+            backup_dir_to_zip(
+                photo_dir,
+                zip_path,
+                zfile=zfile,
+                prefix=os.path.basename(photo_dir.rstrip('/')),
+                acceptor=lambda f: os.path.isdir(f) or self.unified_path(f) in all_filepath
+            )
+            dir_zip_dict[photo_dir] = zip_path
 
-        self.log(msg, 'finish')
-        return self.unified_path(source_dir)
+        zfile.close()
+        self.log(f'压缩本子[{album.album_id}]成功 → {zip_path}', 'finish')
 
     def after_zip(self, dir_zip_dict: Dict[str, Optional[str]]):
         # 删除所有原文件
@@ -757,6 +757,49 @@ class ConvertJpgToPdfPlugin(JmOptionPlugin):
             self.execute_deletion(paths)
 
 
+class Img2pdfPlugin(JmOptionPlugin):
+    plugin_key = 'img2pdf'
+
+    def invoke(self,
+               photo: JmPhotoDetail,
+               downloader=None,
+               pdf_dir=None,
+               filename_rule='Pid',
+               delete_original_file=False,
+               **kwargs,
+               ):
+        try:
+            import img2pdf
+        except ImportError:
+            self.warning_lib_not_install('img2pdf')
+            return
+
+        self.delete_original_file = delete_original_file
+
+        # 处理文件夹配置
+        filename = DirRule.apply_rule_directly(None, photo, filename_rule)
+        photo_dir = self.option.decide_image_save_dir(photo)
+
+        # 处理生成的pdf文件的路径
+        if pdf_dir is None:
+            pdf_dir = photo_dir
+        else:
+            pdf_dir = fix_filepath(pdf_dir, True)
+            mkdir_if_not_exists(pdf_dir)
+
+        pdf_filepath = os.path.join(pdf_dir, f'{filename}.pdf')
+
+        # 调用 img2pdf 把 photo_dir 下的所有图片转为pdf
+        all_img = files_of_dir(photo_dir)
+        with open(pdf_filepath, 'wb') as f:
+            f.write(img2pdf.convert(all_img))
+
+        # 执行删除
+        self.log(f'Convert Successfully: JM{photo.id} → {pdf_filepath}')
+        all_img.append(self.option.decide_image_save_dir(photo, ensure_exists=False))
+        self.execute_deletion(all_img)
+
+
 class JmServerPlugin(JmOptionPlugin):
     plugin_key = 'jm_server'
 

{jmcomic-2.5.9.dist-info → jmcomic-2.5.11.dist-info}/METADATA

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

jmcomic-2.5.11.dist-info/RECORD

@@ -0,0 +1,18 @@
+jmcomic/__init__.py,sha256=Hjp1Q6tJ5zCFkSqh2ETXJuh_Rgpx5OKEjMhSbrU3dTs,903
+jmcomic/api.py,sha256=uLHtSof7ZaiWZcNDDAz6grD1NYs4VxsoCOrsge3G7v8,3864
+jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
+jmcomic/jm_client_impl.py,sha256=Oszkw7dKfg8DHzmjyBVD1DrHp9OlvLK33IQHB7uXo48,37811
+jmcomic/jm_client_interface.py,sha256=vP36T2OI5MQdmfdYEnoFGRpHZRTE9LnBetDUFCOnMg4,17691
+jmcomic/jm_config.py,sha256=I08aDW1WH9uVnbyiUvy4lfI8cAU8NNK96cEA5kGYcoM,15252
+jmcomic/jm_downloader.py,sha256=0r4z7FRnow6xkRy_WTv7nLQOhYdtZmoouw0BNrhngco,10397
+jmcomic/jm_entity.py,sha256=-WUKYGkNToQv5Hja3RkI5abHF1g46WpLyVjoyXMs-wI,18974
+jmcomic/jm_exception.py,sha256=B9APE1jw23JBzCT12eV_imCZny3mNrSXju1p2IquaHA,4801
+jmcomic/jm_option.py,sha256=s16w8uZYfCBUgsxCjegnLoAqHF69rJicVZKQTZlQTJA,21723
+jmcomic/jm_plugin.py,sha256=21bd71tmsKyli73skMx0ozcqBM5saHzICEicjRQ98-Q,33606
+jmcomic/jm_toolkit.py,sha256=WLHaigCN03Z4b5swGTRTTSWzZsa0uFxGAnw4xKhbh1U,28649
+jmcomic-2.5.11.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.5.11.dist-info/METADATA,sha256=2vGTgKwdQwztHQ8eIQ9cMOdHb5FTKYCPRZ_uWP6qP0E,6123
+jmcomic-2.5.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+jmcomic-2.5.11.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.5.11.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.5.11.dist-info/RECORD,,

jmcomic-2.5.9.dist-info/RECORD

@@ -1,18 +0,0 @@
-jmcomic/__init__.py,sha256=WAC5HDkp2E-1HtrXfYzNJf9HWoCXqZx5wyLRUdFsFKI,902
-jmcomic/api.py,sha256=uLHtSof7ZaiWZcNDDAz6grD1NYs4VxsoCOrsge3G7v8,3864
-jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
-jmcomic/jm_client_impl.py,sha256=Oszkw7dKfg8DHzmjyBVD1DrHp9OlvLK33IQHB7uXo48,37811
-jmcomic/jm_client_interface.py,sha256=f-2pFwJUzEdH4GVG8ExbR0dSoIP4w5M6CjX_Mlbxglc,17234
-jmcomic/jm_config.py,sha256=zVyxJrB-KpSwrVCEooglIdC2fT6St08P2ycK3GrqDTE,15249
-jmcomic/jm_downloader.py,sha256=0r4z7FRnow6xkRy_WTv7nLQOhYdtZmoouw0BNrhngco,10397
-jmcomic/jm_entity.py,sha256=-WUKYGkNToQv5Hja3RkI5abHF1g46WpLyVjoyXMs-wI,18974
-jmcomic/jm_exception.py,sha256=B9APE1jw23JBzCT12eV_imCZny3mNrSXju1p2IquaHA,4801
-jmcomic/jm_option.py,sha256=Y_ckE9xa6y0oqjG6CbKR3QX4TWvLuHK2ue_RzQkMxHM,22395
-jmcomic/jm_plugin.py,sha256=YWt7MAWuy2zOsHEARDKf4ZFE3pDmHPqM1M0vwnoNgVg,32262
-jmcomic/jm_toolkit.py,sha256=WLHaigCN03Z4b5swGTRTTSWzZsa0uFxGAnw4xKhbh1U,28649
-jmcomic-2.5.9.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.5.9.dist-info/METADATA,sha256=317JlniKqNOIcwLCBrxP5hUpMCBIoiCECPM9poW_OHs,6122
-jmcomic-2.5.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-jmcomic-2.5.9.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.5.9.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.5.9.dist-info/RECORD,,