easyrip 4.8.0__tar.gz → 4.8.2__tar.gz

{easyrip-4.8.0 → easyrip-4.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyrip
-Version: 4.8.0
+Version: 4.8.2
 Author: op200
 License-Expression: AGPL-3.0-or-later
 Project-URL: Homepage, https://github.com/op200/EasyRip

{easyrip-4.8.0 → easyrip-4.8.2}/easyrip/easyrip_command.py

@@ -393,7 +393,7 @@ class Opt_type(enum.Enum):
             "'auto:...' can only select which match infix.\n"
             "  e.g. 'auto:zh-Hans:zh-Hant'"
         ),
-        childs=(Cmd_type_val(("atuo",)),),
+        childs=(Cmd_type_val(("auto",)),),
     )
     _only_mux_sub_path = Cmd_type_val(
         ("-only-mux-sub-path",),
@@ -407,7 +407,7 @@ class Opt_type(enum.Enum):
             "Mux ASS subtitles in MKV with subset\n"  # .
             "The usage of 'auto' is detailed in '-sub'"
         ),
-        childs=(Cmd_type_val(("atuo",)),),
+        childs=(Cmd_type_val(("auto",)),),
     )
     _subset_font_dir = Cmd_type_val(
         ("-subset-font-dir",),
@@ -515,7 +515,7 @@ class Opt_type(enum.Enum):
             "Setting FPS when muxing\n"
             "When using auto, the frame rate is automatically obtained from the input video and adsorbed to the nearest preset point"
         ),
-        childs=(Cmd_type_val(("atuo",)),),
+        childs=(Cmd_type_val(("auto",)),),
     )
     _chapters = Cmd_type_val(
         ("-chapters",),

{easyrip-4.8.0 → easyrip-4.8.2}/easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -329,6 +329,7 @@ LANG_MAP: dict[str, str] = {
     "Subset faild, cancel mux": "子集化失败, 取消混流",
     "FFmpeg report: {}": "FFmpeg 报告: {}",
     "{} not found. Skip it": "没找到 {}。默认跳过",
+    "{} not found. Skip it. Perhaps you want the {}": "没找到 {}。默认跳过。或许你想要的是 {}",
     'The font "{}" does not contain these characters: {}': '字体 "{}" 不包含字符: {}',
     "The style '{}' not in Styles. Defaulting to the style '{}'": "样式 '{}' 不在 Styles 中。默认使用样式 '{}'",
     "The style '{}' and the style 'Default' not in Styles. Defaulting to no font": "样式 '{}' 和样式 'Default' 都不在 Styles 中。默认不使用字体",

{easyrip-4.8.0 → easyrip-4.8.2}/easyrip/global_val.py

@@ -3,7 +3,7 @@ import sys
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.8.0"
+PROJECT_VERSION = "4.8.2"
 PROJECT_TITLE = f"{PROJECT_NAME} v{PROJECT_VERSION}"
 PROJECT_URL = "https://github.com/op200/EasyRip"
 PROJECT_RELEASE_API = "https://api.github.com/repos/op200/EasyRip/releases/latest"

{easyrip-4.8.0 → easyrip-4.8.2}/easyrip/ripper/sub_and_font/subset.py

@@ -287,10 +287,11 @@ def subset(
         fonts.extend(load_windows_fonts(strict=strict))
 
     font_sign__font: dict[tuple[str, Font_type], Font] = {}
+    family_lower__family = {}  # 存储小写 family 用于判断 ASS 的大小写不敏感语法
     for _font in fonts:
         for family in _font.familys:
-            if family not in font_sign__font:
-                font_sign__font[(family, _font.font_type)] = _font
+            family_lower__family[family.lower()] = family
+            font_sign__font[(family, _font.font_type)] = _font
 
     # 子集化映射
     font__subset_str: dict[Font, dict[str, str]] = {}
@@ -335,11 +336,19 @@ def subset(
 
             # 模糊字重也找不到字体
             if _font is None:
-                log.error(
-                    "{} not found. Skip it",
-                    f"( {key[0]} / {key[1].name} )",
-                    deep=strict,
-                )
+                if (_f_low := key[0].lower()) in family_lower__family:
+                    log.error(
+                        "{} not found. Skip it. Perhaps you want the {}",
+                        f"( {key[0]} / {key[1].name} )",
+                        f"'{family_lower__family[_f_low]}'",
+                        deep=strict,
+                    )
+                else:
+                    log.error(
+                        "{} not found. Skip it",
+                        f"( {key[0]} / {key[1].name} )",
+                        deep=strict,
+                    )
                 return_res = False
                 continue
 

{easyrip-4.8.0 → easyrip-4.8.2}/easyrip.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyrip
-Version: 4.8.0
+Version: 4.8.2
 Author: op200
 License-Expression: AGPL-3.0-or-later
 Project-URL: Homepage, https://github.com/op200/EasyRip