easyrip 4.13.1__tar.gz → 4.13.3__tar.gz

{easyrip-4.13.1 → easyrip-4.13.3}/PKG-INFO

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

{easyrip-4.13.1 → easyrip-4.13.3}/easyrip/__main__.py

@@ -17,6 +17,8 @@ from .easyrip_command import (
     Cmd_type,
     Cmd_type_val,
     CmdCompleter,
+    FuzzyCompleter,
+    NestedCompleter,
     Opt_type,
     OptCompleter,
     nested_dict,
@@ -128,6 +130,14 @@ 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()
+                                }
+                            ),
+                        ),
                     )
                 ),
                 history=prompt_history,

{easyrip-4.13.1 → easyrip-4.13.3}/easyrip/easyrip_command.py

@@ -254,11 +254,18 @@ class Cmd_type(enum.Enum):
             "history\n"  # .
             "  Show prompt history\n"
             "clear | clean\n"
-            "  Delete history file"
+            "  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"
         ),
         childs=(
             Cmd_type_val(("history",)),
             Cmd_type_val(("clear", "clean")),
+            Cmd_type_val(("add",)),
+            Cmd_type_val(("del",)),
         ),
     )
     translate = Cmd_type_val(

{easyrip-4.13.1 → easyrip-4.13.3}/easyrip/easyrip_main.py

@@ -775,8 +775,27 @@ 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()
+                    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 Cmd_type.translate:
             if not (_infix := cmd_list[1]):

{easyrip-4.13.1 → easyrip-4.13.3}/easyrip/easyrip_prompt.py

@@ -1,5 +1,6 @@
 import os
 import re
+import tomllib
 from collections.abc import Iterable
 
 from prompt_toolkit.completion import CompleteEvent, Completer, Completion
@@ -8,15 +9,73 @@ 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(cls) -> None:
+    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:

{easyrip-4.13.1 → easyrip-4.13.3}/easyrip/global_val.py

@@ -4,7 +4,7 @@ from functools import cache
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.13.1"
+PROJECT_VERSION = "4.13.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.13.1 → easyrip-4.13.3}/easyrip/ripper/ripper.py

@@ -474,17 +474,21 @@ class Ripper:
                         f"-map 0:{_audio_info.index} -c:a {_encoder} {ffparams_out} "
                         f'"{_new_output_str}.wav" '
                     )
-                    _flac_encode_str_list = [
-                        (
-                            f"flac -j 32 -8 -e -p -l {'19' if _audio_info.sample_rate > 48000 else '12'} "
-                            f'-o "{_new_output_str}.flac" "{_new_output_str}.wav"'
-                        ),
-                        f'{cmd_head_del} "{_new_output_str}.wav"',
-                    ]
+                    _flac_encode_str_list.extend(
+                        [
+                            (
+                                f"flac -j 32 -8 -e -p -l {'19' if _audio_info.sample_rate > 48000 else '12'} "
+                                f'-o "{_new_output_str}.flac" "{_new_output_str}.wav"'
+                            ),
+                            f'{cmd_head_del} "{_new_output_str}.wav"',
+                        ]
+                    )
 
                     _mux_flac_input_list.append(f'"{_new_output_str}.flac"')
 
-                    _del_flac_str_list = [f'{cmd_head_del} "{_new_output_str}.flac" ']
+                    _del_flac_str_list.append(
+                        f'{cmd_head_del} "{_new_output_str}.flac" '
+                    )
 
                 match len(_mux_flac_input_list):
                     case 0:

{easyrip-4.13.1 → easyrip-4.13.3}/easyrip.egg-info/PKG-INFO

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