easyrip 4.13.3__py3-none-any.whl → 4.14.0__py3-none-any.whl

easyrip/__main__.py

@@ -17,15 +17,18 @@ from .easyrip_command import (
     Cmd_type,
     Cmd_type_val,
     CmdCompleter,
-    FuzzyCompleter,
-    NestedCompleter,
     Opt_type,
     OptCompleter,
     nested_dict,
 )
 from .easyrip_config.config import Config_key, config
 from .easyrip_main import Ripper, get_input_prompt, init, log, run_command
-from .easyrip_prompt import ConfigFileHistory, SmartPathCompleter, easyrip_prompt
+from .easyrip_prompt import (
+    ConfigFileHistory,
+    CustomPromptCompleter,
+    SmartPathCompleter,
+    easyrip_prompt,
+)
 from .global_val import C_D, C_Z
 
 
@@ -130,14 +133,7 @@ def run() -> NoReturn:
                     (
                         _ctv_to_nc(cmd_ctv_tuple),
                         OptCompleter(opt_tree=_ctv_to_nd(ct.value for ct in Opt_type)),
-                        FuzzyCompleter(
-                            NestedCompleter(
-                                {
-                                    k: NestedCompleter({v: None})
-                                    for k, v in easyrip_prompt.get_custom_prompt().items()
-                                }
-                            ),
-                        ),
+                        CustomPromptCompleter(),
                     )
                 ),
                 history=prompt_history,

easyrip/easyrip_command.py

@@ -253,19 +253,22 @@ class Cmd_type(enum.Enum):
         description=(
             "history\n"  # .
             "  Show prompt history\n"
-            "clear | clean\n"
+            "history_clear\n"
             "  Delete history file\n"
             "add <name:string> <cmd:string>\n"
             "  Add a custom prompt\n"
             "  e.g. prompt add myprompt echo my prompt\n"
             "del <name:string>\n"
             "  Delete a custom prompt"
+            "show\n"
+            "  Show custom prompt"
         ),
         childs=(
             Cmd_type_val(("history",)),
-            Cmd_type_val(("clear", "clean")),
+            Cmd_type_val(("history_clear",)),
             Cmd_type_val(("add",)),
             Cmd_type_val(("del",)),
+            Cmd_type_val(("show",)),
         ),
     )
     translate = Cmd_type_val(

easyrip/easyrip_main.py

@@ -345,7 +345,7 @@ def run_ripper_list(
         log.info("Execute shutdown in {}s", shutdown_sec)
         if os.name == "nt":
             _cmd = (
-                f'shutdown /s /t {shutdown_sec} /c "{gettext("{} run completed, shutdown in {}s", PROJECT_TITLE, shutdown_sec)}"',
+                f'shutdown /s /t {shutdown_sec} /d p:4:0 /c "{gettext("{} run completed, shutdown in {}s", PROJECT_TITLE, shutdown_sec)}"',
             )
         elif os.name == "posix":
             _cmd = (f"shutdown -h +{shutdown_sec // 60}",)
@@ -776,7 +776,7 @@ def run_command(command: Iterable[str] | str) -> bool:
                         for line in f.read().splitlines():
                             log.send(line, is_format=False)
 
-                case "clear" | "clean":
+                case "history_clear":
                     easyrip_prompt.clear_history()
 
                 case "add":
@@ -797,6 +797,15 @@ def run_command(command: Iterable[str] | str) -> bool:
                     log.info("Del custom prompt {!r}", _name)
                     return easyrip_prompt.del_custom_prompt(_name)
 
+                case "show":
+                    if _custom_prompt := easyrip_prompt.get_custom_prompt():
+                        log.send(
+                            "\n".join(
+                                f"{k!r} = {v!r}" for k, v in _custom_prompt.items()
+                            ),
+                            is_format=False,
+                        )
+
         case Cmd_type.translate:
             if not (_infix := cmd_list[1]):
                 log.error("Need target infix")

easyrip/easyrip_prompt.py

@@ -83,94 +83,95 @@ class ConfigFileHistory(FileHistory):
             super().store_string(string)
 
 
+def _highlight_fuzzy_match(
+    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(names: list[str], match_str: str) -> list[str]:
+    """模糊过滤和排序"""
+    if not match_str:
+        return sorted(names)
+
+    # 构建模糊匹配模式
+    pattern = ".*?".join(map(re.escape, match_str))
+    regex = re.compile(f"(?=({pattern}))", re.IGNORECASE)
+
+    matches = []
+    for filename in names:
+        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]
+
+
 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,
@@ -187,7 +188,7 @@ class SmartPathCompleter(Completer):
                 os.listdir(directory) if os.path.isdir(directory) else []
             )
 
-            for filename in self._fuzzy_filter_and_sort(filenames, basename):
+            for filename in _fuzzy_filter_and_sort(filenames, basename):
                 full_name = (
                     filename if directory == "." else os.path.join(directory, filename)
                 )
@@ -203,8 +204,29 @@ class SmartPathCompleter(Completer):
                 yield Completion(
                     text=completion,
                     start_position=-len(text),
-                    display=self._highlight_fuzzy_match(filename, basename),
+                    display=_highlight_fuzzy_match(filename, basename),
                 )
 
         except OSError:
             pass
+
+
+class CustomPromptCompleter(Completer):
+    def get_completions(
+        self,
+        document: Document,
+        complete_event: CompleteEvent,  # noqa: ARG002
+    ) -> Iterable[Completion]:
+        text = document.text_before_cursor
+        words = text.split()
+
+        custom_prompt = easyrip_prompt.get_custom_prompt()
+        for word in words[-1:]:
+            for name in _fuzzy_filter_and_sort(list(custom_prompt), word):
+                target_cmd = custom_prompt[name]
+                yield Completion(
+                    text=target_cmd,
+                    start_position=-len(word),
+                    display=_highlight_fuzzy_match(name, word),
+                    display_meta=target_cmd,
+                )

easyrip/global_val.py

@@ -4,7 +4,7 @@ from functools import cache
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.13.3"
+PROJECT_VERSION = "4.14.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.13.3.dist-info → easyrip-4.14.0.dist-info}/METADATA

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

{easyrip-4.13.3.dist-info → easyrip-4.14.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 easyrip/__init__.py,sha256=DULQoFEAEHYk7dS8Zxky56so7qDPqHm7jUc_Zop1eXw,616
-easyrip/__main__.py,sha256=QkzhmJPZUf79J-9ugJbks46fyYNG6dPn1K29nzfFVvU,5474
-easyrip/easyrip_command.py,sha256=g6gOJUrtQrSH2Hh6np2JgDqnWKVIWcV8SpMlkxApNgw,30210
+easyrip/__main__.py,sha256=AEYyrxi1iUR7nEU7zln8JEHmetjhLqOue4VhFZFR5gI,5158
+easyrip/easyrip_command.py,sha256=1_CbICn_4U6xKEt0TCU753Oa2wC7_1966IoKNIdJoWI,30303
 easyrip/easyrip_log.py,sha256=R-dM3CWUBFITtG7GSD1zy4X4MhZqxkoiBPjlIpI76cY,15573
-easyrip/easyrip_main.py,sha256=jadrI1qyjEw_x-RSx6TCxXoqwTIjQbamsen8lA71Ewc,47757
-easyrip/easyrip_prompt.py,sha256=he5gBUDwoDTPyriizFnwY39SX3UHV3eX6cHrCM7OdvI,6644
-easyrip/global_val.py,sha256=q5DwBxWzBDjF2w-1TYxm9YeZmz65ttkgytFuJjGuCsI,866
+easyrip/easyrip_main.py,sha256=9KMpKUal8ApWZr80AQ7UwO1n6HUSWeVo2SuJ4pMW1f8,48130
+easyrip/easyrip_prompt.py,sha256=TOmRJDigGRz7wRWFNakJdfNI1tn9vGekq6FH5ypmQfA,7068
+easyrip/global_val.py,sha256=DRe2CSZP2HEBCcvEUVQRQLqR9_AfEQx-rQiYyjp7-NM,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
@@ -24,9 +24,9 @@ easyrip/ripper/sub_and_font/__init__.py,sha256=cBT7mxL7RRFaJXFPXuZ7RT-YK6FbnanaU
 easyrip/ripper/sub_and_font/ass.py,sha256=EhDkVY5JXU77euWPId7H2v85j444m8ZLm7wUid7TYd8,35307
 easyrip/ripper/sub_and_font/font.py,sha256=X2dPcPzbwQf3fv_g_mxO-zY7puVAX9Nv-9QHn88q4oA,7745
 easyrip/ripper/sub_and_font/subset.py,sha256=--rAA3VH1rm_jBOC3yMs3rOJpn3tPuvfXqkimbBtx3s,18653
-easyrip-4.13.3.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-easyrip-4.13.3.dist-info/METADATA,sha256=fgp3xx0u6tSa8VIrAxNWMUYHSjotJOsDVF6eILHJZ20,3507
-easyrip-4.13.3.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-easyrip-4.13.3.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
-easyrip-4.13.3.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
-easyrip-4.13.3.dist-info/RECORD,,
+easyrip-4.14.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+easyrip-4.14.0.dist-info/METADATA,sha256=NiCk9-cdBcFFvcSrKArJmsZKCZheat4MnfPKmLkJ7zo,3507
+easyrip-4.14.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+easyrip-4.14.0.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
+easyrip-4.14.0.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
+easyrip-4.14.0.dist-info/RECORD,,