easyrip 4.3.3__py3-none-any.whl → 4.9.1__py3-none-any.whl

easyrip/__init__.py

@@ -14,10 +14,13 @@ from .easyrip_mlang import (
     Lang_tag_region,
     Lang_tag_script,
 )
-from .ripper import Ass, Media_info, Ripper
+from .ripper.media_info import Media_info
+from .ripper.ripper import Ripper
+from .ripper.sub_and_font import Ass, Font, load_fonts
 
 __all__ = [
     "Ass",
+    "Font",
     "Global_lang_val",
     "Lang_tag",
     "Lang_tag_language",
@@ -30,6 +33,7 @@ __all__ = [
     "gettext",
     "global_val",
     "init",
+    "load_fonts",
     "log",
     "run_command",
 ]

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:
@@ -64,6 +74,7 @@ def run() -> NoReturn:
                                 in {
                                     *Cmd_type.cd.value.names,
                                     *Cmd_type.mediainfo.value.names,
+                                    *Cmd_type.fontinfo.value.names,
                                 }
                                 else ()
                             ),
@@ -102,7 +113,7 @@ def run() -> NoReturn:
     cmd_ctv_tuple = tuple(ct.value for ct in Cmd_type if ct != Cmd_type.Option)
     prompt_history = (
         ConfigFileHistory(easyrip_prompt.PROMPT_HISTORY_FILE)
-        if config.get_user_profile(Config_key.prompt_history_save_file)
+        if config.get_user_profile(Config_key.save_prompt_history)
         else InMemoryHistory()
     )
 
@@ -128,8 +139,11 @@ def run() -> NoReturn:
             log.debug("Manually force exit")
             sys.exit(0)
 
-        if not run_command(command):
-            log.warning("Stop run command")
+        try:
+            if not run_command(command):
+                log.warning("Stop run command")
+        except KeyboardInterrupt:
+            log.warning("Manually stop run command")
 
 
 if __name__ == "__main__":

easyrip/easyrip_command.py

@@ -19,6 +19,7 @@ from prompt_toolkit.document import Document
 
 from . import global_val
 from .easyrip_config.config_key import Config_key
+from .ripper.param import Audio_codec, Preset_name
 
 
 @final
@@ -243,7 +244,7 @@ class Cmd_type(enum.Enum):
             Cmd_type_val(("list",)),
             Cmd_type_val(
                 ("set",),
-                childs=tuple(Cmd_type_val((k,)) for k in Config_key._value2member_map_),
+                childs=tuple(Cmd_type_val((k,)) for k in Config_key._member_map_),
             ),
         ),
     )
@@ -279,6 +280,15 @@ class Cmd_type(enum.Enum):
             Cmd_type_val(("cfd",)),
         ),
     )
+    fontinfo = Cmd_type_val(
+        ("fontinfo",),
+        param="<<path> | 'fd' | 'cfd'>",
+        description="Get the font info by the Font class",
+        childs=(
+            Cmd_type_val(("fd",)),
+            Cmd_type_val(("cfd",)),
+        ),
+    )
     Option = Cmd_type_val(
         ("Option",),
         param="...",
@@ -344,48 +354,10 @@ class Opt_type(enum.Enum):
         param="<string>",
         description=(
             "Setting preset\n"
-            "Preset name:\n"
-            "  custom\n"
-            "  subset\n"
-            "  copy\n"
-            "  flac\n"
-            "  x264fast x264slow\n"
-            "  x265fast4 x265fast3 x265fast2 x265fast x265slow x265full\n"
-            "  svtav1\n"
-            "  vvenc\n"
-            "  h264_qsv h264_nvenc h264_amf\n"
-            "  hevc_qsv hevc_nvenc hevc_amf\n"
-            "  av1_qsv av1_nvenc av1_amf"
-        ),
-        childs=(
-            Cmd_type_val(
-                (
-                    "custom",
-                    "subset",
-                    "copy",
-                    "flac",
-                    "x264fast",
-                    "x264slow",
-                    "x265fast4",
-                    "x265fast3",
-                    "x265fast2",
-                    "x265fast",
-                    "x265slow",
-                    "x265full",
-                    "svtav1",
-                    "vvenc",
-                    "h264_qsv",
-                    "h264_nvenc",
-                    "h264_amf",
-                    "hevc_qsv",
-                    "hevc_nvenc",
-                    "hevc_amf",
-                    "av1_qsv",
-                    "av1_nvenc",
-                    "av1_amf",
-                )
-            ),
+            "Preset name:\n"  # .
+            f"{Preset_name.to_help_string('  ')}"
         ),
+        childs=(Cmd_type_val(tuple(Preset_name._value2member_map_)),),
     )
     _pipe = Cmd_type_val(
         ("-pipe",),
@@ -421,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",),
@@ -435,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,13 +487,10 @@ class Opt_type(enum.Enum):
         param="<string>",
         description=(
             "Setting audio encoder\n"
-            " \n"  # .
-            "Audio encoder:\n"
-            "  copy\n"
-            "  libopus\n"
-            "  flac"
+            "Audio encoder:\n"  # .
+            f"{Audio_codec.to_help_string('  ')}"
         ),
-        childs=(Cmd_type_val(("copy", "libopus", "flac")),),
+        childs=(Cmd_type_val(tuple(Audio_codec._value2member_map_)),),
     )
     _b_a = Cmd_type_val(
         ("-b:a",),
@@ -546,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/easyrip_config/config.py

@@ -1,23 +1,30 @@
 import json
 import os
 from pathlib import Path
+from typing import Literal, get_origin, overload
 
 from ..easyrip_log import log
 from ..easyrip_mlang import all_supported_lang_map, gettext
 from ..global_val import CONFIG_DIR
-from .config_key import CONFIG_VERSION, Config_key
+from ..utils import type_match
+from .config_key import CONFIG_TYPE_DICT, CONFIG_VERSION, Config_key
 
-CONFIG_DEFAULT_DICT: dict[Config_key, str | bool] = {
+CONFIG_DEFAULT_DICT: dict[Config_key, str | bool | list[str]] = {
     Config_key.language: "auto",
     Config_key.check_update: True,
     Config_key.check_dependent: True,
-    Config_key.startup_directory: "",
+    Config_key.startup_dir: "",
+    Config_key.startup_dir_blacklist: [],
     Config_key.force_log_file_path: "",
     Config_key.log_print_level: log.LogLevel.send.name,
     Config_key.log_write_level: log.LogLevel.send.name,
-    Config_key.prompt_history_save_file: True,
+    Config_key.save_prompt_history: True,
 }
 
+assert all(k in CONFIG_DEFAULT_DICT for k in Config_key), [
+    k.name for k in Config_key if k not in CONFIG_DEFAULT_DICT
+]
+
 
 class config:
     _config_dir: Path
@@ -32,8 +39,8 @@ class config:
         if not cls._config_file.is_file():
             cls._config_dir.mkdir(exist_ok=True)
             with cls._config_file.open("wt", encoding="utf-8", newline="\n") as f:
-                config_default_dict: dict[str, str | bool] = {
-                    k.value: v for k, v in CONFIG_DEFAULT_DICT.items()
+                config_default_dict: dict[str, str | bool | list[str]] = {
+                    k.name: v for k, v in CONFIG_DEFAULT_DICT.items()
                 }
                 json.dump(
                     {
@@ -104,7 +111,11 @@ class config:
             return True
 
     @classmethod
-    def set_user_profile(cls, key: str, val: str | int | float | bool) -> bool:
+    def set_user_profile(
+        cls,
+        key: str,
+        val: str | bool | list[str],
+    ) -> bool:
         if cls._config is None and not cls._read_config():
             return False
 
@@ -113,21 +124,71 @@ class config:
             return False
 
         if "user_profile" not in cls._config:
-            log.error("User profile is not found in config")
+            log.error("User profile is not found in config file")
             return False
 
-        if key in Config_key:
+        if key in Config_key._member_map_:
+            need_type = CONFIG_TYPE_DICT[Config_key[key]]
+            if not type_match(val, need_type):
+                log.error(
+                    "Type mismatch: need '{}'",
+                    need_type if get_origin(need_type) else need_type.__name__,
+                )
+                return False
             cls._config["user_profile"][key] = val
         else:
             log.error("Key '{}' is not found in user profile", key)
             return False
         return cls._write_config()
 
+    @overload
+    @classmethod
+    def get_user_profile(
+        cls,
+        config_key: Literal[
+            Config_key.language,
+            Config_key.startup_dir,
+            Config_key.force_log_file_path,
+            Config_key.log_print_level,
+            Config_key.log_write_level,
+        ],
+    ) -> str | None: ...
+
+    @overload
+    @classmethod
+    def get_user_profile(
+        cls,
+        config_key: Literal[
+            Config_key.check_update,
+            Config_key.check_dependent,
+            Config_key.save_prompt_history,
+        ],
+    ) -> bool | None: ...
+
+    @overload
     @classmethod
     def get_user_profile(
-        cls, config_key: Config_key | str
-    ) -> str | int | float | bool | None:
-        key = config_key.value if isinstance(config_key, Config_key) else config_key
+        cls,
+        config_key: Literal[Config_key.startup_dir_blacklist],
+    ) -> list[str] | None: ...
+
+    @overload
+    @classmethod
+    def get_user_profile(
+        cls,
+        config_key: str,
+    ) -> str | bool | list[str] | None: ...
+
+    @classmethod
+    def get_user_profile(
+        cls,
+        config_key: Config_key | str,
+    ) -> str | bool | list[str] | None:
+        key = config_key.name if isinstance(config_key, Config_key) else config_key
+
+        if key not in Config_key._member_map_:
+            log.error("The key '{}' is not a config", key)
+            return None
 
         if cls._config is None:
             cls._read_config()
@@ -161,43 +222,47 @@ class config:
     def _get_config_about(cls, key: str) -> str:
         return (
             {
-                Config_key.language.value: gettext(
+                Config_key.language.name: gettext(
                     "Easy Rip's language, support incomplete matching. Default: {}. Supported: {}",
                     CONFIG_DEFAULT_DICT[Config_key.language],
                     ", ".join(("auto", *(str(tag) for tag in all_supported_lang_map))),
                 ),
-                Config_key.check_update.value: gettext(
+                Config_key.check_update.name: gettext(
                     "Auto check the update of Easy Rip. Default: {}",
                     CONFIG_DEFAULT_DICT[Config_key.check_update],
                 ),
-                Config_key.check_dependent.value: gettext(
+                Config_key.check_dependent.name: gettext(
                     "Auto check the versions of all dependent programs. Default: {}",
                     CONFIG_DEFAULT_DICT[Config_key.check_dependent],
                 ),
-                Config_key.startup_directory.value: gettext(
+                Config_key.startup_dir.name: gettext(
                     "Program startup directory, when the value is empty, starts in the working directory. Default: {}",
-                    CONFIG_DEFAULT_DICT[Config_key.startup_directory] or '""',
+                    CONFIG_DEFAULT_DICT[Config_key.startup_dir] or '""',
+                ),
+                Config_key.startup_dir_blacklist.name: gettext(
+                    "Directory list. When the startup directory is a blacklisted directory, rollback to startup directory. Default: {}",
+                    CONFIG_DEFAULT_DICT[Config_key.startup_dir] or '""',
                 ),
-                Config_key.force_log_file_path.value: gettext(
+                Config_key.force_log_file_path.name: gettext(
                     "Force change of log file path, when the value is empty, it is the working directory. Default: {}",
                     CONFIG_DEFAULT_DICT[Config_key.force_log_file_path] or '""',
                 ),
-                Config_key.log_print_level.value: gettext(
+                Config_key.log_print_level.name: gettext(
                     "Logs this level and above will be printed, and if the value is '{}', they will not be printed. Default: {}. Supported: {}",
                     log.LogLevel.none.name,
                     CONFIG_DEFAULT_DICT[Config_key.log_print_level],
                     ", ".join(log.LogLevel._member_names_),
                 ),
-                Config_key.log_write_level.value: gettext(
+                Config_key.log_write_level.name: gettext(
                     "Logs this level and above will be written, and if the value is '{}', the '{}' only be written when 'server', they will not be written. Default: {}. Supported: {}",
                     log.LogLevel.none.name,
                     log.LogLevel.send.name,
                     CONFIG_DEFAULT_DICT[Config_key.log_write_level],
                     ", ".join(log.LogLevel._member_names_),
                 ),
-                Config_key.prompt_history_save_file.value: gettext(
+                Config_key.save_prompt_history.name: gettext(
                     "Save prompt history to config directory, otherwise save to memory. Take effect after reboot. Default: {}",
-                    CONFIG_DEFAULT_DICT[Config_key.prompt_history_save_file],
+                    CONFIG_DEFAULT_DICT[Config_key.save_prompt_history],
                 ),
             }
             | (cls._config or {})

easyrip/easyrip_config/config_key.py

@@ -1,14 +1,28 @@
 import enum
 
-CONFIG_VERSION = "4.2.0"
+CONFIG_VERSION = "4.6.0"
 
 
 class Config_key(enum.Enum):
-    language = "language"
-    check_update = "check_update"
-    check_dependent = "check_dependent"
-    startup_directory = "startup_directory"
-    force_log_file_path = "force_log_file_path"
-    log_print_level = "log_print_level"
-    log_write_level = "log_write_level"
-    prompt_history_save_file = "prompt_history_file"
+    language = enum.auto()
+    check_update = enum.auto()
+    check_dependent = enum.auto()
+    startup_dir = enum.auto()
+    startup_dir_blacklist = enum.auto()
+    force_log_file_path = enum.auto()
+    log_print_level = enum.auto()
+    log_write_level = enum.auto()
+    save_prompt_history = enum.auto()
+
+
+CONFIG_TYPE_DICT: dict[Config_key, type] = {
+    Config_key.language: str,
+    Config_key.check_update: bool,
+    Config_key.check_dependent: bool,
+    Config_key.startup_dir: str,
+    Config_key.startup_dir_blacklist: list[str],
+    Config_key.force_log_file_path: str,
+    Config_key.log_print_level: str,
+    Config_key.log_write_level: str,
+    Config_key.save_prompt_history: bool,
+}

easyrip/easyrip_log.py

@@ -106,7 +106,7 @@ class log:
         only_print = enum.auto()
         only_write = enum.auto()
 
-    html_filename: str = "encoding_log.html"  # 在调用前覆写
+    html_filename: str = "EasyRip_log.html"  # 在调用前覆写
     print_level: LogLevel = LogLevel.send
     write_level: LogLevel = LogLevel.send