jmcomic 2.5.31__py3-none-any.whl → 2.5.33__py3-none-any.whl

jmcomic/__init__.py

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

jmcomic/jm_config.py

@@ -76,7 +76,7 @@ class JmMagicConstants:
     APP_TOKEN_SECRET = '18comicAPP'
     APP_TOKEN_SECRET_2 = '18comicAPPContent'
     APP_DATA_SECRET = '185Hcomic3PAPP7R'
-    APP_VERSION = '1.7.6'
+    APP_VERSION = '1.7.9'
 
 
 # 模块级别共用配置
@@ -127,10 +127,10 @@ class JmModuleConfig:
 
     # 移动端API域名
     DOMAIN_API_LIST = shuffled('''
-    www.jmapiproxyxxx.vip
-    www.cdnblackmyth.vip
-    www.cdnblackmyth.xyz
-    www.cdnxxx-proxy.co
+    www.cdnmhwscc.vip
+    www.cdnblackmyth.club
+    www.cdnmhws.cc
+    www.cdnuc.vip
     ''')
 
     APP_HEADERS_TEMPLATE = {

jmcomic/jm_plugin.py

@@ -278,8 +278,9 @@ class ZipPlugin(JmOptionPlugin):
 
     # noinspection PyAttributeOutsideInit
     def invoke(self,
-               album: JmAlbumDetail,
                downloader,
+               album: JmAlbumDetail = None,
+               photo: JmPhotoDetail = None,
                delete_original_file=False,
                level='photo',
                filename_rule='Ptitle',
@@ -298,7 +299,7 @@ class ZipPlugin(JmOptionPlugin):
         mkdir_if_not_exists(zip_dir)
 
         path_to_delete = []
-        photo_dict = downloader.download_success_dict[album]
+        photo_dict = self.get_downloaded_photo(downloader, album, photo)
 
         if level == 'album':
             zip_path = self.get_zip_path(album, None, filename_rule, suffix, zip_dir)
@@ -314,6 +315,13 @@ class ZipPlugin(JmOptionPlugin):
 
         self.after_zip(path_to_delete)
 
+    def get_downloaded_photo(self, downloader, album, photo):
+        return (
+            downloader.download_success_dict[album]
+            if album is not None  # after_album
+            else downloader.download_success_dict[photo.from_album] # after_photo
+        )
+
     def zip_photo(self, photo, image_list: list, zip_path: str, path_to_delete):
         """
         压缩photo文件夹

jmcomic/jm_toolkit.py

@@ -317,7 +317,7 @@ class JmcomicText:
     @classmethod
     def to_zh_cn(cls, s):
         import zhconv
-        return zhconv.convert(s, 'zh_cn')
+        return zhconv.convert(s, 'zh-cn')
 
     @classmethod
     def try_mkdir(cls, save_dir: str):

{jmcomic-2.5.31.dist-info → jmcomic-2.5.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: jmcomic
-Version: 2.5.31
+Version: 2.5.33
 Summary: Python API For JMComic (禁漫天堂)
 Home-page: https://github.com/hect0x7/JMComic-Crawler-Python
 Author: hect0x7
@@ -33,6 +33,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -150,8 +151,9 @@ jmcomic 123 --option="D:/a.yml"
 
 b. 配置环境变量 `JM_OPTION_PATH` 为option文件路径（推荐）
 
+> 请自行google配置环境变量的方式，或使用powershell命令:  `setx JM_OPTION_PATH "D:/a.yml"` 重启后生效
+
 ```sh
-# set JM_OPTION_PATH="D:/a.yml"
 jmcomic 123
 ```
 

jmcomic-2.5.33.dist-info/RECORD

@@ -0,0 +1,18 @@
+jmcomic/__init__.py,sha256=5JBDh7vWLkZIu1X_zrdMEt1ibxdewV9t8IzE7w-4LWs,903
+jmcomic/api.py,sha256=40mzFEVhR0h_Ta-ub8vMfJ9yx89yvL09XMv9zK0QUvA,3865
+jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
+jmcomic/jm_client_impl.py,sha256=KguizzmrN2etAFvHzZaxbq7c8RtFhvqJzhQIAgPj7Dw,39622
+jmcomic/jm_client_interface.py,sha256=LqJqa-4G7-F98_U9R9QTxFND_9t30B-BIQZa_o0p-KY,19005
+jmcomic/jm_config.py,sha256=rOeKMqZ3HwWk3I-vA0YTCIimBcfdZpvXj7Itg0OKfCo,16767
+jmcomic/jm_downloader.py,sha256=vfAjHggbs4vvtrv9zM8NjeGWXk2-9tlqQaC8iC4FKpw,10351
+jmcomic/jm_entity.py,sha256=kqLtl30o_MN2pwGoahmbqm24pDojIt-45Ey_4cIHfa8,19103
+jmcomic/jm_exception.py,sha256=B9APE1jw23JBzCT12eV_imCZny3mNrSXju1p2IquaHA,4801
+jmcomic/jm_option.py,sha256=2tINFsDcncCJbd6FRtCMAidhro6faB8TBLoaSxP3uQ8,21926
+jmcomic/jm_plugin.py,sha256=4aMRnq3Y4gF8tPGz4eCX9-TIUjMUWqe0_WG47wWdR1U,39901
+jmcomic/jm_toolkit.py,sha256=AK5lH_xp6HSMqqy-Jkr7iE2TJVjxoYEH7JJvYmCK1wQ,29183
+jmcomic-2.5.33.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.5.33.dist-info/METADATA,sha256=65iNRYOv6sW5HcYwo5sdfm8ODusld3TA7930xpKZ6kE,8161
+jmcomic-2.5.33.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+jmcomic-2.5.33.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.5.33.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.5.33.dist-info/RECORD,,

{jmcomic-2.5.31.dist-info → jmcomic-2.5.33.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

jmcomic-2.5.31.dist-info/RECORD

@@ -1,18 +0,0 @@
-jmcomic/__init__.py,sha256=aM1p8ZWbqGz7WEu-dqPeHv7fqsiHKDq6s8g0Y4s15fI,903
-jmcomic/api.py,sha256=40mzFEVhR0h_Ta-ub8vMfJ9yx89yvL09XMv9zK0QUvA,3865
-jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
-jmcomic/jm_client_impl.py,sha256=KguizzmrN2etAFvHzZaxbq7c8RtFhvqJzhQIAgPj7Dw,39622
-jmcomic/jm_client_interface.py,sha256=LqJqa-4G7-F98_U9R9QTxFND_9t30B-BIQZa_o0p-KY,19005
-jmcomic/jm_config.py,sha256=enilY8STtFhCpxB7rm-wrhIY-9exxO8IHtQytRufeek,16782
-jmcomic/jm_downloader.py,sha256=vfAjHggbs4vvtrv9zM8NjeGWXk2-9tlqQaC8iC4FKpw,10351
-jmcomic/jm_entity.py,sha256=kqLtl30o_MN2pwGoahmbqm24pDojIt-45Ey_4cIHfa8,19103
-jmcomic/jm_exception.py,sha256=B9APE1jw23JBzCT12eV_imCZny3mNrSXju1p2IquaHA,4801
-jmcomic/jm_option.py,sha256=2tINFsDcncCJbd6FRtCMAidhro6faB8TBLoaSxP3uQ8,21926
-jmcomic/jm_plugin.py,sha256=aCyMO_8YGrT37A12LxkKH020IryP0qn3KVRg0f4dquo,39566
-jmcomic/jm_toolkit.py,sha256=2XnNwdROgrgDaSx7Xz77B0VE80w294LjnjI8TtiAcL8,29183
-jmcomic-2.5.31.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.5.31.dist-info/METADATA,sha256=ehDXArfYgJLZokBamAp-96AGlCHFZC7NFguKdbC0WjU,8046
-jmcomic-2.5.31.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-jmcomic-2.5.31.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.5.31.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.5.31.dist-info/RECORD,,