jmcomic 2.6.3__py3-none-any.whl → 2.6.4__py3-none-any.whl

jmcomic/__init__.py

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

jmcomic/jm_entity.py

@@ -469,11 +469,13 @@ class JmAlbumDetail(DetailEntity, Downloadable):
                  authors,
                  tags,
                  related_list=None,
+                 description='',
                  ):
         super().__init__()
         self.album_id: str = str(album_id)
         self.scramble_id: str = str(scramble_id)
         self.name: str = str(name).strip()
+        self.description = str(description).strip()
         self.page_count: int = int(page_count)  # 总页数
         self.pub_date: str = pub_date  # 发布日期
         self.update_date: str = update_date  # 更新日期

jmcomic/jm_plugin.py

@@ -749,6 +749,7 @@ class Img2pdfPlugin(JmOptionPlugin):
                filename_rule='Pid',
                dir_rule=None,
                delete_original_file=False,
+               encrypt=None,
                **kwargs,
                ):
         if photo is None and album is None:
@@ -766,14 +767,14 @@ class Img2pdfPlugin(JmOptionPlugin):
         pdf_filepath = self.decide_filepath(album, photo, filename_rule, 'pdf', pdf_dir, dir_rule)
 
         # 调用 img2pdf 把 photo_dir 下的所有图片转为pdf
-        img_path_ls, img_dir_ls = self.write_img_2_pdf(pdf_filepath, album, photo)
+        img_path_ls, img_dir_ls = self.write_img_2_pdf(pdf_filepath, album, photo, encrypt)
         self.log(f'Convert Successfully: JM{album or photo} → {pdf_filepath}')
 
         # 执行删除
         img_path_ls += img_dir_ls
         self.execute_deletion(img_path_ls)
 
-    def write_img_2_pdf(self, pdf_filepath, album: JmAlbumDetail, photo: JmPhotoDetail):
+    def write_img_2_pdf(self, pdf_filepath, album: JmAlbumDetail, photo: JmPhotoDetail, encrypt):
         import img2pdf
 
         if album is None:
@@ -795,8 +796,22 @@ class Img2pdfPlugin(JmOptionPlugin):
         with open(pdf_filepath, 'wb') as f:
             f.write(img2pdf.convert(img_path_ls))
 
+        if encrypt:
+            self.encrypt_pdf(pdf_filepath, encrypt)
+
         return img_path_ls, img_dir_ls
 
+    def encrypt_pdf(self, pdf_filepath: str, encrypt: dict):
+        try:
+            import pikepdf
+        except ImportError:
+            self.warning_lib_not_install('pikepdf')
+            return
+
+        password = str(encrypt.get('password', ''))
+        with pikepdf.open(pdf_filepath, allow_overwriting_input=True) as pdf:
+            pdf.save(pdf_filepath, encryption=pikepdf.Encryption(user=password, owner=password))
+
 
 class LongImgPlugin(JmOptionPlugin):
     plugin_key = 'long_img'

jmcomic/jm_toolkit.py

@@ -26,6 +26,7 @@ class JmcomicText:
     pattern_html_album_album_id = compile(r'<span class="number">.*?：JM(\d+)</span>')
     pattern_html_album_scramble_id = compile(r'var scramble_id = (\d+);')
     pattern_html_album_name = compile(r'id="book-name"[^>]*?>([\s\S]*?)<')
+    pattern_html_album_description = compile(r'叙述：([\s\S]*?)</h2>')
     pattern_html_album_episode_list = compile(r'data-album="(\d+)"[^>]*>[\s\S]*?第(\d+)[话話]([\s\S]*?)<[\s\S]*?>')
     pattern_html_album_page_count = compile(r'<span class="pagecount">.*?:(\d+)</span>')
     pattern_html_album_pub_date = compile(r'>上架日期 : (.*?)</span>')
@@ -651,6 +652,7 @@ class JmApiAdaptTool:
             'actors',
             'related_list',
             'name',
+            'description',
             ('id', 'album_id'),
             ('author', 'authors'),
             ('total_views', 'views'),

{jmcomic-2.6.3.dist-info → jmcomic-2.6.4.dist-info}/METADATA

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

{jmcomic-2.6.3.dist-info → jmcomic-2.6.4.dist-info}/RECORD

@@ -1,18 +1,18 @@
-jmcomic/__init__.py,sha256=BWvK4hjc2jPXlu3FiAnVV5bJ7r42Vc7eqfa97sM4msU,902
+jmcomic/__init__.py,sha256=bLTPD0DrRiCYtTpHwL3G2ApUxkkeAlo4MUb-jCT4Oso,902
 jmcomic/api.py,sha256=ZduhXDmh4lg1dkXHs7UTAaPpYNO7kcdPCDH5JJT9KSI,4253
 jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
 jmcomic/jm_client_impl.py,sha256=huPWXkEizu8x7J4rAk_iQROnXphPoyadXyvN8n1ENqI,41624
 jmcomic/jm_client_interface.py,sha256=Bld80cYwBwIqcMSJK09g5q8U_UX3IWnQJxuRJQwmIOk,19082
 jmcomic/jm_config.py,sha256=gyqvsm62Cr61-CNLAC1KBiIfdEzKJhJPAkRa6ZyuXOk,17144
 jmcomic/jm_downloader.py,sha256=azYkIN-1OuEivZ1TGGDaYo1FkcO5KatSb0g4GVdKSPY,11041
-jmcomic/jm_entity.py,sha256=x-3yUvM74C_Gof20mJw2SmZq7sSSsGNg0Cp47oZ-dFg,19968
+jmcomic/jm_entity.py,sha256=ZyXVy3mOl9qkxlw6hyshVS3RR-yKfO5BkJHtyBAoKQE,20053
 jmcomic/jm_exception.py,sha256=x3KGMLlQS2zi1GX7z5G58zJN2EwLkI4mAURkxZYjEvA,5055
 jmcomic/jm_option.py,sha256=kErkn9-tXYp4h4lDQvc8jDYG1vqOMLIdIb3fbHvSsbA,21247
-jmcomic/jm_plugin.py,sha256=M-f7xty_90d3mSYmzrXSpYdua-KEBQVzGcWip1OA5gc,40345
-jmcomic/jm_toolkit.py,sha256=C5z7ddhacDW-WgOm-ruPshxModKwDPUczdUjUdEI9CQ,29582
-jmcomic-2.6.3.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.6.3.dist-info/METADATA,sha256=wCnWgIAvJGAPm3_DL3xGUcFe-6gCma5ymlao55dGV4Y,9572
-jmcomic-2.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jmcomic-2.6.3.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.6.3.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.6.3.dist-info/RECORD,,
+jmcomic/jm_plugin.py,sha256=x42eqhRcnHElTif8ORXw2jZh33Xnq55-1dpC6tmr_lQ,40894
+jmcomic/jm_toolkit.py,sha256=SIYCRZ6P4SPbAQA03U5z2DNiDldY7hWsAvKTdEzyK9U,29683
+jmcomic-2.6.4.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.6.4.dist-info/METADATA,sha256=y8uFHhQIpHE7EWvNcQ-QVvCPv6EV4lZkry8ZXCg7Uuo,9572
+jmcomic-2.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jmcomic-2.6.4.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.6.4.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.6.4.dist-info/RECORD,,