jmcomic 2.6.10__py3-none-any.whl → 2.6.12__py3-none-any.whl

jmcomic/__init__.py

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

jmcomic/jm_client_impl.py

@@ -765,55 +765,17 @@ class JmApiClient(AbstractJmClient):
 
     def setting(self) -> JmApiResp:
         """
-        禁漫app的setting请求，返回如下内容（resp.res_data）
-        {
-          "logo_path": "https://cdn-msp.jmapiproxy1.monster/media/logo/new_logo.png",
-          "main_web_host": "18-comic.work",
-          "img_host": "https://cdn-msp.jmapiproxy1.monster",
-          "base_url": "https://www.jmapinode.biz",
-          "is_cn": 0,
-          "cn_base_url": "https://www.jmapinode.biz",
-          "version": "1.6.0",
-          "test_version": "1.6.1",
-          "store_link": "https://play.google.com/store/apps/details?id=com.jiaohua_browser",
-          "ios_version": "1.6.0",
-          "ios_test_version": "1.6.1",
-          "ios_store_link": "https://18comic.vip/stray/",
-          "ad_cache_version": 1698140798,
-          "bundle_url": "https://18-comic.work/static/apk/patches1.6.0.zip",
-          "is_hot_update": true,
-          "api_banner_path": "https://cdn-msp.jmapiproxy1.monster/media/logo/channel_log.png?v=",
-          "version_info": "\nAPP & IOS更新\nV1.6.0\n#禁漫 APK 更新拉!!\n更新調整以下項目\n1. 系統優化\n\nV1.5.9\n1. 跳錯誤新增 重試 網頁 按鈕\n2. 圖片讀取優化\n3.
-          線路調整優化\n\n無法順利更新或是系統題是有風險請使用下方\n下載點2\n有問題可以到DC群反饋\nhttps://discord.gg/V74p7HM\n",
-          "app_shunts": [
-            {
-              "title": "圖源1",
-              "key": 1
-            },
-            {
-              "title": "圖源2",
-              "key": 2
-            },
-            {
-              "title": "圖源3",
-              "key": 3
-            },
-            {
-              "title": "圖源4",
-              "key": 4
-            }
-          ],
-          "download_url": "https://18-comic.work/static/apk/1.6.0.apk",
-          "app_landing_page": "https://jm365.work/pXYbfA",
-          "float_ad": true
-        }
+        禁漫app的setting请求
         """
         resp = self.req_api('/setting')
 
         # 检查禁漫最新的版本号
-        setting_ver = str(resp.model_data.version)
+        setting_ver = str(resp.model_data.jm3_version)
         # 禁漫接口的版本 > jmcomic库内置版本
-        if setting_ver > JmMagicConstants.APP_VERSION and JmModuleConfig.FLAG_USE_VERSION_NEWER_IF_BEHIND:
+        if (
+                JmModuleConfig.FLAG_USE_VERSION_NEWER_IF_BEHIND
+                and JmcomicText.compare_versions(setting_ver, JmMagicConstants.APP_VERSION) == 1
+        ):
             jm_log('api.setting', f'change APP_VERSION from [{JmMagicConstants.APP_VERSION}] to [{setting_ver}]')
             JmMagicConstants.APP_VERSION = setting_ver
 
@@ -959,10 +921,7 @@ class JmApiClient(AbstractJmClient):
 
         # 1. 检查是否 album_missing
         # json: {'code': 200, 'data': []}
-        data = resp.model().data
-        if isinstance(data, list) and len(data) == 0:
-            ExceptionTool.raise_missing(resp, JmcomicText.parse_to_jm_id(url))
-
+        # 最新api已不存在这种情况，无需检查
         # 2. 是否是特殊的内容
         # 暂无
 
@@ -1007,7 +966,8 @@ class JmApiClient(AbstractJmClient):
     def after_init(self):
         # 自动更新禁漫API域名
         if JmModuleConfig.FLAG_API_CLIENT_AUTO_UPDATE_DOMAIN:
-            self.update_api_domain()
+            new_server_list = self.fetch_latest_api_domain_for_module()
+            self.update_old_api_domain(new_server_list)
 
         # 保证拥有cookies，因为移动端要求必须携带cookies，否则会直接跳转同一本子【禁漫娘】
         if JmModuleConfig.FLAG_API_CLIENT_REQUIRE_COOKIES:
@@ -1032,13 +992,19 @@ class JmApiClient(AbstractJmClient):
         else:
             return res_data['Server']
 
-    def update_api_domain(self):
-        if True is JmModuleConfig.FLAG_API_CLIENT_AUTO_UPDATE_DOMAIN_DONE:
-            return
+    def update_old_api_domain(self, new_server_list: List[str]):
+        if new_server_list and sorted(self.domain_list) == sorted(JmModuleConfig.DOMAIN_API_LIST):
+            self.domain_list = new_server_list
+
+    def fetch_latest_api_domain_for_module(self):
+        if JmModuleConfig.DOMAIN_API_UPDATED_LIST is not None:
+            return JmModuleConfig.DOMAIN_API_UPDATED_LIST
 
         with self.client_update_domain_lock:
-            if True is JmModuleConfig.FLAG_API_CLIENT_AUTO_UPDATE_DOMAIN_DONE:
-                return
+            # double check
+            if JmModuleConfig.DOMAIN_API_UPDATED_LIST is not None:
+                return JmModuleConfig.DOMAIN_API_UPDATED_LIST
+
             # 遍历多个域名服务器
             for url in JmModuleConfig.API_URL_DOMAIN_SERVER_LIST:
                 try:
@@ -1050,18 +1016,20 @@ class JmApiClient(AbstractJmClient):
                     jm_log('api.update_domain.success',
                            f'获取到最新的API域名，替换jmcomic内置域名：(new){new_server_list} ---→ (old){old_server_list}'
                            )
-                    # 更新域名
-                    if sorted(self.domain_list) == sorted(old_server_list):
-                        self.domain_list = new_server_list
-                    JmModuleConfig.DOMAIN_API_LIST = new_server_list
-                    break
+                    JmModuleConfig.DOMAIN_API_UPDATED_LIST = new_server_list
+                    return new_server_list
                 except Exception as e:
                     jm_log('api.update_domain.error',
-                           f'通过[{url}]自动更新API域名失败，仍使用jmcomic内置域名。'
+                           f'通过[{url}]自动更新API域名失败，尝试下一个地址。'
                            f'可通过代码[JmModuleConfig.FLAG_API_CLIENT_AUTO_UPDATE_DOMAIN=False]关闭自动更新API域名. 异常： {e}'
                            )
-            # set done finally
-            JmModuleConfig.FLAG_API_CLIENT_AUTO_UPDATE_DOMAIN_DONE = True
+                    continue
+
+            # 走到这里，说明没有获取到域名更新
+            # 为了本方法不被重复执行，把新域名字段修改为空列表
+            # 空列表相当于一个done标识
+            JmModuleConfig.DOMAIN_API_UPDATED_LIST = []
+            return JmModuleConfig.DOMAIN_API_UPDATED_LIST
 
     client_init_cookies_lock = Lock()
 

jmcomic/jm_client_interface.py

@@ -122,18 +122,24 @@ class JmApiResp(JmJsonResp):
     def encoded_data(self) -> str:
         return self.json()['data']
 
+    def require_have_data(self):
+        data = self.encoded_data
+        if isinstance(data, list) and len(data) == 0 and self.json().get('errorMsg', None):
+            ExceptionTool.raises_resp(f'data返回值异常: {self.text}', self)
+
     @property
     def res_data(self) -> Any:
         self.require_success()
+        self.require_have_data()
         from json import loads
         return loads(self.decoded_data)
 
     @property
     def model_data(self) -> AdvancedDict:
         self.require_success()
+        self.require_have_data()
         return AdvancedDict(self.res_data)
 
-
 # album-comment
 class JmAlbumCommentResp(JmJsonResp):
 

jmcomic/jm_config.py

@@ -21,6 +21,9 @@ class JmMagicConstants:
     ORDER_BY_VIEW = 'mv'
     ORDER_BY_PICTURE = 'mp'
     ORDER_BY_LIKE = 'tf'
+    # 下面这两个目前只在网页上看到，app上没有
+    ORDER_BY_SCORE = 'tr'
+    ORDER_BY_COMMENT = 'md'
 
     ORDER_MONTH_RANKING = 'mv_m'
     ORDER_WEEK_RANKING = 'mv_w'
@@ -77,7 +80,7 @@ class JmMagicConstants:
     APP_TOKEN_SECRET_2 = '18comicAPPContent'
     APP_DATA_SECRET = '185Hcomic3PAPP7R'
     API_DOMAIN_SERVER_SECRET = 'diosfjckwpqpdfjkvnqQjsik'
-    APP_VERSION = '2.0.6'
+    APP_VERSION = '2.0.16'
 
 
 # 模块级别共用配置
@@ -134,6 +137,8 @@ class JmModuleConfig:
     www.cdnplaystation6.cc
     ''')
 
+    DOMAIN_API_UPDATED_LIST = None
+
     # 获取最新移动端API域名的地址
     API_URL_DOMAIN_SERVER_LIST = shuffled('''
     https://rup4a04-c01.tos-ap-southeast-1.bytepluses.com/newsvr-2025.txt
@@ -148,7 +153,7 @@ class JmModuleConfig:
 
     APP_HEADERS_IMAGE = {
         'Accept': 'image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8',
-        'X-Requested-With': 'com.jiaohua_browser',
+        'X-Requested-With': 'com.JMComic3.app',
         'Referer': PROT + DOMAIN_API_LIST[0],
         'Accept-Language': 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7',
     }
@@ -209,7 +214,6 @@ class JmModuleConfig:
     FLAG_API_CLIENT_REQUIRE_COOKIES = True
     # 自动更新禁漫API域名
     FLAG_API_CLIENT_AUTO_UPDATE_DOMAIN = True
-    FLAG_API_CLIENT_AUTO_UPDATE_DOMAIN_DONE = None
     # log开关标记
     FLAG_ENABLE_JM_LOG = True
     # log时解码url

jmcomic/jm_option.py

@@ -130,9 +130,9 @@ class DirRule:
     @classmethod
     def parse_f_string_rule(cls, album, photo, rule: str):
         properties = {}
-        if album:
+        if album is not None:
             properties.update(album.get_properties_dict())
-        if photo:
+        if photo is not None:
             properties.update(photo.get_properties_dict())
         return rule.format(**properties)
 

jmcomic/jm_toolkit.py

@@ -414,6 +414,22 @@ class JmcomicText:
         path = f'/media/albums/{cls.parse_to_jm_id(album_id)}{size}.jpg'
         return cls.format_url(path, image_domain)
 
+    @classmethod
+    def compare_versions(cls, v1: str, v2: str) -> int:
+        parts1 = list(map(int, v1.split(".")))
+        parts2 = list(map(int, v2.split(".")))
+
+        # 补齐长度
+        length = max(len(parts1), len(parts2))
+        parts1 += [0] * (length - len(parts1))
+        parts2 += [0] * (length - len(parts2))
+
+        if parts1 > parts2:
+            return 1  # v1 大
+        elif parts1 < parts2:
+            return -1  # v2 大
+        else:
+            return 0  # 相等
 
 # 支持dsl: #{???} -> os.getenv(???)
 JmcomicText.dsl_replacer.add_dsl_and_replacer(r'\$\{(.*?)\}', JmcomicText.match_os_env)

{jmcomic-2.6.10.dist-info → jmcomic-2.6.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jmcomic
-Version: 2.6.10
+Version: 2.6.12
 Summary: Python API For JMComic (禁漫天堂)
 Home-page: https://github.com/hect0x7/JMComic-Crawler-Python
 Author: hect0x7
@@ -56,17 +56,38 @@ Dynamic: home-page
 Dynamic: license-file
 Dynamic: requires-python
 
-# Python API For JMComic (禁漫天堂)
+<!-- 顶部标题 & 统计徽章 -->
+<div align="center">
+  <h1 style="margin-top: 0" align="center">Python API for JMComic</h1>
+  <p align="center">
+  <strong>提供 Python API 访问禁漫天堂（网页端 & 移动端），集成 GitHub Actions 下载器🚀</strong>
+  </p>
 
-本项目封装了一套可用于爬取JM的Python API.
+[![GitHub](https://img.shields.io/badge/-GitHub-181717?logo=github)](https://github.com/hect0x7)
+[![Stars](https://img.shields.io/github/stars/hect0x7/JMComic-Crawler-Python?color=orange&label=stars&style=flat)](https://github.com/hect0x7/JMComic-Crawler-Python/stargazers)
+[![Forks](https://img.shields.io/github/forks/hect0x7/JMComic-Crawler-Python?color=green&label=forks&style=flat)](https://github.com/hect0x7/JMComic-Crawler-Python/forks)
+[![GitHub latest releases](https://img.shields.io/github/v/release/hect0x7/JMComic-Crawler-Python?color=blue&label=version)](https://github.com/hect0x7/JMComic-Crawler-Python/releases/latest)
+[![PyPI - Downloads](https://img.shields.io/pypi/dm/jmcomic?style=flat&color=hotpink)](https://pepy.tech/projects/jmcomic)
+[![Licence](https://img.shields.io/github/license/hect0x7/JMComic-Crawler-Python?color=red)](https://github.com/hect0x7/JMComic-Crawler-Python)
 
-你可以通过简单的几行Python代码，实现下载JM上的本子到本地，并且是处理好的图片。
+</div>
+
+
+
+
+> 本项目封装了一套可用于爬取JM的Python API.
+> 
+> 你可以通过简单的几行Python代码，实现下载JM上的本子到本地，并且是处理好的图片。
+> 
+> **友情提示：珍爱JM，为了减轻JM的服务器压力，请不要一次性爬取太多本子，西门🙏🙏🙏**.
 
 [【指路】教程：使用GitHub Actions下载禁漫本子](./assets/docs/sources/tutorial/1_github_actions.md)
 
 [【指路】教程：导出并下载你的禁漫收藏夹数据](./assets/docs/sources/tutorial/10_export_favorites.md)
 
-**友情提示：珍爱JM，为了减轻JM的服务器压力，请不要一次性爬取太多本子，西门🙏🙏🙏**.
+
+![introduction.jpg](./assets/docs/sources/images/introduction.jpg)
+
 
 ## 项目介绍
 
@@ -105,11 +126,11 @@ Dynamic: requires-python
 
 ### 1. 下载本子方法
 
-只需要使用如下代码，就可以下载本子`JM422866`的所有章节的图片：
+只需要使用如下代码，就可以下载本子`JM123`的所有章节的图片：
 
 ```python
 import jmcomic  # 导入此模块，需要先安装.
-jmcomic.download_album('422866')  # 传入要下载的album的id，即可下载整个album到本地.
+jmcomic.download_album('123')  # 传入要下载的album的id，即可下载整个album到本地.
 ```
 
 上面的 `download_album`方法还有一个参数`option`，可用于控制下载配置，配置包括禁漫域名、网络代理、图片格式转换、插件等等。
@@ -138,8 +159,8 @@ import jmcomic
 # 创建配置对象
 option = jmcomic.create_option_by_file('你的配置文件路径，例如 D:/option.yml')
 # 使用option对象来下载本子
-jmcomic.download_album(422866, option)
-# 等价写法: option.download_album(422866)
+jmcomic.download_album(123, option)
+# 等价写法: option.download_album(123)
 ```
 
 ### 3. 使用命令行
@@ -149,10 +170,10 @@ jmcomic.download_album(422866, option)
 
 示例：
 
-下载本子422866的命令
+下载本子123的命令
 
 ```sh
-jmcomic 422866
+jmcomic 123
 ```
 同时下载本子123, 章节456的命令
 ```sh

jmcomic-2.6.12.dist-info/RECORD

@@ -0,0 +1,18 @@
+jmcomic/__init__.py,sha256=Z90UgMmwd4HWKcW4FphsyjxFyENruKi6YBAjaHJjBBk,903
+jmcomic/api.py,sha256=ZduhXDmh4lg1dkXHs7UTAaPpYNO7kcdPCDH5JJT9KSI,4253
+jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
+jmcomic/jm_client_impl.py,sha256=LOluQwHq4sI4XT-QepAP0NcnjuOpGUCxBBNtn2ohTyI,40939
+jmcomic/jm_client_interface.py,sha256=NMifOLLECBFkAICM3ykSBHla6Oagr36m6LF1oj8KtdU,20006
+jmcomic/jm_config.py,sha256=jN5Y-92zQALiKsylJDkNTnG6fSe8BC6OXTrIYiiHkQo,17336
+jmcomic/jm_downloader.py,sha256=azYkIN-1OuEivZ1TGGDaYo1FkcO5KatSb0g4GVdKSPY,11041
+jmcomic/jm_entity.py,sha256=ZyXVy3mOl9qkxlw6hyshVS3RR-yKfO5BkJHtyBAoKQE,20053
+jmcomic/jm_exception.py,sha256=x3KGMLlQS2zi1GX7z5G58zJN2EwLkI4mAURkxZYjEvA,5055
+jmcomic/jm_option.py,sha256=AaalEsfLCBAqbbxBCt8vZ_b6tI19RfdCNe5HeigSPe8,22061
+jmcomic/jm_plugin.py,sha256=9_EfTOVCk4ey1QQiKjYhFnd6j9XG-YM8rXiN21w-KrU,45374
+jmcomic/jm_toolkit.py,sha256=OsuqpA2zhoOz244MLA2lGxG9NH0Q8IkMH970hT4W37s,32727
+jmcomic-2.6.12.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.6.12.dist-info/METADATA,sha256=1Pb3PXAT2xRl8uLouVEDRwBVkXlqhbZxt98vMsU10rI,10810
+jmcomic-2.6.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jmcomic-2.6.12.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.6.12.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.6.12.dist-info/RECORD,,

jmcomic-2.6.10.dist-info/RECORD

@@ -1,18 +0,0 @@
-jmcomic/__init__.py,sha256=aF8prAr4WXYL4ENj4VguJAKEwTPHVLQ1vtOg6vlPGm8,903
-jmcomic/api.py,sha256=ZduhXDmh4lg1dkXHs7UTAaPpYNO7kcdPCDH5JJT9KSI,4253
-jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
-jmcomic/jm_client_impl.py,sha256=UpzqO3LD567U7ETs6SpSdCKQS4mvtbCbN6sVwU6DXxk,42301
-jmcomic/jm_client_interface.py,sha256=HJPmaY0xdSghPKuTh2CvVjlgJmoW1rubqjysHcOGDHQ,19701
-jmcomic/jm_config.py,sha256=y4YJebAKhMKt-oPGn6kahjKfZpAtzD4s6MSjSI8NYM4,17235
-jmcomic/jm_downloader.py,sha256=azYkIN-1OuEivZ1TGGDaYo1FkcO5KatSb0g4GVdKSPY,11041
-jmcomic/jm_entity.py,sha256=ZyXVy3mOl9qkxlw6hyshVS3RR-yKfO5BkJHtyBAoKQE,20053
-jmcomic/jm_exception.py,sha256=x3KGMLlQS2zi1GX7z5G58zJN2EwLkI4mAURkxZYjEvA,5055
-jmcomic/jm_option.py,sha256=k9trr4627evFV6t2vnpDC376uomUnKczSJFyAqF1UNo,22037
-jmcomic/jm_plugin.py,sha256=9_EfTOVCk4ey1QQiKjYhFnd6j9XG-YM8rXiN21w-KrU,45374
-jmcomic/jm_toolkit.py,sha256=6eKhqdSY2_gVjxzY_D1790B_xI_aG1kR4w3NMXJNoFk,32228
-jmcomic-2.6.10.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.6.10.dist-info/METADATA,sha256=0LeWCNRAFOGZ7L1t1ruAjo97xz07T97u1BzO3GAdm_A,9594
-jmcomic-2.6.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jmcomic-2.6.10.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.6.10.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.6.10.dist-info/RECORD,,