easyrip 4.11.1__tar.gz → 4.11.3__tar.gz

{easyrip-4.11.1 → easyrip-4.11.3}/PKG-INFO

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

{easyrip-4.11.1 → easyrip-4.11.3}/easyrip/easyrip_command.py

@@ -7,7 +7,6 @@ from typing import Final, Self, final
 
 from prompt_toolkit.completion import (
     Completer,
-    DeduplicateCompleter,
     FuzzyCompleter,
     FuzzyWordCompleter,
     NestedCompleter,
@@ -595,6 +594,21 @@ class Opt_type(enum.Enum):
         ("-hwaccel",),
         param="<string>",
         description="Use FFmpeg hwaccel (See 'ffmpeg -hwaccels' for details)",
+        childs=(
+            Cmd_type_val(
+                names=(
+                    "cuda",
+                    "vaapi",
+                    "dxva2",
+                    "qsv",
+                    "d3d11va",
+                    "opencl",
+                    "vulkan",
+                    "d3d12va",
+                    "amf",
+                )
+            ),
+        ),
     )
     _ss = Cmd_type_val(
         ("-ss",),
@@ -793,7 +807,7 @@ class OptCompleter(Completer):
 
         if (
             (opt_tree_pos_list[-1] is not self.opt_tree)
-            or (words[-1] in add_comp_words)
+            or (words and words[-1] in add_comp_words)
         ) and not text.endswith(" "):
             # 不在根(上个单词没让这个单词回退到根) or 匹配额外提示
             # 且尾部不是空格
@@ -845,14 +859,7 @@ class OptCompleter(Completer):
 
             yield from merge_completers(
                 (
-                    DeduplicateCompleter(
-                        merge_completers(
-                            (
-                                _nested_dict_to_nc(new_nd),
-                                FuzzyCompleter(_nested_dict_to_nc(new_nd), WORD=True),
-                            )
-                        )
-                    ),
+                    _nested_dict_to_nc(new_nd),
                     FuzzyCompleter(
                         WordCompleter(
                             words=tuple(opt_tree_pos_list[-1]),

{easyrip-4.11.1 → easyrip-4.11.3}/easyrip/easyrip_mlang/translator.py

@@ -42,20 +42,20 @@ def translate_subtitles(
 
     file_list: Final[list[tuple[Path, str]]] = []
     for f in directory.iterdir():
-        if f.suffix not in {".ass", ".ssa", ".srt"} or (
-            file_intersection_selector is not None
-            and f not in file_intersection_selector
+        if (
+            not f.is_file()
+            or f.suffix not in {".ass", ".ssa", ".srt"}
+            or (
+                file_intersection_selector is not None
+                and not all(map(f.samefile, file_intersection_selector))
+            )
         ):
             continue
 
-        if len(_stems := f.stem.split(".")) < 1:
-            continue
-        if infix == _stems[-1]:
+        if (_stems := f.stem.split(".")) and (infix == _stems[-1]):
             file_list.append(
                 (
-                    f.with_name(
-                        f"{'.'.join(f.stem.split('.')[:-1])}.{target_lang_tag}{f.suffix}"
-                    ),
+                    f.with_name(f"{'.'.join(_stems[:-1])}.{target_lang_tag}{f.suffix}"),
                     read_text(f),
                 )
             )

easyrip-4.11.3/easyrip/easyrip_prompt.py

@@ -0,0 +1,151 @@
+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
+
+
+class easyrip_prompt:
+    PROMPT_HISTORY_FILE = get_CONFIG_DIR() / "prompt_history.txt"
+
+    @classmethod
+    def clear(cls) -> None:
+        cls.PROMPT_HISTORY_FILE.unlink(True)
+
+
+class ConfigFileHistory(FileHistory):
+    def store_string(self, string: str) -> None:
+        if not string.startswith(C_Z):
+            super().store_string(string)
+
+
+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
+        input_path = text.strip("\"'")
+
+        try:
+            directory = os.path.dirname(input_path) or "."
+            basename = os.path.basename(input_path)
+
+            filenames: list[str] = (
+                os.listdir(directory) if os.path.isdir(directory) else []
+            )
+
+            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=completion,
+                    start_position=-len(text),
+                    display=self._highlight_fuzzy_match(filename, basename),
+                )
+
+        except OSError:
+            pass

{easyrip-4.11.1 → easyrip-4.11.3}/easyrip/global_val.py

@@ -4,7 +4,7 @@ from functools import cache
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.11.1"
+PROJECT_VERSION = "4.11.3"
 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.11.1 → easyrip-4.11.3}/easyrip/ripper/param.py

@@ -213,6 +213,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,6 +228,11 @@ _DEFAULT_X265_PARAMS: Final[dict[LiteralString, LiteralString]] = {
     "sao": "0",
     "weightb": "1",
     "info": "1",
+    # 性能
+    "lookahead-threads": "0",
+    "asm": "auto",
+    "frame-threads": "0",
+    "pools": "*",
 }
 
 
@@ -391,6 +397,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 +428,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",
@@ -434,7 +442,7 @@ DEFAULT_PRESET_PARAMS: Final[dict[Preset_name, dict[LiteralString, LiteralString
         {
             "crf": "17",
             "qpmin": "3",
-            "qpmax": "21.5",
+            "qpmax": "23",
             "psy-rd": "2.2",
             "rd": "5",
             "rdoq-level": "2",
@@ -456,6 +464,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",

{easyrip-4.11.1 → easyrip-4.11.3}/easyrip/ripper/ripper.py

@@ -802,11 +802,42 @@ class Ripper:
                     )
 
             case Ripper.Preset_name.subset:
+                # 临时翻译
+                add_tr_file_list: Final[list[Path]] = []
+                if translate_sub := self.option_map.get("translate-sub"):
+                    _tr = translate_sub.split(":")
+                    if len(_tr) != 2:
+                        log.error("{} param illegal", "-translate-sub")
+                    else:
+                        try:
+                            _file_list = translate_subtitles(
+                                Path(self.output_dir),
+                                _tr[0],
+                                _tr[1],
+                                file_intersection_selector=self.input_path_list,
+                            )
+                        except Exception as e:
+                            log.error(e, is_format=False)
+                        else:
+                            for f_and_s in _file_list:
+                                if f_and_s[0].is_file():
+                                    log.warning(
+                                        'The file "{}" already exists, skip translating it',
+                                        f_and_s[0],
+                                    )
+                                    continue
+
+                                with f_and_s[0].open(
+                                    "wt", encoding="utf-8-sig", newline="\n"
+                                ) as f:
+                                    f.write(f_and_s[1])
+                                    add_tr_file_list.append(f_and_s[0])
+
                 _output_dir = Path(self.output_dir) / basename
                 _output_dir.mkdir(parents=True, exist_ok=True)
 
-                _ass_list: list[Path] = []
-                _other_sub_list: list[Path] = []
+                _ass_list: Final[list[Path]] = add_tr_file_list.copy()
+                _other_sub_list: Final[list[Path]] = []
 
                 for path in self.input_path_list:
                     if path.suffix == ".ass":
@@ -861,6 +892,13 @@ class Ripper:
                 for path in _other_sub_list:
                     shutil.copy2(path, _output_dir / path.name)
 
+                # 清理临时文件
+                for f in add_tr_file_list:
+                    try:
+                        f.unlink()
+                    except Exception as e:
+                        log.error(f"{e!r} {e}", deep=True, is_format=False)
+
                 if subset_res is False:
                     log.error("Run {} failed", "subset")
                 return subset_res
@@ -1085,39 +1123,9 @@ class Ripper:
                     log.warning("-soft-sub is empty")
                 log.info("-soft-sub list = {}", soft_sub_list)
 
-                # 临时翻译
-                add_tr_files: Final[list[Path]] = []
-                if translate_sub := self.option_map.get("translate-sub"):
-                    _tr = translate_sub.split(":")
-                    if len(_tr) != 2:
-                        log.error("{} param illegal", "-translate-sub")
-                    else:
-                        try:
-                            _file_list = translate_subtitles(
-                                Path(self.output_dir),
-                                _tr[0],
-                                _tr[1],
-                                file_intersection_selector=soft_sub_list,
-                            )
-                        except Exception as e:
-                            log.error(e, is_format=False)
-                        else:
-                            for f_and_s in _file_list:
-                                if f_and_s[0].is_file():
-                                    log.warning(
-                                        'The file "{}" already exists, skip translating it',
-                                        f_and_s[0],
-                                    )
-                                    continue
-                                with f_and_s[0].open(
-                                    "wt", encoding="utf-8-sig", newline="\n"
-                                ) as f:
-                                    f.write(f_and_s[1])
-                                    add_tr_files.append(f_and_s[0])
-
                 # 子集化
                 if Ripper(
-                    soft_sub_list + add_tr_files,
+                    soft_sub_list,
                     (subset_folder.name,),
                     self.output_dir,
                     Ripper.Preset_name.subset,
@@ -1161,11 +1169,6 @@ class Ripper:
 
                 # 清理临时文件
                 shutil.rmtree(subset_folder)
-                for f in add_tr_files:
-                    try:
-                        f.unlink()
-                    except Exception as e:
-                        log.error(f"{e!r} {e}", deep=True, is_format=False)
 
         # 获取 ffmpeg report 中的报错
         if FF_REPORT_LOG_FILE.is_file():

{easyrip-4.11.1 → easyrip-4.11.3}/easyrip.egg-info/PKG-INFO

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

easyrip-4.11.1/easyrip/easyrip_prompt.py

@@ -1,73 +0,0 @@
-import os
-from collections.abc import Iterable
-
-from prompt_toolkit.completion import CompleteEvent, Completer, Completion
-from prompt_toolkit.document import Document
-from prompt_toolkit.history import FileHistory
-
-from .global_val import C_Z, get_CONFIG_DIR
-
-
-class easyrip_prompt:
-    PROMPT_HISTORY_FILE = get_CONFIG_DIR() / "prompt_history.txt"
-
-    @classmethod
-    def clear(cls) -> None:
-        cls.PROMPT_HISTORY_FILE.unlink(True)
-
-
-class ConfigFileHistory(FileHistory):
-    def store_string(self, string: str) -> None:
-        if not string.startswith(C_Z):
-            super().store_string(string)
-
-
-class SmartPathCompleter(Completer):
-    def __init__(self) -> None:
-        pass
-
-    def get_completions(
-        self,
-        document: Document,
-        complete_event: CompleteEvent,  # noqa: ARG002
-    ) -> Iterable[Completion]:
-        text = document.text_before_cursor.strip("\"'")
-
-        try:
-            directory = (
-                os.path.dirname(os.path.join(".", text))
-                if os.path.dirname(text)
-                else "."
-            )
-
-            prefix = os.path.basename(text)
-
-            filenames: list[tuple[str, str]] = (
-                [
-                    (directory, filename)
-                    for filename in os.listdir(directory)
-                    if filename.startswith(prefix)
-                ]
-                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)
-
-                if os.path.isdir(full_name):
-                    filename += "/"
-
-                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,
-                )
-
-        except OSError:
-            pass