easyrip 4.13.2__tar.gz → 4.14.0__tar.gz

{easyrip-4.13.2 → easyrip-4.14.0}/PKG-INFO

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

{easyrip-4.13.2 → easyrip-4.14.0}/easyrip/__main__.py

@@ -23,7 +23,12 @@ from .easyrip_command import (
 )
 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
 
 
@@ -128,6 +133,7 @@ def run() -> NoReturn:
                     (
                         _ctv_to_nc(cmd_ctv_tuple),
                         OptCompleter(opt_tree=_ctv_to_nd(ct.value for ct in Opt_type)),
+                        CustomPromptCompleter(),
                     )
                 ),
                 history=prompt_history,

{easyrip-4.13.2 → easyrip-4.14.0}/easyrip/easyrip_command.py

@@ -253,12 +253,22 @@ class Cmd_type(enum.Enum):
         description=(
             "history\n"  # .
             "  Show prompt history\n"
-            "clear | clean\n"
-            "  Delete history file"
+            "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-4.13.2 → easyrip-4.14.0}/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}",)
@@ -775,8 +775,36 @@ def run_command(command: Iterable[str] | str) -> bool:
                     ) as f:
                         for line in f.read().splitlines():
                             log.send(line, is_format=False)
-                case "clear" | "clean":
-                    easyrip_prompt.clear()
+
+                case "history_clear":
+                    easyrip_prompt.clear_history()
+
+                case "add":
+                    _name = cmd_list[2]
+                    _cmd = (
+                        command.split(maxsplit=3)[-1]
+                        if isinstance(command, str)
+                        else " ".join(cmd_list[3:])
+                    )
+                    if " " in _name:
+                        log.error("The name must not contain spaces")
+                        return False
+                    log.info("Add custom prompt {!r} = {!r}", _name, _cmd)
+                    return easyrip_prompt.add_custom_prompt(_name, _cmd)
+
+                case "del":
+                    _name = cmd_list[2]
+                    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]):

easyrip-4.14.0/easyrip/easyrip_prompt.py

@@ -0,0 +1,232 @@
+import os
+import re
+import tomllib
+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
+from .utils import type_match
+
+
+class easyrip_prompt:
+    PROMPT_HISTORY_FILE = get_CONFIG_DIR() / "prompt_history.txt"
+    PROMPT_CUSTOM_FILE = get_CONFIG_DIR() / "prompt_custom.toml"
+
+    __prompt_custom_data: dict[str, str] | None = None
+
+    @classmethod
+    def clear_history(cls) -> None:
+        cls.PROMPT_HISTORY_FILE.unlink(True)
+
+    @classmethod
+    def get_custom_prompt(cls) -> dict[str, str]:
+        if cls.__prompt_custom_data is not None:
+            return cls.__prompt_custom_data
+
+        cls.PROMPT_CUSTOM_FILE.touch()
+        with cls.PROMPT_CUSTOM_FILE.open("rb") as f:
+            data = tomllib.load(f)
+            assert type_match(data, dict[str, str])
+            cls.__prompt_custom_data = data
+            return data
+
+    @classmethod
+    def update_custom_prompt(cls, data: dict[str, str]) -> bool:
+        cls.PROMPT_CUSTOM_FILE.touch()
+        with cls.PROMPT_CUSTOM_FILE.open("wt", encoding="utf-8", newline="\n") as f:
+            f.writelines(f"{k!r} = {v!r}\n" for k, v in data.items())
+        cls.__prompt_custom_data = None
+        return True
+
+    @classmethod
+    def add_custom_prompt(cls, name: str, cmd: str) -> bool:
+        data: dict[str, str] = cls.get_custom_prompt()
+        assert type_match(data, dict[str, str])
+
+        if name in data:
+            from .easyrip_log import log
+
+            log.error("The name {!r} is already in custom prompt", name)
+            return False
+
+        data[name] = cmd
+
+        cls.update_custom_prompt(data)
+
+        return True
+
+    @classmethod
+    def del_custom_prompt(cls, name: str) -> bool:
+        data: dict[str, str] = cls.get_custom_prompt()
+
+        pop_res: bool
+        if name in data:
+            data.pop(name)
+            pop_res = True
+            cls.update_custom_prompt(data)
+        else:
+            from .easyrip_log import log
+
+            log.warning("The name {!r} not in custom prompt", name)
+            pop_res = False
+
+        return pop_res
+
+
+class ConfigFileHistory(FileHistory):
+    def store_string(self, string: str) -> None:
+        if not string.startswith(C_Z):
+            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 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 _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=_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-4.13.2 → easyrip-4.14.0}/easyrip/global_val.py

@@ -4,7 +4,7 @@ from functools import cache
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.13.2"
+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.2 → easyrip-4.14.0}/easyrip.egg-info/PKG-INFO

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

easyrip-4.13.2/easyrip/easyrip_prompt.py

@@ -1,151 +0,0 @@
-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