From 746650e0c35b0a206e6f9f41391b35d27ca07689 Mon Sep 17 00:00:00 2001 From: hect0x7 <93357912+hect0x7@users.noreply.github.com> Date: Thu, 3 Apr 2025 00:43:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?v2.5.33:=20=E6=9B=B4=E6=96=B0=E7=A6=81?= =?UTF-8?q?=E6=BC=ABAPI=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmcomic/__init__.py | 2 +- src/jmcomic/jm_config.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jmcomic/__init__.py b/src/jmcomic/__init__.py index 73242a8c2..9b5a0ac2c 100644 --- a/src/jmcomic/__init__.py +++ b/src/jmcomic/__init__.py @@ -2,7 +2,7 @@ # 被依赖方 <--- 使用方 # config <--- entity <--- toolkit <--- client <--- option <--- downloader -__version__ = '2.5.32' +__version__ = '2.5.33' from .api import * from .jm_plugin import * diff --git a/src/jmcomic/jm_config.py b/src/jmcomic/jm_config.py index c1c867b95..b920a18ee 100644 --- a/src/jmcomic/jm_config.py +++ b/src/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.8' + 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 = { From 1ff1f3389f3c98e4ecc61237e0b7bfacdd34f3ac Mon Sep 17 00:00:00 2001 From: hect0x7 <93357912+hect0x7@users.noreply.github.com> Date: Thu, 3 Apr 2025 01:06:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95case=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmcomic/jm_plugin.py | 2 +- src/jmcomic/jm_toolkit.py | 2 +- tests/test_jmcomic/test_jm_client.py | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/jmcomic/jm_plugin.py b/src/jmcomic/jm_plugin.py index 44ef6fff2..9f8c8618d 100644 --- a/src/jmcomic/jm_plugin.py +++ b/src/jmcomic/jm_plugin.py @@ -319,7 +319,7 @@ 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 + else downloader.download_success_dict[photo.from_album] # after_photo ) def zip_photo(self, photo, image_list: list, zip_path: str, path_to_delete): diff --git a/src/jmcomic/jm_toolkit.py b/src/jmcomic/jm_toolkit.py index c6038806c..7602afb3a 100644 --- a/src/jmcomic/jm_toolkit.py +++ b/src/jmcomic/jm_toolkit.py @@ -317,7 +317,7 @@ def find_right_pair(left_pair, i): @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): diff --git a/tests/test_jmcomic/test_jm_client.py b/tests/test_jmcomic/test_jm_client.py index 83134e871..c3c76be8c 100644 --- a/tests/test_jmcomic/test_jm_client.py +++ b/tests/test_jmcomic/test_jm_client.py @@ -55,7 +55,10 @@ def test_detail_property_list(self): ] for pair in ans: - self.assertListEqual(pair[0][0:9], pair[1][0:9]) + left = pair[0][0:9] + right = pair[1][0:9] + for i, ans in enumerate(right): + self.assertEqual(JmcomicText.to_zh_cn(left[i]), JmcomicText.to_zh_cn(ans)) def test_photo_sort(self): client = self.option.build_jm_client()