jmcomic 2.6.0__py3-none-any.whl → 2.6.2__py3-none-any.whl

jmcomic/__init__.py

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

jmcomic/jm_client_impl.py

@@ -431,7 +431,7 @@ class JmHtmlClient(AbstractJmClient):
             params={
                 'page': page,
                 'o': order_by,
-                'folder_id': folder_id,
+                'folder': folder_id,
             }
         )
 
@@ -1033,7 +1033,7 @@ class JmApiClient(AbstractJmClient):
                     jm_log('api.update_domain.empty',
                            f'获取禁漫最新API域名失败, 返回值: {res_json}')
                     return
-                new_server_list: list[str] = res_data['Server']
+                new_server_list: List[str] = res_data['Server']
                 old_server_list = JmModuleConfig.DOMAIN_API_LIST
                 jm_log('api.update_domain.success',
                        f'获取到最新的API域名，替换jmcomic内置域名：(new){new_server_list} ---→ (old){old_server_list}'

jmcomic/jm_downloader.py

@@ -294,7 +294,7 @@ class JmDownloader(DownloadCallback):
     def __exit__(self, exc_type, exc_val, exc_tb):
         if exc_type is not None:
             jm_log('dler.exception',
-                   f'{self.__class__.__name__} Exit with exception: {exc_type, exc_val}'
+                   f'{self.__class__.__name__} Exit with exception: {exc_type, str(exc_val)}'
                    )
 
     @classmethod

jmcomic/jm_option.py

@@ -134,7 +134,7 @@ class DirRule:
         return str(DetailEntity.get_dirname(detail, rule[1:]))
 
     # noinspection PyMethodMayBeStatic
-    def split_rule_dsl(self, rule_dsl: str) -> list[str]:
+    def split_rule_dsl(self, rule_dsl: str) -> List[str]:
         if '/' in rule_dsl:
             rule_list = rule_dsl.split('/')
         elif '_' in rule_dsl:

jmcomic/jm_toolkit.py

@@ -22,6 +22,7 @@ class JmcomicText:
     pattern_html_photo_sort = compile(r'var sort = (\d+);')
     pattern_html_photo_page_arr = compile(r'var page_arr = (.*?);')
 
+    pattern_html_b64_decode_content = compile(r'const html = base64DecodeUtf8\("(.*?)"\)')
     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]*?)<')
@@ -106,6 +107,15 @@ class JmcomicText:
             domain_ls
         ))
 
+    @classmethod
+    def parse_jm_base64_html(cls, resp_text: str) -> str:
+        from base64 import b64decode
+        html_b64 = PatternTool.match_or_default(resp_text, cls.pattern_html_b64_decode_content, None)
+        if html_b64 is None:
+            return resp_text
+        html = b64decode(html_b64).decode()
+        return html
+
     @classmethod
     def analyse_jm_photo_html(cls, html: str) -> JmPhotoDetail:
         return cls.reflect_new_instance(
@@ -117,7 +127,7 @@ class JmcomicText:
     @classmethod
     def analyse_jm_album_html(cls, html: str) -> JmAlbumDetail:
         return cls.reflect_new_instance(
-            html,
+            cls.parse_jm_base64_html(html),
             "pattern_html_album_",
             JmModuleConfig.album_class()
         )

{jmcomic-2.6.0.dist-info → jmcomic-2.6.2.dist-info}/METADATA

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

jmcomic-2.6.2.dist-info/RECORD

@@ -0,0 +1,18 @@
+jmcomic/__init__.py,sha256=MlhEa2Xk64RfDC8-PZ-asHFihxGbrQIadAnVxppSxxY,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=2airaTXejmeSoow5cUBgHsPmmFA4m8MlqIHmT8OvWWA,17147
+jmcomic/jm_downloader.py,sha256=azYkIN-1OuEivZ1TGGDaYo1FkcO5KatSb0g4GVdKSPY,11041
+jmcomic/jm_entity.py,sha256=x-3yUvM74C_Gof20mJw2SmZq7sSSsGNg0Cp47oZ-dFg,19968
+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.2.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.6.2.dist-info/METADATA,sha256=XIgEPt9z99CsQ7T0SRADMHE4xJ4KodtOU8gVG8F2X7E,8199
+jmcomic-2.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jmcomic-2.6.2.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.6.2.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.6.2.dist-info/RECORD,,

jmcomic-2.6.0.dist-info/RECORD

@@ -1,18 +0,0 @@
-jmcomic/__init__.py,sha256=vA2i9PVvDB_Ea_fk-0frPv_mjXqUMS5QOsftQOBGj74,902
-jmcomic/api.py,sha256=ZduhXDmh4lg1dkXHs7UTAaPpYNO7kcdPCDH5JJT9KSI,4253
-jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
-jmcomic/jm_client_impl.py,sha256=nzKOSGg0mCno9OWfcIPoF2SsOd_GQY_0nFUaMrMMJW8,41627
-jmcomic/jm_client_interface.py,sha256=Bld80cYwBwIqcMSJK09g5q8U_UX3IWnQJxuRJQwmIOk,19082
-jmcomic/jm_config.py,sha256=2airaTXejmeSoow5cUBgHsPmmFA4m8MlqIHmT8OvWWA,17147
-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=GijXHBDXNUt4oh_6th7TsT2gj4tBJjPLQfwPPNHyTlU,21247
-jmcomic/jm_plugin.py,sha256=M-f7xty_90d3mSYmzrXSpYdua-KEBQVzGcWip1OA5gc,40345
-jmcomic/jm_toolkit.py,sha256=zYwBny0Uqe1SXn2ZoLJfss4aWZq5KzTSeBKK7mQf810,29128
-jmcomic-2.6.0.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.6.0.dist-info/METADATA,sha256=aeRjLf2ds6Z465Q7EiA2F1lH_Eiy83BwQ_sl_vH1tUA,8199
-jmcomic-2.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jmcomic-2.6.0.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.6.0.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.6.0.dist-info/RECORD,,