easyrip 4.11.2__py3-none-any.whl → 4.12.0__py3-none-any.whl

easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -1,15 +1,10 @@
 from ..easyrip_command import Audio_codec, Cmd_type, Opt_type, Preset_name
-from .global_lang_val import (
-    Lang_tag,
-    Lang_tag_language,
-    Lang_tag_region,
-    Lang_tag_script,
-)
+from .global_lang_val import Lang_tag
 
 LANG_TAG = Lang_tag(
-    language=Lang_tag_language.zh,
-    script=Lang_tag_script.Hans,
-    region=Lang_tag_region.CN,
+    language=Lang_tag.Language.zh,
+    script=Lang_tag.Script.Hans,
+    region=Lang_tag.Region.CN,
 )
 
 LANG_MAP: dict[str, str] = {
@@ -135,7 +130,8 @@ LANG_MAP: dict[str, str] = {
     ),
     Opt_type._preset.value.description: (
         "设置预设\n"
-        "预设名:\n"  # .
+        "\n"  # .
+        "预设名:\n"
         f"{Preset_name.to_help_string('  ')}"
     ),
     Opt_type._pipe.value.description: (
@@ -199,13 +195,14 @@ LANG_MAP: dict[str, str] = {
     ),
     Opt_type._c_a.value.description: (
         "设置音频编码器\n"
-        "音频编码器:\n"  # .
+        "\n"  # .
+        "音频编码器:\n"
         f"{Audio_codec.to_help_string('  ')}"
     ),
     Opt_type._b_a.value.description: "设置音频码率。默认值 '160k'",
     Opt_type._muxer.value.description: (
         "设置复用器\n"
-        " \n"  # .
+        "\n"  # .
         "可用的复用器:\n"
         "  mp4\n"
         "  mkv"
@@ -323,6 +320,9 @@ LANG_MAP: dict[str, str] = {
     "Failed to add Ripper: {}": "添加 Ripper 失败: {}",
     "'{}' is not a valid '{}', set to default value '{}'. Valid options are: {}": "'{}' 不存在于 '{}', 已设为默认值 '{}'。有以下值可用: {}",
     "The preset custom must have custom:format or custom:template": "custom 预设必须要有 custom:format 或 custom:template",
+    "Run the following commands in order:\n{}": "按顺序执行以下命令:\n{}",
+    "Run the command {}": "执行命令 {}",
+    "Command run failed: status code {}\n  Failed command: {}": "命令执行失败: 状态码 {}\n  失败的命令: {}",
     "There have error in running": "执行时出错",
     "{} param illegal": "{} 参数非法",
     'The file "{}" already exists, skip translating it': '文件 "{}" 已存在, 跳过翻译',

easyrip/easyrip_mlang/translator.py

@@ -5,12 +5,7 @@ from time import sleep
 from typing import Final
 
 from ..easyrip_web.third_party_api import zhconvert
-from .global_lang_val import (
-    Lang_tag,
-    Lang_tag_language,
-    Lang_tag_region,
-    Lang_tag_script,
-)
+from .global_lang_val import Lang_tag
 
 
 def translate_subtitles(
@@ -64,52 +59,52 @@ def translate_subtitles(
     match Lang_tag.from_str(infix):
         case (
             Lang_tag(
-                language=Lang_tag_language.zh,
-                script=Lang_tag_script.Hans,
+                language=Lang_tag.Language.zh,
+                script=Lang_tag.Script.Hans,
                 region=_,
             )
             | Lang_tag(
-                language=Lang_tag_language.zh,
+                language=Lang_tag.Language.zh,
                 script=_,
-                region=Lang_tag_region.CN,
+                region=Lang_tag.Region.CN,
             )
         ):
             # 简体 -> 繁体 or 非 CN 简体 CN 化
             match target_lang_tag:
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
+                    language=Lang_tag.Language.zh,
                     script=_,
-                    region=Lang_tag_region.HK,
+                    region=Lang_tag.Region.HK,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.HK
 
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
+                    language=Lang_tag.Language.zh,
                     script=_,
-                    region=Lang_tag_region.TW,
+                    region=Lang_tag.Region.TW,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.TW
 
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
-                    script=Lang_tag_script.Hant,
+                    language=Lang_tag.Language.zh,
+                    script=Lang_tag.Script.Hant,
                     region=_,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.Hant
 
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
-                    script=Lang_tag_script.Hant,
-                    region=Lang_tag_region.CN,
+                    language=Lang_tag.Language.zh,
+                    script=Lang_tag.Script.Hant,
+                    region=Lang_tag.Region.CN,
                 ):  # 特殊情况
                     raise Exception(
                         gettext("Unsupported language tag: {}", target_lang_tag)
                     )
 
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
+                    language=Lang_tag.Language.zh,
                     script=_,
-                    region=Lang_tag_region.CN,
+                    region=Lang_tag.Region.CN,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.CN
 
@@ -120,28 +115,28 @@ def translate_subtitles(
 
         case (
             Lang_tag(
-                language=Lang_tag_language.zh,
-                script=Lang_tag_script.Hant,
+                language=Lang_tag.Language.zh,
+                script=Lang_tag.Script.Hant,
                 region=_,
             )
             | Lang_tag(
-                language=Lang_tag_language.zh,
+                language=Lang_tag.Language.zh,
                 script=_,
-                region=Lang_tag_region.HK | Lang_tag_region.TW,
+                region=Lang_tag.Region.HK | Lang_tag.Region.TW,
             )
         ):
             # 繁体 -> 简体
             match target_lang_tag:
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
+                    language=Lang_tag.Language.zh,
                     script=_,
-                    region=Lang_tag_region.CN,
+                    region=Lang_tag.Region.CN,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.CN
 
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
-                    script=Lang_tag_script.Hans,
+                    language=Lang_tag.Language.zh,
+                    script=Lang_tag.Script.Hans,
                     region=_,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.Hans

easyrip/easyrip_prompt.py

@@ -1,8 +1,10 @@
 import os
+import re
 from collections.abc import Iterable
 
 from prompt_toolkit.completion import CompleteEvent, Completer, Completion
 from prompt_toolkit.document import Document
+from prompt_toolkit.formatted_text import StyleAndTextTuples
 from prompt_toolkit.history import FileHistory
 
 from .global_val import C_Z, get_CONFIG_DIR
@@ -26,47 +28,123 @@ class SmartPathCompleter(Completer):
     def __init__(self) -> None:
         pass
 
+    def _highlight_fuzzy_match(
+        self,
+        suggestion: str,
+        user_input: str,
+        style_config: dict | None = None,
+    ) -> StyleAndTextTuples:
+        """
+        高亮显示模糊匹配结果
+
+        Args:
+            suggestion: 建议的完整字符串
+            user_input: 用户输入的匹配字符
+            style_config: 样式配置字典
+
+        Returns:
+            包含样式信息的格式化文本
+
+        """
+        if style_config is None:
+            style_config = {
+                "match_char": "class:fuzzymatch.inside.character",
+                "match_section": "class:fuzzymatch.inside",
+                "non_match": "class:fuzzymatch.outside",
+            }
+
+        if not user_input:
+            # 用户没有输入，返回原始字符串
+            return [(style_config["non_match"], suggestion)]
+
+        # 找到最佳匹配位置
+        result = []
+
+        # 简化的模糊匹配算法
+        pattern = ".*?".join(map(re.escape, user_input))
+        regex = re.compile(pattern, re.IGNORECASE)
+
+        match = regex.search(suggestion)
+        if not match:
+            # 没有匹配，返回原始字符串
+            return [(style_config["non_match"], suggestion)]
+
+        start, end = match.span()
+        match_text = suggestion[start:end]
+
+        # 匹配段之前的文本
+        if start > 0:
+            result.append((style_config["non_match"], suggestion[:start]))
+
+        # 匹配段内部的字符
+        input_chars = list(user_input)
+        for char in match_text:
+            if input_chars and char.lower() == input_chars[0].lower():
+                result.append((style_config["match_char"], char))
+                input_chars.pop(0)
+            else:
+                result.append((style_config["match_section"], char))
+
+        # 匹配段之后的文本
+        if end < len(suggestion):
+            result.append((style_config["non_match"], suggestion[end:]))
+
+        return result
+
+    def _fuzzy_filter_and_sort(self, filenames: list[str], match_str: str) -> list[str]:
+        """模糊过滤和排序"""
+        if not match_str:
+            return sorted(filenames)
+
+        # 构建模糊匹配模式
+        pattern = ".*?".join(map(re.escape, match_str))
+        regex = re.compile(f"(?=({pattern}))", re.IGNORECASE)
+
+        matches = []
+        for filename in filenames:
+            regex_matches = list(regex.finditer(filename))
+            if regex_matches:
+                # 找到最佳匹配（最左、最短）
+                best = min(regex_matches, key=lambda m: (m.start(), len(m.group(1))))
+                matches.append((best.start(), len(best.group(1)), filename))
+
+        # 按匹配质量排序：先按匹配位置，再按匹配长度
+        matches.sort(key=lambda x: (x[0], x[1]))
+        return [item[2] for item in matches]
+
     def get_completions(
         self,
         document: Document,
         complete_event: CompleteEvent,  # noqa: ARG002
     ) -> Iterable[Completion]:
-        text = document.text_before_cursor.strip("\"'")
+        text = document.text_before_cursor
+        input_path = text.strip("\"'")
 
         try:
-            directory = (
-                os.path.dirname(os.path.join(".", text))
-                if os.path.dirname(text)
-                else "."
-            )
-
-            prefix = os.path.basename(text)
+            directory = os.path.dirname(input_path) or "."
+            basename = os.path.basename(input_path)
 
-            filenames: list[tuple[str, str]] = (
-                [
-                    (directory, filename)
-                    for filename in os.listdir(directory)
-                    if filename.startswith(prefix)
-                ]
-                if os.path.isdir(directory)
-                else []
+            filenames: list[str] = (
+                os.listdir(directory) if os.path.isdir(directory) else []
             )
 
-            for directory, filename in sorted(filenames, key=lambda k: k[1]):
-                completion = filename[len(prefix) :]
-                full_name = os.path.join(directory, filename)
+            for filename in self._fuzzy_filter_and_sort(filenames, basename):
+                full_name = (
+                    filename if directory == "." else os.path.join(directory, filename)
+                )
 
                 if os.path.isdir(full_name):
                     filename += "/"
 
+                completion = full_name
+
+                if any(c in r""" !$%&()*:;<=>?[]^`{|}~""" for c in completion):
+                    completion = f'"{completion}"'
+
                 yield Completion(
-                    text=(
-                        f'{"" if any(c in text for c in "\\/") else '"'}{completion}"'
-                        if any(c in r"""!$%&()*:;<=>?[]^`{|}~""" for c in completion)
-                        else completion
-                    ),
-                    start_position=0,
-                    display=filename,
+                    text=completion,
+                    start_position=-len(text),
+                    display=self._highlight_fuzzy_match(filename, basename),
                 )
 
         except OSError:

easyrip/global_val.py

@@ -4,7 +4,7 @@ from functools import cache
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.11.2"
+PROJECT_VERSION = "4.12.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/ripper/param.py

@@ -29,6 +29,8 @@ class Preset_name(enum.Enum):
 
     vvenc = "vvenc"
 
+    ffv1 = "ffv1"
+
     h264_amf = "h264_amf"
     h264_nvenc = "h264_nvenc"
     h264_qsv = "h264_qsv"
@@ -66,6 +68,16 @@ class Preset_name(enum.Enum):
             prefix=prefix,
         )
 
+    def get_param_name_set[T: set[LiteralString] | None](
+        self, default: T = None, /
+    ) -> set[LiteralString] | T:
+        return _PRESET__PARAM_NAME_SET.get(self, default)
+
+    def get_param_default_dict[T: dict[LiteralString, LiteralString] | None](
+        self, default: T = None, /
+    ) -> dict[LiteralString, LiteralString] | T:
+        return _PRESET__DEFAULT_PARAMS.get(self, default)
+
 
 class Audio_codec(enum.Enum):
     copy = "copy"
@@ -119,8 +131,19 @@ class Muxer(enum.Enum):
         )
         return DEFAULT
 
+    @classmethod
+    def to_help_string(cls, prefix: str = ""):
+        return textwrap.indent(
+            reduce(
+                lambda acc,
+                add: f"{acc}{' ' if add.endswith(acc.split()[-1][-4:]) else '\n'}{add}",
+                tuple[str](cls._member_map_),
+            ),
+            prefix=prefix,
+        )
 
-X265_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
+
+_X265_PARAM_NAME_SET: Final[set[LiteralString]] = {
     "crf",
     "qpmin",
     "qpmax",
@@ -148,6 +171,7 @@ X265_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
     "open-gop",
     "gop-lookahead",
     "rc-lookahead",
+    "lookahead-slices",
     "rect",
     "amp",
     "cbqpoffs",
@@ -160,8 +184,13 @@ X265_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
     "max-tu-size",
     "level-idc",
     "sao",
-)
-X264_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
+    # 性能
+    "lookahead-threads",
+    "asm",
+    "frame-threads",
+    "pools",
+}
+_X264_PARAM_NAME_SET: Final[set[LiteralString]] = {
     "threads",
     "crf",
     "psy-rd",
@@ -182,8 +211,29 @@ X264_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
     "fast-pskip",
     "partitions",
     "direct",
-)
+}
+_FFV1_PARAM_NAME_SET: Final[set[LiteralString]] = {
+    "slicecrc",
+    "coder",
+    "context",
+    "qtable",
+    "remap_mode",
+    "remap_optimizer",
+}
 
+_PRESET__PARAM_NAME_SET: Final[dict[Preset_name, set[LiteralString]]] = {
+    Preset_name.x264: _X264_PARAM_NAME_SET,
+    Preset_name.x264fast: _X264_PARAM_NAME_SET,
+    Preset_name.x264slow: _X264_PARAM_NAME_SET,
+    Preset_name.x265: _X265_PARAM_NAME_SET,
+    Preset_name.x265fast4: _X265_PARAM_NAME_SET,
+    Preset_name.x265fast3: _X265_PARAM_NAME_SET,
+    Preset_name.x265fast2: _X265_PARAM_NAME_SET,
+    Preset_name.x265fast: _X265_PARAM_NAME_SET,
+    Preset_name.x265slow: _X265_PARAM_NAME_SET,
+    Preset_name.x265full: _X265_PARAM_NAME_SET,
+    Preset_name.ffv1: _FFV1_PARAM_NAME_SET,
+}
 
 _DEFAULT_X265_PARAMS: Final[dict[LiteralString, LiteralString]] = {
     "crf": "20",
@@ -213,6 +263,7 @@ _DEFAULT_X265_PARAMS: Final[dict[LiteralString, LiteralString]] = {
     "open-gop": "1",
     "gop-lookahead": "0",
     "rc-lookahead": "20",
+    "lookahead-slices": "8",
     "rect": "0",
     "amp": "0",
     "cbqpoffs": "0",
@@ -227,22 +278,17 @@ _DEFAULT_X265_PARAMS: Final[dict[LiteralString, LiteralString]] = {
     "sao": "0",
     "weightb": "1",
     "info": "1",
+    # 性能
+    "lookahead-threads": "0",
+    "asm": "auto",
+    "frame-threads": "0",
+    "pools": "*",
 }
 
 
-PRESET_OPT_NAME: Final[dict[Preset_name, tuple[LiteralString, ...]]] = {
-    Preset_name.x264: X264_PARAMS_NAME,
-    Preset_name.x264fast: X264_PARAMS_NAME,
-    Preset_name.x264slow: X264_PARAMS_NAME,
-    Preset_name.x265: X265_PARAMS_NAME,
-    Preset_name.x265fast4: X265_PARAMS_NAME,
-    Preset_name.x265fast3: X265_PARAMS_NAME,
-    Preset_name.x265fast2: X265_PARAMS_NAME,
-    Preset_name.x265fast: X265_PARAMS_NAME,
-    Preset_name.x265slow: X265_PARAMS_NAME,
-    Preset_name.x265full: X265_PARAMS_NAME,
-}
-DEFAULT_PRESET_PARAMS: Final[dict[Preset_name, dict[LiteralString, LiteralString]]] = {
+_PRESET__DEFAULT_PARAMS: Final[
+    dict[Preset_name, dict[LiteralString, LiteralString]]
+] = {
     Preset_name.x264fast: {
         "threads": "auto",
         "crf": "20",
@@ -391,6 +437,7 @@ DEFAULT_PRESET_PARAMS: Final[dict[Preset_name, dict[LiteralString, LiteralString
             "subme": "5",
             "gop-lookahead": "8",
             "rc-lookahead": "216",
+            "lookahead-slices": "4",
             "cbqpoffs": "-2",
             "crqpoffs": "-2",
             "pbratio": "1.2",
@@ -421,6 +468,7 @@ DEFAULT_PRESET_PARAMS: Final[dict[Preset_name, dict[LiteralString, LiteralString
             "subme": "6",
             "gop-lookahead": "14",
             "rc-lookahead": "250",
+            "lookahead-slices": "2",
             "rect": "1",
             "min-keyint": "2",
             "cbqpoffs": "-2",
@@ -456,6 +504,7 @@ DEFAULT_PRESET_PARAMS: Final[dict[Preset_name, dict[LiteralString, LiteralString
             "open-gop": "1",
             "gop-lookahead": "14",
             "rc-lookahead": "250",
+            "lookahead-slices": "1",
             "rect": "1",
             "amp": "1",
             "cbqpoffs": "-3",