polish code

Author: hect0x7

assets/option/option_test_api.yml

@@ -1,6 +1,7 @@
 # GitHub Actions 测试用
 # 移动端配置
 dir_rule:
+  normalize_zh: zh-cn
   rule: Bd_Aauthor_Aid_Pindextitle
 
 client:

src/jmcomic/jm_config.py

@@ -411,7 +411,7 @@ def new_postman(cls, session=False, **kwargs):
 
     DEFAULT_OPTION_DICT: dict = {
         'log': None,
-    'dir_rule': {'rule': 'Bd_Pname', 'base_dir': None, 'normalize_zh': 'zh-cn'},
+        'dir_rule': {'rule': 'Bd_Pname', 'base_dir': None, 'normalize_zh': 'zh-cn'},
         'download': {
             'cache': True,
             'image': {'decode': True, 'suffix': None},

src/jmcomic/jm_option.py

@@ -61,11 +61,11 @@ def enable_client_cache_on_condition(cls,
 class DirRule:
     RULE_BASE_DIR = 'Bd'
 
-    def __init__(self, rule: str, base_dir=None, normalize_zh='zh-cn'):
+    def __init__(self, rule: str, base_dir=None, normalize_zh=None):
         """
         :param rule: DSL rule
         :param base_dir: base directory
-        :param normalize_zh: 'zh-cn'|'zh-tw'|'none' or None. 控制是否以及如何进行繁简体归一化，默认 'zh-cn'
+        :param normalize_zh: 'zh-cn'|'zh-tw'| or None. 控制是否以及如何进行繁简体归一化，默认 None
         """
         base_dir = JmcomicText.parse_to_abspath(base_dir)
         self.base_dir = base_dir
@@ -95,17 +95,8 @@ def apply_rule_to_path(self, album, photo, only_album_rules=False) -> str:
                 jm_log('dir_rule', f'路径规则"{rule}"的解析出错: {e}, album={album}, photo={photo}')
                 raise e
             if parser != self.parse_bd_rule:
-                # 根据配置 normalize_zh 进行繁简体统一或跳过
-                try:
-                    target = getattr(self, 'normalize_zh', None)
-                    if target is None:
-                        # 默认为不转换
-                        conv_path = str(path)
-                    else:
-                        conv_path = JmcomicText.to_zh(str(path), target)
-                except Exception:
-                    conv_path = str(path)
-
+                # 根据配置 normalize_zh 进行繁简体统一
+                conv_path = JmcomicText.to_zh(str(path), self.normalize_zh)
                 path = fix_windir_name(conv_path).strip()
 
             path_ls.append(path)

src/jmcomic/jm_toolkit.py

@@ -333,7 +333,7 @@ def to_zh_cn(cls, s):
         return cls.to_zh(s, 'zh-cn')
 
     @classmethod
-    def to_zh(cls, s, target='zh-cn'):
+    def to_zh(cls, s, target=None):
         """
         通用的繁简体转换接口。
 
@@ -347,15 +347,12 @@ def to_zh(cls, s, target='zh-cn'):
         if target is None:
             return s
 
-        t = str(target).strip().lower()
-        if t in ('none', ''):
-            return s
-
         try:
             import zhconv
-            return zhconv.convert(s, t)
-        except Exception:
+            return zhconv.convert(s, target)
+        except Exception as e:
             # 如果 zhconv 不可用或转换失败，则回退原字符串
+            jm_log('zhconv.error', f'error: [{e}], s: [{s}]')
             return s
 
     @classmethod