easyrip 4.8.1__py3-none-any.whl → 4.8.2__py3-none-any.whl

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/global_val.py

@@ -3,7 +3,7 @@ import sys
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.8.1"
+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/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.1.dist-info → easyrip-4.8.2.dist-info}/METADATA

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

{easyrip-4.8.1.dist-info → easyrip-4.8.2.dist-info}/RECORD

@@ -4,14 +4,14 @@ easyrip/easyrip_command.py,sha256=X9_8t9Sxl1-gILpsQ5PueCwozTQgjgL2cImzOZ6pO7w,27
 easyrip/easyrip_log.py,sha256=i5r3OPGQ55c3_zCN0fmriPXiWxibq-w35FbNT7VfuuM,15610
 easyrip/easyrip_main.py,sha256=rP67eBcIBMVX8kXHQMWUhQsy-aXsnon4TbOzshx00nw,44691
 easyrip/easyrip_prompt.py,sha256=A5S7ybeJSGFkCmwdJ9TCQ_-lde7NWgkbFytZ2KnvkWI,2145
-easyrip/global_val.py,sha256=zKSrQg0Sata9X6CcHpcGK5dhAhuYCPXpIn2yYBrXGAU,773
+easyrip/global_val.py,sha256=WNBFg0JkzYQo4w12xsjiCLjVJTl9-oqxqFMm3qHJTaw,773
 easyrip/utils.py,sha256=N1rMF1MyoC-YFBgy10_u29cFoowfhR-5Viea93O7wQ4,8750
 easyrip/easyrip_config/config.py,sha256=aj6Vg1rJkvICSTZ0ZONznR_MkvVr5u5ngkX_zfZopvU,9859
 easyrip/easyrip_config/config_key.py,sha256=_jjdKOunskUoG7UUWOz3QZK-s4LF_x6hmM9MKttyS2Q,766
 easyrip/easyrip_mlang/__init__.py,sha256=QHZt4BYJFkJuaPkN89pt_zkM2grifJakyRZbeyfH8f4,1893
 easyrip/easyrip_mlang/global_lang_val.py,sha256=Un20KGMVVMQbOaV_7VaHg3E1dvK2Y7kI1cPzq_sFWKY,9984
 easyrip/easyrip_mlang/lang_en.py,sha256=heUSPeVtY1Nf9eDhrjPM28N3PLsu62op3llbXAfXvAs,140
-easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=zJ9z5dW8yZdg6VWUMw3e7VNFjn_NoMhk9lK-PZLrPSo,18530
+easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=N--5dJI9FS3bjZkVVI5htNBvOprvAtkIYjNoTTlvn-Y,18642
 easyrip/easyrip_mlang/translator.py,sha256=Vg0S0p2rpMNAy3LHTdK7qKFdkPEXlOoCCXcaH7PyAC4,5939
 easyrip/easyrip_web/__init__.py,sha256=tMyEeaSGeEJjND7MF0MBv9aDiDgaO3MOnppwxA70U2c,177
 easyrip/easyrip_web/http_server.py,sha256=iyulCAFQrJlz86Lrr-Dm3fhOnNCf79Bp6fVHhr0ephY,8350
@@ -22,10 +22,10 @@ easyrip/ripper/ripper.py,sha256=k00oHGk9X3ciJ8KzHa_jaHlTy5EXfdnJy9u0iSL3ia8,5034
 easyrip/ripper/sub_and_font/__init__.py,sha256=cBT7mxL7RRFaJXFPXuZ7RT-YK6FbnanaU5v6U9BOquw,153
 easyrip/ripper/sub_and_font/ass.py,sha256=eGi1eIDWAV1Ti_BYIAcAMwrAlXJ5f_zGYte3nNu4PeE,25532
 easyrip/ripper/sub_and_font/font.py,sha256=DBtTi32deXES1ylZiZ0qzcv9zvRQRIYBAH9Zbwij3G0,8086
-easyrip/ripper/sub_and_font/subset.py,sha256=VsFYTFuVWXW9ltkqWZIiwOIh-nGDKmW1tUv3oi5kpWw,17815
-easyrip-4.8.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-easyrip-4.8.1.dist-info/METADATA,sha256=dh80xbE407kcu4GVmpWgs6JAqXVLgJDNSA_NyC48BGE,3506
-easyrip-4.8.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-easyrip-4.8.1.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
-easyrip-4.8.1.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
-easyrip-4.8.1.dist-info/RECORD,,
+easyrip/ripper/sub_and_font/subset.py,sha256=ZVqTgmgW7RmJ-s0F0aqJntmPpXeE6rTk6RlbfUj6Ql8,18316
+easyrip-4.8.2.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+easyrip-4.8.2.dist-info/METADATA,sha256=Pmof2zfcwxc7Z2fZRVvV2vb34PNpEexG3RfZaZNJ4rc,3506
+easyrip-4.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+easyrip-4.8.2.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
+easyrip-4.8.2.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
+easyrip-4.8.2.dist-info/RECORD,,