easyrip 4.9.0__tar.gz → 4.10.0__tar.gz

{easyrip-4.9.0 → easyrip-4.10.0}/PKG-INFO

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

{easyrip-4.9.0 → easyrip-4.10.0}/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.9.0 → easyrip-4.10.0}/easyrip/easyrip_log.py

@@ -397,8 +397,6 @@ class log:
             **fmt_kwargs,
         )
 
-    warn = warning
-
     @classmethod
     def error(
         cls,
@@ -428,8 +426,6 @@ class log:
             **fmt_kwargs,
         )
 
-    err = error
-
     @classmethod
     def send(
         cls,

{easyrip-4.9.0 → easyrip-4.10.0}/easyrip/global_val.py

@@ -3,7 +3,7 @@ import sys
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.9.0"
+PROJECT_VERSION = "4.10.0"
 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.9.0 → easyrip-4.10.0}/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,10 +1076,13 @@ class Ripper:
                             )
                         ):
                             soft_sub_list.append(Path(self.output_dir) / _file_basename)
+
                 else:
                     soft_sub_list = [Path(s) for s in soft_sub.split("?")]
 
                 subset_folder = Path(self.output_dir) / f"subset_temp_{temp_name}"
+                if not soft_sub_list:
+                    log.warning("-soft-sub is empty")
                 log.info("-soft-sub list = {}", soft_sub_list)
 
                 # 临时翻译

{easyrip-4.9.0 → easyrip-4.10.0}/easyrip/ripper/sub_and_font/ass.py

@@ -63,7 +63,7 @@ class Script_info:
 class Style_data:
     Name: str
     Fontname: str
-    Fontsize: int
+    Fontsize: float
     PrimaryColour: str
     SecondaryColour: str
     OutlineColour: str
@@ -212,7 +212,7 @@ class Styles:
             res = Style_data(
                 Name=style_tuple[self.fmt_index[Style_fmt_it.Name]],
                 Fontname=style_tuple[self.fmt_index[Style_fmt_it.Fontname]],
-                Fontsize=int(style_tuple[self.fmt_index[Style_fmt_it.Fontsize]]),
+                Fontsize=float(style_tuple[self.fmt_index[Style_fmt_it.Fontsize]]),
                 PrimaryColour=style_tuple[self.fmt_index[Style_fmt_it.PrimaryColour]],
                 SecondaryColour=style_tuple[
                     self.fmt_index[Style_fmt_it.SecondaryColour]
@@ -613,137 +613,149 @@ class Ass:
         new_unknown_data: Unknown_data | None = None
 
         for line in filter(bool, map(str.strip, read_text(path).splitlines())):
-            if line.startswith("[") and line.endswith("]"):
-                if new_unknown_data is not None:
-                    self.unknown_data.append(new_unknown_data)
-                    new_unknown_data = None
-
-                match head := line[1:-1]:
-                    case "Script Info":
-                        state = State.script_info
-                    case "V4+ Styles":
-                        state = State.styles
-                    case "Fonts":
-                        state = State.fonts
-                    case "Graphics":
-                        state = State.graphics
-                    case "Events":
-                        state = State.events
-                    case _:
-                        if bool(re.search(r"[a-z]", head)):
-                            state = State.unknown
-                            new_unknown_data = Unknown_data(head=head)
-
-            elif line.startswith("Format:"):
-                formats_tuple = tuple(map(str.strip, line[7:].split(",")))
-                match state:
-                    case State.styles:
-                        format_order = tuple(map(Style_fmt_it, formats_tuple))
-                        if len(format_order) != 23:
-                            raise Ass_generate_error("Style Format len != 23")
-
-                        self.styles.fmt_order = format_order
-
-                    case State.events:
-                        try:
-                            format_order = tuple(
-                                map(Event_fmt_it.__getitem__, formats_tuple)
-                            )
-                        except ValueError as e:
-                            raise Ass_generate_error from e
+            try:
+                if line.startswith("[") and line.endswith("]"):
+                    if new_unknown_data is not None:
+                        self.unknown_data.append(new_unknown_data)
+                        new_unknown_data = None
+
+                    match head := line[1:-1]:
+                        case "Script Info":
+                            state = State.script_info
+                        case "V4+ Styles":
+                            state = State.styles
+                        case "Fonts":
+                            state = State.fonts
+                        case "Graphics":
+                            state = State.graphics
+                        case "Events":
+                            state = State.events
+                        case _:
+                            if bool(re.search(r"[a-z]", head)):
+                                state = State.unknown
+                                new_unknown_data = Unknown_data(head=head)
+
+                elif line.startswith("Format:"):
+                    formats_tuple = tuple(map(str.strip, line[7:].split(",")))
+                    match state:
+                        case State.styles:
+                            format_order = tuple(map(Style_fmt_it, formats_tuple))
+                            if len(format_order) != 23:
+                                raise Ass_generate_error("Style Format len != 23")
+
+                            self.styles.fmt_order = format_order
+
+                        case State.events:
+                            try:
+                                format_order = tuple(
+                                    map(Event_fmt_it.__getitem__, formats_tuple)
+                                )
+                            except ValueError as e:
+                                raise Ass_generate_error from e
 
-                        if len(format_order) != 10:
-                            raise Ass_generate_error("Event Format len != 10")
+                            if len(format_order) != 10:
+                                raise Ass_generate_error("Event Format len != 10")
 
-                        if "Marked" in formats_tuple:
-                            log.error(
-                                "The ASS Events Format version too old: {}",
-                                "It used 'Marked' instead of 'Layer'. 'Marked' has been replaced with 'Layer', which will result in irreversible info loss",
-                            )
+                            if "Marked" in formats_tuple:
+                                log.error(
+                                    "The ASS Events Format version too old: {}",
+                                    "It used 'Marked' instead of 'Layer'. 'Marked' has been replaced with 'Layer', which will result in irreversible info loss",
+                                )
 
-                        self.events.fmt_order = format_order
+                            self.events.fmt_order = format_order
 
-            else:
-                match state:
-                    case State.script_info:
-                        self.script_info.data.append(Script_info_data(raw_str=line))
-
-                    case State.styles:
-                        if not line.startswith("Style:"):
-                            log.warning("Skip a Style line (illegal format): {}", line)
-                            continue
-
-                        style_tuple = tuple(map(str.strip, line[6:].split(",")))
-                        if len(style_tuple) != 23:
-                            log.warning(
-                                "Skip a Style line (Style Format len != 23): {}", line
-                            )
-                            continue
+                else:
+                    match state:
+                        case State.script_info:
+                            self.script_info.data.append(Script_info_data(raw_str=line))
+
+                        case State.styles:
+                            if not line.startswith("Style:"):
+                                log.warning(
+                                    "Skip a Style line (illegal format): {}", line
+                                )
+                                continue
+
+                            style_tuple = tuple(map(str.strip, line[6:].split(",")))
+                            if len(style_tuple) != 23:
+                                log.warning(
+                                    "Skip a Style line (Style Format len != 23): {}",
+                                    line,
+                                )
+                                continue
 
-                        self.styles.data.append(self.styles.new_data(style_tuple))
+                            self.styles.data.append(self.styles.new_data(style_tuple))
 
-                    case State.graphics:
-                        if line.startswith("filename:"):
-                            self.attachments.data.append(
-                                Attachment_data(
-                                    type=Attach_type.Graphics,
-                                    name=line[9:].strip(),
-                                    data="",
+                        case State.graphics:
+                            if line.startswith("filename:"):
+                                self.attachments.data.append(
+                                    Attachment_data(
+                                        type=Attach_type.Graphics,
+                                        name=line[9:].strip(),
+                                        data="",
+                                    )
+                                )
+                            else:
+                                if self.attachments.data[-1].data is None:
+                                    log.error("Unknown error", deep=True)
+                                    continue
+                                self.attachments.data[-1].data += line + "\n"
+
+                        case State.fonts:
+                            if line.startswith("fontname:"):
+                                self.attachments.data.append(
+                                    Attachment_data(
+                                        type=Attach_type.Fonts,
+                                        name=line[9:].strip(),
+                                        data="",
+                                    )
+                                )
+                            else:
+                                if self.attachments.data[-1].data is None:
+                                    log.error("Unknown error", deep=True)
+                                    continue
+                                self.attachments.data[-1].data += line + "\n"
+
+                        case State.events:
+                            event_type: Event_type
+                            if line.startswith("Dialogue:"):
+                                event_type = Event_type.Dialogue
+                            elif line.startswith("Comment:"):
+                                event_type = Event_type.Comment
+                            else:
+                                log.warning(
+                                    "Skip a Event line (illegal format): {}", line
                                 )
-                            )
-                        else:
-                            if self.attachments.data[-1].data is None:
-                                log.error("Unknown error", deep=True)
                                 continue
-                            self.attachments.data[-1].data += line + "\n"
-
-                    case State.fonts:
-                        if line.startswith("fontname:"):
-                            self.attachments.data.append(
-                                Attachment_data(
-                                    type=Attach_type.Fonts,
-                                    name=line[9:].strip(),
-                                    data="",
+
+                            event_tuple = tuple(
+                                map(
+                                    str.strip,
+                                    line.split(":", maxsplit=1)[1].split(
+                                        ",", maxsplit=9
+                                    ),
                                 )
                             )
-                        else:
-                            if self.attachments.data[-1].data is None:
-                                log.error("Unknown error", deep=True)
+                            if len(event_tuple) != 10:
+                                log.warning(
+                                    "Skip a Event line (Event Format len != 10): {}",
+                                    line,
+                                )
                                 continue
-                            self.attachments.data[-1].data += line + "\n"
-
-                    case State.events:
-                        event_type: Event_type
-                        if line.startswith("Dialogue:"):
-                            event_type = Event_type.Dialogue
-                        elif line.startswith("Comment:"):
-                            event_type = Event_type.Comment
-                        else:
-                            log.warning("Skip a Event line (illegal format): {}", line)
-                            continue
-
-                        event_tuple = tuple(
-                            map(
-                                str.strip,
-                                line.split(":", maxsplit=1)[1].split(",", maxsplit=9),
-                            )
-                        )
-                        if len(event_tuple) != 10:
-                            log.warning(
-                                "Skip a Event line (Event Format len != 10): {}", line
+
+                            self.events.data.append(
+                                self.events.new_data(event_tuple, event_type)
                             )
-                            continue
 
-                        self.events.data.append(
-                            self.events.new_data(event_tuple, event_type)
-                        )
+                        case State.unknown:
+                            if new_unknown_data is None:
+                                raise Ass_generate_error(
+                                    "Unknown error occurred when read line: {}", line
+                                )
+                            new_unknown_data.data.append(line)
 
-                    case State.unknown:
-                        if new_unknown_data is None:
-                            raise Ass_generate_error(
-                                "Unknown error occurred when read line: {}", line
-                            )
-                        new_unknown_data.data.append(line)
+            except Exception as e:
+                raise Ass_generate_error("Unkown error in line: {}", line) from e
 
         if new_unknown_data is not None:
             self.unknown_data.append(new_unknown_data)

{easyrip-4.9.0 → easyrip-4.10.0}/easyrip.egg-info/PKG-INFO

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

{easyrip-4.9.0 → easyrip-4.10.0}/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