easyrip 4.8.2__tar.gz → 4.9.1__tar.gz

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

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

{easyrip-4.8.2 → easyrip-4.9.1}/easyrip/__main__.py

@@ -1,6 +1,6 @@
 import sys
-from collections.abc import Iterable
-from typing import NoReturn
+from collections.abc import Coroutine, Iterable
+from typing import Any, NoReturn
 
 import Crypto
 import fontTools
@@ -8,7 +8,9 @@ import prompt_toolkit
 from prompt_toolkit import ANSI, prompt
 from prompt_toolkit.completion import merge_completers
 from prompt_toolkit.history import InMemoryHistory
+from prompt_toolkit.input.ansi_escape_sequences import ANSI_SEQUENCES
 from prompt_toolkit.key_binding import KeyBindings, KeyPressEvent
+from prompt_toolkit.key_binding.bindings import named_commands
 from prompt_toolkit.keys import Keys
 
 from .easyrip_command import (
@@ -48,6 +50,14 @@ def run() -> NoReturn:
     def _(event: KeyPressEvent) -> None:
         event.app.current_buffer.insert_text(C_D)
 
+    ANSI_SEQUENCES["\x08"] = Keys.F24
+
+    @key_bindings.add(Keys.F24)
+    def _(
+        event: KeyPressEvent,
+    ) -> object | Coroutine[Any, Any, object]:
+        return named_commands.get_by_name("unix-word-rubout").handler(event)
+
     path_completer = SmartPathCompleter()
 
     def _ctv_to_nc(ctvs: Iterable[Cmd_type_val]) -> CmdCompleter:

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

@@ -3,7 +3,7 @@ import sys
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.8.2"
+PROJECT_VERSION = "4.9.1"
 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.2 → easyrip-4.9.1}/easyrip/ripper/ripper.py

@@ -1051,6 +1051,7 @@ class Ripper:
                 # 处理 soft-sub
                 soft_sub_list: list[Path]
                 soft_sub_map_list: list[str] = soft_sub.split(":")
+
                 if soft_sub_map_list[0] == "auto":
                     soft_sub_list = []
 
@@ -1075,6 +1076,7 @@ class Ripper:
                             )
                         ):
                             soft_sub_list.append(Path(self.output_dir) / _file_basename)
+
                 else:
                     soft_sub_list = [Path(s) for s in soft_sub.split("?")]
 

{easyrip-4.8.2 → easyrip-4.9.1}/easyrip/ripper/sub_and_font/font.py

@@ -190,17 +190,8 @@ def subset_font(font: Font, subset_str: str, affix: str) -> tuple[TTFont, bool]:
 
     # 创建子集化选项
     options = subset.Options()
-    options.drop_tables = ["DSIG", "PCLT", "EBDT", "EBSC"]  # 不移除任何可能有用的表
     options.hinting = True  # 保留 hinting
     options.name_IDs = []  # 不保留 name 表记录
-    options.no_subset_tables = subset.Options._no_subset_tables_default + [
-        "BASE",
-        "mort",
-    ]
-    # options.drop_tables = []
-    options.name_legacy = True
-    # options.retain_gids = True
-    options.layout_features = ["*"]
 
     # 创建子集化器
     subsetter = subset.Subsetter(options=options)

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

@@ -133,6 +133,7 @@ def subset(
             current_font_sign: tuple[str, Font_type] = default_font_sign
             for is_tag, text in Event_data.parse_text(event.Text, use_libass_spec):
                 if is_tag:
+                    tag_fn_org: str | None = None
                     tag_fn: str | None = None
                     tag_bold: str | None = None
                     tag_italic: str | None = None
@@ -151,7 +152,7 @@ def subset(
 
                         match tag:
                             case "fn":
-                                tag_fn = proc_value
+                                tag_fn_org, tag_fn = value, proc_value
                             case "b":
                                 tag_bold = proc_value
                             case "i":
@@ -183,7 +184,7 @@ def subset(
 
                                 # 修改
                                 text = text.replace(
-                                    f"\\fn{tag_fn}",
+                                    f"\\fn{tag_fn_org}",
                                     f"\\fn{'@' if _is_vertical else ''}{get_font_new_name(new_fontname)}",
                                 )
 
@@ -309,44 +310,49 @@ def subset(
                 case Font_type.Regular:
                     if (
                         (_k := (key[0], Font_type.Bold)) in font_sign__font
-                        or (_k := (key[0], Font_type.Bold_Italic)) in font_sign__font
                         or (_k := (key[0], Font_type.Italic)) in font_sign__font
+                        or (_k := (key[0], Font_type.Bold_Italic)) in font_sign__font
                     ):
                         _font = font_sign__font[_k]
 
                 case Font_type.Bold:
                     if (
-                        (_k := (key[0], Font_type.Bold_Italic)) in font_sign__font
-                        or (_k := (key[0], Font_type.Regular)) in font_sign__font
+                        (_k := (key[0], Font_type.Regular)) in font_sign__font
+                        or (_k := (key[0], Font_type.Bold_Italic)) in font_sign__font
                         or (_k := (key[0], Font_type.Italic)) in font_sign__font
                     ):
                         _font = font_sign__font[_k]
 
                 case Font_type.Italic:
-                    if (_k := (key[0], Font_type.Regular)) in font_sign__font or (
-                        _k := (key[0], Font_type.Bold)
-                    ) in font_sign__font:
+                    if (
+                        (_k := (key[0], Font_type.Regular)) in font_sign__font
+                        or (_k := (key[0], Font_type.Bold_Italic)) in font_sign__font
+                        or (_k := (key[0], Font_type.Bold)) in font_sign__font
+                    ):
                         _font = font_sign__font[_k]
 
                 case Font_type.Bold_Italic:
-                    if (_k := (key[0], Font_type.Bold)) in font_sign__font or (
-                        _k := (key[0], Font_type.Regular)
-                    ) in font_sign__font:
+                    if (
+                        (_k := (key[0], Font_type.Bold)) in font_sign__font
+                        or (_k := (key[0], Font_type.Italic)) in font_sign__font
+                        or (_k := (key[0], Font_type.Regular)) in font_sign__font
+                    ):
                         _font = font_sign__font[_k]
 
             # 模糊字重也找不到字体
             if _font is None:
+                _want_font_sign_str = f"( {key[0]} / {key[1].name} )"
                 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} )",
+                        _want_font_sign_str,
                         f"'{family_lower__family[_f_low]}'",
                         deep=strict,
                     )
                 else:
                     log.error(
                         "{} not found. Skip it",
-                        f"( {key[0]} / {key[1].name} )",
+                        _want_font_sign_str,
                         deep=strict,
                     )
                 return_res = False

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

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

{easyrip-4.8.2 → easyrip-4.9.1}/easyrip/easyrip_main.py

@@ -37,8 +37,8 @@ from .easyrip_mlang import (
 )
 from .easyrip_prompt import easyrip_prompt
 from .ripper.media_info import Media_info
-from .ripper.ripper import Ripper
 from .ripper.param import DEFAULT_PRESET_PARAMS, PRESET_OPT_NAME
+from .ripper.ripper import Ripper
 from .ripper.sub_and_font import load_fonts
 from .utils import change_title, check_ver, read_text