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

easyrip/easyrip_command.py

@@ -7,7 +7,6 @@ from typing import Final, Self, final
 
 from prompt_toolkit.completion import (
     Completer,
-    DeduplicateCompleter,
     FuzzyCompleter,
     FuzzyWordCompleter,
     NestedCompleter,
@@ -860,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/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.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/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",
@@ -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.2.dist-info → easyrip-4.11.3.dist-info}/METADATA

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

{easyrip-4.11.2.dist-info → easyrip-4.11.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
 easyrip/__init__.py,sha256=PIvSPDgswsIkWL4dsCe87knnxKmtvcrWYzmqAwZix_M,765
 easyrip/__main__.py,sha256=bPVlHqJb3BG-qZOY4JlJdKj7MKeRb_3EfoMbfoNN-gU,4943
-easyrip/easyrip_command.py,sha256=IvoNf9Q79nGTvFeCGfq0oz0Cr4jZY7beJAgbWUlUyuk,29633
+easyrip/easyrip_command.py,sha256=U5fe33YqRghpuOY3xmjTxErZzjG_ykJMTWyU-GAJlsY,29315
 easyrip/easyrip_log.py,sha256=R-dM3CWUBFITtG7GSD1zy4X4MhZqxkoiBPjlIpI76cY,15573
 easyrip/easyrip_main.py,sha256=l_LMkM0EDpY0N9Ib5O1wSho6k9JG7JIh62ajU622XHE,44710
-easyrip/easyrip_prompt.py,sha256=RJoE4H_ft4jmlMIBxDcEAfLvLQqabYKUuQUBqJAztlY,2155
-easyrip/global_val.py,sha256=yrFt8nVY7zTtyBeeatvKZsXtYhAGBUoWXHjiao32og4,866
+easyrip/easyrip_prompt.py,sha256=3or0Vt4s6L53MCJtQmSylrTADZIIjX5gvpSb-JRe2P4,4844
+easyrip/global_val.py,sha256=YU7OKCDpWi3ez6Z28xy4txjWKEWSTFyPiO-doO5Jh48,866
 easyrip/utils.py,sha256=N1rMF1MyoC-YFBgy10_u29cFoowfhR-5Viea93O7wQ4,8750
 easyrip/easyrip_config/config.py,sha256=KWXZMEYxdXYUGLQ-MR0A7nnOwR6QZdVrWBopfb2QZSA,9869
 easyrip/easyrip_config/config_key.py,sha256=_jjdKOunskUoG7UUWOz3QZK-s4LF_x6hmM9MKttyS2Q,766
@@ -17,15 +17,15 @@ easyrip/easyrip_web/__init__.py,sha256=tMyEeaSGeEJjND7MF0MBv9aDiDgaO3MOnppwxA70U
 easyrip/easyrip_web/http_server.py,sha256=iyulCAFQrJlz86Lrr-Dm3fhOnNCf79Bp6fVHhr0ephY,8350
 easyrip/easyrip_web/third_party_api.py,sha256=GhP6LmR1sVMeLLbnj82r-QYjoUdSnyaU9xp0LRnRLsw,4623
 easyrip/ripper/media_info.py,sha256=mQq_vbQ7S9fWpb39HLkoZlAL-pqNfwxewv6X776Nf50,5078
-easyrip/ripper/param.py,sha256=wPy2zMmL0zNk8ShhCA8KmpLs7h4sRpNuEsllF6sGBlI,11734
+easyrip/ripper/param.py,sha256=PYUCfrXtGKaUxQCLWiDK99jih_JSRxtLsi5udzsZZUQ,11980
 easyrip/ripper/ripper.py,sha256=jjQKDepCAPDCnNEk3RQ-r7py-cFDBT5g7pdZMIR60WY,50515
 easyrip/ripper/sub_and_font/__init__.py,sha256=cBT7mxL7RRFaJXFPXuZ7RT-YK6FbnanaU5v6U9BOquw,153
 easyrip/ripper/sub_and_font/ass.py,sha256=hJhVN7CqehN9xW1W295gmkPnG-somqlxnwXzRidbA2M,28645
 easyrip/ripper/sub_and_font/font.py,sha256=X2dPcPzbwQf3fv_g_mxO-zY7puVAX9Nv-9QHn88q4oA,7745
 easyrip/ripper/sub_and_font/subset.py,sha256=qGH3H26nHnyGFfFwvktEIKncHpm086DqxYjVhNoVDdM,18654
-easyrip-4.11.2.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-easyrip-4.11.2.dist-info/METADATA,sha256=_KvAAeJEnpiExsKXMhKGTvvvxz4qTinkjtQbzWv8sCI,3507
-easyrip-4.11.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-easyrip-4.11.2.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
-easyrip-4.11.2.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
-easyrip-4.11.2.dist-info/RECORD,,
+easyrip-4.11.3.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+easyrip-4.11.3.dist-info/METADATA,sha256=7jXHv8WOOGUm90wHDqG650tJdjSfej0NMsAIqJACimo,3507
+easyrip-4.11.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+easyrip-4.11.3.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
+easyrip-4.11.3.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
+easyrip-4.11.3.dist-info/RECORD,,