Merge branch 'hect0x7:master' into master

Author: Greeay7

src/jmcomic/__init__.py

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

src/jmcomic/jm_client_impl.py

@@ -709,6 +709,9 @@ def fetch_detail_entity(self, jmid, clazz):
             })
         )
 
+        if resp.res_data.get('name') is None:
+            ExceptionTool.raise_missing(resp, jmid)
+
         return JmApiAdaptTool.parse_entity(resp.res_data, clazz)
 
     def fetch_scramble_id(self, photo_id):

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.5'
+    APP_VERSION = '1.7.6'
 
 
 # 模块级别共用配置

src/jmcomic/jm_entity.py

@@ -443,7 +443,7 @@ def __init__(self,
         super().__init__()
         self.album_id: str = str(album_id)
         self.scramble_id: str = str(scramble_id)
-        self.name: str = name
+        self.name: str = str(name).strip()
         self.page_count: int = int(page_count)  # 总页数
         self.pub_date: str = pub_date  # 发布日期
         self.update_date: str = update_date  # 更新日期

src/jmcomic/jm_option.py

@@ -159,7 +159,7 @@ def get_rule_solver(cls, rule: str) -> Optional[RuleSolver]:
             return None
 
         def solve_func(detail):
-            return fix_windir_name(str(DetailEntity.get_dirname(detail, rule[1:])))
+            return fix_windir_name(str(DetailEntity.get_dirname(detail, rule[1:]))).strip()
 
         return rule[0], solve_func, rule
 

src/jmcomic/jm_toolkit.py

@@ -25,7 +25,7 @@ class JmcomicText:
     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'<h1 class="book-name" id="book-name">([\s\S]*?)</h1>')
-    pattern_html_album_episode_list = compile(r'data-album="(\d+)"\s*?>\s*?<li.*?>\s*?第(\d+)話([\s\S]*?)<[\s\S]*?>(\d+-\d+-\d+).*?')
+    pattern_html_album_episode_list = compile(r'data-album="(\d+)"[^>]*>\s*?<li.*?>\s*?第(\d+)話([\s\S]*?)<[\s\S]*?>(\d+-\d+-\d+).*?')
     pattern_html_album_page_count = compile(r'<span class="pagecount">.*?:(\d+)</span>')
     pattern_html_album_pub_date = compile(r'>上架日期 : (.*?)</span>')
     pattern_html_album_update_date = compile(r'>更新日期 : (.*?)</span>')
@@ -329,7 +329,8 @@ def try_mkdir(cls, save_dir: str):
                 limit = JmModuleConfig.VAR_FILE_NAME_LENGTH_LIMIT
                 jm_log('error', f'目录名过长，无法创建目录，强制缩短到{limit}个字符并重试')
                 save_dir = save_dir[0:limit]
-                mkdir_if_not_exists(save_dir)
+                return cls.try_mkdir(save_dir)
+            raise e
         return save_dir