v2.4.10: 更新禁漫APP版本号（1.6.3->1.6.4） (#182)

Author: hect0x7

src/jmcomic/__init__.py

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

src/jmcomic/jm_client_impl.py

@@ -748,6 +748,14 @@ def setting(self) -> JmApiResp:
         }
         """
         resp = self.req_api('/setting')
+
+        # 检查禁漫最新的版本号
+        setting_ver = str(resp.model_data.version)
+        # 禁漫接口的版本 > jmcomic库内置版本
+        if setting_ver > JmMagicConstants.APP_VERSION and JmModuleConfig.flag_use_version_newer_if_behind:
+            jm_log('api.setting', f'change APP_VERSION from [{JmMagicConstants.APP_VERSION}] to [{setting_ver}]')
+            JmMagicConstants.APP_VERSION = setting_ver
+
         return resp
 
     def login(self,

src/jmcomic/jm_client_interface.py

@@ -476,7 +476,8 @@ def get_html_domain_all(self, postman=None):
     # noinspection PyMethodMayBeStatic
     def do_page_iter(self, params: dict, page: int, get_page_method):
         from math import inf
-        def update(value: Union[Dict], page: int, page_content: JmPageContent):
+
+        def update(value: Optional[Dict], page: int, page_content: JmPageContent):
             if value is None:
                 return page + 1, page_content.page_count
 

src/jmcomic/jm_config.py

@@ -60,7 +60,7 @@ class JmMagicConstants:
     APP_TOKEN_SECRET = '18comicAPP'
     APP_TOKEN_SECRET_2 = '18comicAPPContent'
     APP_DATA_SECRET = '185Hcomic3PAPP7R'
-    APP_VERSION = '1.6.3'
+    APP_VERSION = '1.6.4'
     APP_HEADERS_TEMPLATE = {
         'Accept-Encoding': 'gzip',
         'user-agent': 'Mozilla/5.0 (Linux; Android 9; V1938CT Build/PQ3A.190705.09211555; wv) AppleWebKit/537.36 (KHTML, '
@@ -166,6 +166,8 @@ class JmModuleConfig:
     flag_enable_jm_log = True
     # log时解码url
     flag_decode_url_when_logging = True
+    # 当内置的版本号落后时，使用最新的禁漫app版本号
+    flag_use_version_newer_if_behind = False
 
     # 关联dir_rule的自定义字段与对应的处理函数
     # 例如:
@@ -282,7 +284,7 @@ def new_html_headers(cls, domain='18comic.vip'):
         return headers
 
     @classmethod
-    @field_cache("__fix_ts_token_tokenparam__")
+    @field_cache()
     def get_fix_ts_token_tokenparam(cls):
         ts = time_stamp()
         from .jm_toolkit import JmCryptoTool

src/jmcomic/jm_entity.py

@@ -636,7 +636,7 @@ def __init__(self, content, folder_list, total):
     def page_size(self) -> int:
         return JmMagicConstants.PAGE_SIZE_FAVORITE
 
-    def folder_id_name_iter(self) -> Generator[Tuple[str, str], None, None]:
+    def iter_folder_id_name(self) -> Generator[Tuple[str, str], None, None]:
         """
         用户文件夹的迭代器
         """

src/jmcomic/jm_option.py

@@ -253,10 +253,10 @@ def decide_image_save_dir(self, photo) -> str:
         return save_dir
 
     def decide_image_filepath(self, image: JmImageDetail, consider_custom_suffix=True) -> str:
-        # 通过拼接生成绝对路径
+        # 以此决定保存文件夹、后缀、不包含后缀的文件名
         save_dir = self.decide_image_save_dir(image.from_photo)
         suffix = self.decide_image_suffix(image) if consider_custom_suffix else image.img_file_suffix
-        return os.path.join(save_dir, self.decide_image_filename(image) + suffix)
+        return os.path.join(save_dir, fix_windir_name(self.decide_image_filename(image)) + suffix)
 
     def decide_download_cache(self, _image: JmImageDetail) -> bool:
         return self.download.cache

src/jmcomic/jm_toolkit.py

@@ -412,7 +412,6 @@ def parse_html_to_search_page(cls, html: str) -> JmSearchPage:
 
     @classmethod
     def parse_html_to_category_page(cls, html: str) -> JmSearchPage:
-        # 3. 提取结果
         content = []
         total = int(PatternTool.match_or_default(html, *cls.pattern_html_search_total))
 
@@ -429,7 +428,6 @@ def parse_html_to_category_page(cls, html: str) -> JmSearchPage:
 
         return JmSearchPage(content, total)
 
-
     @classmethod
     def parse_html_to_favorite_page(cls, html: str) -> JmFavoritePage:
         total = int(PatternTool.require_match(
@@ -893,8 +891,8 @@ class JmCryptoTool:
     @classmethod
     def token_and_tokenparam(cls,
                              ts,
-                             ver=JmMagicConstants.APP_VERSION,
-                             secret=JmMagicConstants.APP_TOKEN_SECRET,
+                             ver=None,
+                             secret=None,
                              ):
         """
         计算禁漫接口的请求headers的token和tokenparam
@@ -905,6 +903,12 @@ def token_and_tokenparam(cls,
         :return (token, tokenparam)
         """
 
+        if ver is None:
+            ver = JmMagicConstants.APP_VERSION
+
+        if secret is None:
+            secret = JmMagicConstants.APP_TOKEN_SECRET
+
         # tokenparam: 1700566805,1.6.3
         tokenparam = '{},{}'.format(ts, ver)
 
@@ -917,7 +921,7 @@ def token_and_tokenparam(cls,
     def decode_resp_data(cls,
                          data: str,
                          ts,
-                         secret=JmMagicConstants.APP_DATA_SECRET,
+                         secret=None,
                          ) -> str:
         """
         解密接口返回值
@@ -927,6 +931,9 @@ def decode_resp_data(cls,
         :param secret: 密钥
         :return: json格式的字符串
         """
+        if secret is None:
+            secret = JmMagicConstants.APP_DATA_SECRET
+
         # 1. base64解码
         import base64
         data_b64 = base64.b64decode(data)