easyrip 4.1.0__py3-none-any.whl → 4.3.0__py3-none-any.whl

easyrip/__main__.py

@@ -6,9 +6,10 @@ import Crypto
 import fontTools
 import prompt_toolkit
 from prompt_toolkit import ANSI, prompt
-from prompt_toolkit.completion import FuzzyCompleter, PathCompleter, merge_completers
+from prompt_toolkit.completion import PathCompleter, merge_completers
 from prompt_toolkit.history import InMemoryHistory
-from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit.key_binding import KeyBindings, KeyPressEvent
+from prompt_toolkit.keys import Keys
 
 from .easyrip_command import (
     Cmd_type,
@@ -18,7 +19,10 @@ from .easyrip_command import (
     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, easyrip_prompt
+from .global_val import C_D, C_Z
 
 
 def run() -> NoReturn:
@@ -36,11 +40,15 @@ def run() -> NoReturn:
 
     key_bindings = KeyBindings()
 
-    @key_bindings.add("c-d")
-    def _(event) -> None:
-        event.app.current_buffer.insert_text("\x04")  # ^D
+    @key_bindings.add(Keys.ControlC)
+    def _(event: KeyPressEvent) -> None:
+        event.app.exit(exception=KeyboardInterrupt, style="class:exiting")
 
-    path_completer = FuzzyCompleter(PathCompleter())
+    @key_bindings.add(Keys.ControlD)
+    def _(event: KeyPressEvent) -> None:
+        event.app.current_buffer.insert_text(C_D)
+
+    path_completer = PathCompleter()
 
     def _ctv_to_nc(ctvs: Iterable[Cmd_type_val]) -> CmdCompleter:
         return CmdCompleter(
@@ -92,7 +100,11 @@ def run() -> NoReturn:
         }
 
     cmd_ctv_tuple = tuple(ct.value for ct in Cmd_type if ct != Cmd_type.Option)
-    prompt_history = InMemoryHistory()
+    prompt_history = (
+        ConfigFileHistory(easyrip_prompt.PROMPT_HISTORY_FILE)
+        if config.get_user_profile(Config_key.prompt_history_save_file)
+        else InMemoryHistory()
+    )
     while True:
         try:
             command = prompt(
@@ -107,7 +119,7 @@ def run() -> NoReturn:
                 history=prompt_history,
                 complete_while_typing=True,
             )
-            if command.startswith("\x1a"):  # ^Z
+            if command.startswith(C_Z):
                 raise EOFError
         except KeyboardInterrupt:
             continue

easyrip/easyrip_command.py

@@ -3,10 +3,11 @@ import itertools
 import textwrap
 from collections.abc import Iterable
 from dataclasses import dataclass
-from typing import Final, Self, TypeAlias, final
+from typing import Final, Self, final
 
 from prompt_toolkit.completion import (
     Completer,
+    DeduplicateCompleter,
     FuzzyCompleter,
     FuzzyWordCompleter,
     NestedCompleter,
@@ -17,6 +18,7 @@ from prompt_toolkit.completion.base import CompleteEvent, Completion
 from prompt_toolkit.document import Document
 
 from . import global_val
+from .easyrip_config.config_key import Config_key
 
 
 @final
@@ -175,19 +177,22 @@ class Cmd_type(enum.Enum):
     )
     run = Cmd_type_val(
         ("run",),
-        param="[<run option>]",
+        param="[<run option>] [-multithreading <0 | 1>]",
         description=(
             "Run the Ripper in the Ripper list\n"
-            " \n"
+            "\n"
             "Default:\n"
             "  Only run\n"
-            " \n"
+            "\n"
             "exit:\n"
             "  Close program when run finished\n"
-            " \n"
+            "\n"
             "shutdown [<sec>]:\n"
             "  Shutdown when run finished\n"
-            "  Default: 60"
+            "  Default: 60\n"
+            "\n"
+            "server [<address>]:[<port>]@[<password>]:\n"
+            "  See the corresponding help for details"
         ),
         childs=(
             Cmd_type_val(("exit",)),
@@ -196,22 +201,18 @@ class Cmd_type(enum.Enum):
     )
     server = Cmd_type_val(
         ("server",),
-        param="[[-a | -address] <address>[:<port>] [[-p | -password] <password>]]",
+        param="[<address>]:[<port>]@[<password>]",
         description=(
             "Boot web service\n"
             "Default: server localhost:0\n"
             "Client send command 'kill' can exit Ripper's run, note that FFmpeg needs to accept multiple ^C signals to forcibly terminate, and a single ^C signal will wait for the file output to be complete before terminating"
         ),
-        childs=(
-            Cmd_type_val(("-a", "-address")),
-            Cmd_type_val(("-p", "-password")),
-        ),
     )
     config = Cmd_type_val(
         ("config",),
         param="<config option>",
         description=(
-            "regenerate | clear | clean | reset\n"
+            "regenerate | clear | clean\n"
             "  Regenerate config file\n"
             "open\n"
             "  Open the directory where the config file is located\n"
@@ -222,10 +223,27 @@ class Cmd_type(enum.Enum):
             "  e.g. config set language zh"
         ),
         childs=(
-            Cmd_type_val(("regenerate", "clear", "clean", "reset")),
+            Cmd_type_val(("regenerate", "clear", "clean")),
             Cmd_type_val(("open",)),
             Cmd_type_val(("list",)),
-            Cmd_type_val(("set",)),
+            Cmd_type_val(
+                ("set",),
+                childs=tuple(Cmd_type_val((k,)) for k in Config_key._value2member_map_),
+            ),
+        ),
+    )
+    prompt = Cmd_type_val(
+        ("prompt",),
+        param="<prompt option>",
+        description=(
+            "history\n"  # .
+            "  Show prompt history\n"
+            "clear | clean\n"
+            "  Delete history file"
+        ),
+        childs=(
+            Cmd_type_val(("history",)),
+            Cmd_type_val(("clear", "clean")),
         ),
     )
     translate = Cmd_type_val(
@@ -545,16 +563,19 @@ class Opt_type(enum.Enum):
         param="[<string>]",
         description=(
             "Run the Ripper from the Ripper list\n"
-            " \n"
+            "\n"
             "Default:\n"
             "  Only run\n"
-            " \n"
+            "\n"
             "exit:\n"
             "  Close program when run finished\n"
-            " \n"
+            "\n"
             "shutdown [<sec>]:\n"
             "  Shutdown when run finished\n"
             "  Default: 60\n"
+            "\n"
+            "server [<address>]:[<port>]@[<password>]:\n"
+            "  See the corresponding help for details"
         ),
         childs=(
             Cmd_type_val(("exit",)),
@@ -665,7 +686,7 @@ def get_help_doc() -> str:
     )
 
 
-nested_dict: TypeAlias = dict[str, "nested_dict | Completer"]
+type nested_dict = dict[str, "nested_dict | Completer"]
 META_DICT_OPT_TYPE = {
     name: opt.value.param for opt in Opt_type for name in opt.value.names
 }
@@ -746,7 +767,17 @@ class OptCompleter(Completer):
                     )
                 )
 
-        if isinstance(opt_tree_pos_list[-1], Completer):
+        if opt_tree_pos_list[-1] is not self.opt_tree and not text.endswith(" "):
+            yield from (
+                Completion(
+                    text=words[-1],
+                    start_position=-len(words[-1]),
+                    display_meta=META_DICT_OPT_TYPE.get(words[-1], ""),
+                ),
+                Completion(text="", display="✔"),
+            )
+
+        elif isinstance(opt_tree_pos_list[-1], Completer):
             # 直接使用 PathCompleter 会因为上下文问题失效，所以将上文套进 NestedCompleter
             new_nd: nested_dict = {}
             new_nd_pos: nested_dict = new_nd
@@ -767,11 +798,22 @@ class OptCompleter(Completer):
 
             yield from merge_completers(
                 (
-                    _nested_dict_to_nc(new_nd),
-                    FuzzyWordCompleter(
-                        words=tuple(opt_tree_pos_list[-1]),
-                        meta_dict=META_DICT_OPT_TYPE,
-                        WORD=True,
+                    DeduplicateCompleter(
+                        merge_completers(
+                            (
+                                _nested_dict_to_nc(new_nd),
+                                FuzzyCompleter(_nested_dict_to_nc(new_nd), WORD=True),
+                            )
+                        )
+                    ),
+                    FuzzyCompleter(
+                        WordCompleter(
+                            words=tuple(opt_tree_pos_list[-1]),
+                            meta_dict=META_DICT_OPT_TYPE,
+                            WORD=True,  # 匹配标点
+                            match_middle=True,
+                        ),
+                        WORD=False,
                     ),
                 )
             ).get_completions(document=document, complete_event=complete_event)
@@ -779,10 +821,16 @@ class OptCompleter(Completer):
         else:
             yield from FuzzyCompleter(
                 WordCompleter(
-                    words=tuple(opt_tree_pos_list[-1]),
+                    words=tuple(
+                        opt_tree_pos_list[-1] | {}
+                        if text.endswith(" ")
+                        or len(words) <= 1
+                        or isinstance(opt_tree_pos_list[-2], Completer)
+                        else opt_tree_pos_list[-2]
+                    ),
                     meta_dict=META_DICT_OPT_TYPE,
-                    WORD=True,
+                    WORD=True,  # 匹配标点
                     match_middle=True,
                 ),
-                WORD=False,
+                WORD=not text.endswith(" "),
             ).get_completions(document=document, complete_event=complete_event)

easyrip/{easyrip_config.py → easyrip_config/config.py}

@@ -1,26 +1,11 @@
-import enum
 import json
 import os
-import sys
 from pathlib import Path
 
-from . import global_val
-from .easyrip_log import log
-from .easyrip_mlang import all_supported_lang_map, gettext
-
-PROJECT_NAME = global_val.PROJECT_NAME
-CONFIG_VERSION = "2.9.4"
-
-
-class Config_key(enum.Enum):
-    language = "language"
-    check_update = "check_update"
-    check_dependent = "check_dependent"
-    startup_directory = "startup_directory"
-    force_log_file_path = "force_log_file_path"
-    log_print_level = "log_print_level"
-    log_write_level = "log_write_level"
-
+from ..easyrip_log import log
+from ..easyrip_mlang import all_supported_lang_map, gettext
+from ..global_val import CONFIG_DIR
+from .config_key import CONFIG_VERSION, Config_key
 
 CONFIG_DEFAULT_DICT: dict[Config_key, str | bool] = {
     Config_key.language: "auto",
@@ -30,6 +15,7 @@ CONFIG_DEFAULT_DICT: dict[Config_key, str | bool] = {
     Config_key.force_log_file_path: "",
     Config_key.log_print_level: log.LogLevel.send.name,
     Config_key.log_write_level: log.LogLevel.send.name,
+    Config_key.prompt_history_save_file: True,
 }
 
 
@@ -40,19 +26,8 @@ class config:
 
     @classmethod
     def init(cls) -> None:
-        if sys.platform == "win32":
-            # Windows: C:\Users\<用户名>\AppData\Roaming\<app_name>
-            cls._config_dir = Path(os.getenv("APPDATA", ""))
-        elif sys.platform == "darwin":
-            # macOS: ~/Library/Application Support/<app_name>
-            cls._config_dir = (
-                Path(os.path.expanduser("~")) / "Library" / "Application Support"
-            )
-        else:
-            # Linux: ~/.config/<app_name>
-            cls._config_dir = Path(os.path.expanduser("~")) / ".config"
-        cls._config_dir = Path(cls._config_dir) / PROJECT_NAME
-        cls._config_file = Path(cls._config_dir) / "config.json"
+        cls._config_dir = CONFIG_DIR
+        cls._config_file = cls._config_dir / "config.json"
 
         if not cls._config_file.is_file():
             cls._config_dir.mkdir(exist_ok=True)
@@ -149,7 +124,11 @@ class config:
         return cls._write_config()
 
     @classmethod
-    def get_user_profile(cls, key: str) -> str | int | float | bool | None:
+    def get_user_profile(
+        cls, config_key: Config_key | str
+    ) -> str | int | float | bool | None:
+        key = config_key.value if isinstance(config_key, Config_key) else config_key
+
         if cls._config is None:
             cls._read_config()
         if cls._config is None:
@@ -216,6 +195,10 @@ class config:
                     CONFIG_DEFAULT_DICT[Config_key.log_write_level],
                     ", ".join(log.LogLevel._member_names_),
                 ),
+                Config_key.prompt_history_save_file.value: gettext(
+                    "Save prompt history to config directory, otherwise save to memory. Take effect after reboot. Default: {}",
+                    CONFIG_DEFAULT_DICT[Config_key.prompt_history_save_file],
+                ),
             }
             | (cls._config or {})
         ).get(key, "None about")

easyrip/easyrip_config/config_key.py

@@ -0,0 +1,14 @@
+import enum
+
+CONFIG_VERSION = "4.2.0"
+
+
+class Config_key(enum.Enum):
+    language = "language"
+    check_update = "check_update"
+    check_dependent = "check_dependent"
+    startup_directory = "startup_directory"
+    force_log_file_path = "force_log_file_path"
+    log_print_level = "log_print_level"
+    log_write_level = "log_write_level"
+    prompt_history_save_file = "prompt_history_file"

easyrip/easyrip_main.py

@@ -9,6 +9,7 @@ import subprocess
 import sys
 import threading
 import tkinter as tk
+import tomllib
 from collections.abc import Callable
 from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime
@@ -17,13 +18,11 @@ from pathlib import Path
 from threading import Thread
 from time import sleep
 from tkinter import filedialog
-from typing import Final
-
-import tomllib
+from typing import Final, Literal
 
 from . import easyrip_mlang, easyrip_web, global_val
 from .easyrip_command import Cmd_type, Opt_type, get_help_doc
-from .easyrip_config import config
+from .easyrip_config.config import Config_key, config
 from .easyrip_log import Event as LogEvent
 from .easyrip_log import log
 from .easyrip_mlang import (
@@ -34,6 +33,7 @@ from .easyrip_mlang import (
     gettext,
     translate_subtitles,
 )
+from .easyrip_prompt import easyrip_prompt
 from .ripper import Media_info, Ripper
 from .ripper.ripper import DEFAULT_PRESET_PARAMS
 from .utils import change_title, check_ver, read_text
@@ -73,7 +73,7 @@ def check_env() -> None:
     try:
         change_title(f"{gettext('Check env...')} {PROJECT_TITLE}")
 
-        if config.get_user_profile("check_dependent"):
+        if config.get_user_profile(Config_key.check_dependent):
             _url = "https://ffmpeg.org/download.html"
             for _name in ("FFmpeg", "FFprobe"):
                 if not shutil.which(_name):
@@ -198,7 +198,7 @@ def check_env() -> None:
             # ).stdout:
             #     log.error("The MediaInfo must be CLI ver")
 
-        if config.get_user_profile("check_update"):
+        if config.get_user_profile(Config_key.check_update):
             log_new_ver(
                 easyrip_web.github.get_latest_release_ver(
                     global_val.PROJECT_RELEASE_API
@@ -369,6 +369,36 @@ def run_ripper_list(
     log.info("Run completed")
 
 
+def get_web_server_params(
+    opt: str,
+) -> Literal[False] | tuple[str, int, str | None]:
+    """[<address>]:[<port>]@[<password>]"""
+    if easyrip_web.http_server.Event.is_run_command:
+        log.error("Can not start multiple services")
+        return False
+
+    if ":" not in opt:
+        log.error("{} param illegal", f"':' not in '{opt}':")
+        return False
+
+    opt_list: list[str] = opt.split(":")
+    opt_list = [opt_list[0], *opt_list[1].split("@")]
+
+    if len(opt_list) != 3:
+        log.error("{} param illegal", f"len('{opt}') != 3:")
+        return False
+
+    host, port, password = opt_list
+
+    port = port or "0"
+
+    if not port.isdigit():
+        log.error("{} param illegal", f"The port in '{opt}' not a digit:")
+        return False
+
+    return (host or "", int(port), password)
+
+
 def run_command(command: list[str] | str) -> bool:
     if isinstance(command, list):
         cmd_list = command
@@ -564,8 +594,12 @@ def run_command(command: list[str] | str) -> bool:
                         log.error("list index out of range")
 
         case Cmd_type.run:
-            is_run_exit = False
+            is_run_exit: bool = False
+
+            _web_server_params = None
+
             _enable_multithreading: bool = False
+
             _shutdown_sec_str: str | None = None
 
             _skip_run_param: int = 0
@@ -594,6 +628,13 @@ def run_command(command: list[str] | str) -> bool:
                             log.error("{} need param", cmd)
                             return False
 
+                    case "server":
+                        _skip_run_param += 1
+                        if (
+                            _web_server_params := get_web_server_params(cmd_list[2])
+                        ) is False:
+                            return False
+
                     case "-multithreading":
                         _skip_run_param += 1
                         if i + 1 < len(cmd_list[1:]):
@@ -606,58 +647,32 @@ def run_command(command: list[str] | str) -> bool:
                         log.error("Unsupported param: {}", param)
                         return False
 
-            run_ripper_list(
-                is_exit_when_run_finished=is_run_exit,
-                shutdow_sec_str=_shutdown_sec_str,
-                enable_multithreading=_enable_multithreading,
-            )
-
-        case Cmd_type.server:
-            if easyrip_web.http_server.Event.is_run_command:
-                log.error("Can not start multiple services")
-                return False
-
-            address, password = None, None
-
-            for i in range(1, len(cmd_list)):
-                match cmd_list[i]:
-                    case "-a" | "-address":
-                        address = cmd_list[i + 1]
-                    case "-p" | "-password":
-                        password = cmd_list[i + 1]
-                    case _:
-                        if address is None:
-                            address = cmd_list[i]
-                        elif password is None:
-                            password = cmd_list[i]
-            if address:
-                res = re.match(
-                    r"^([a-zA-Z0-9.-]+)(:(\d+))?$",
-                    address,
+            if _web_server_params is None:
+                run_ripper_list(
+                    is_exit_when_run_finished=is_run_exit,
+                    shutdow_sec_str=_shutdown_sec_str,
+                    enable_multithreading=_enable_multithreading,
                 )
-                if res:
-                    host = res.group(1)
-                    port = res.group(2)
-                    if port:
-                        port = int(port.lstrip(":"))
-                    elif host.isdigit():
-                        port = int(host)
-                        host = None
-                    else:
-                        port = None
-                        host = None
-                else:
-                    host, port = "localhost", 0
             else:
-                host, port = "localhost", 0
+                easyrip_web.run_server(
+                    *_web_server_params,
+                    after_start_server_hook=lambda: run_ripper_list(
+                        is_exit_when_run_finished=is_run_exit,
+                        shutdow_sec_str=_shutdown_sec_str,
+                        enable_multithreading=_enable_multithreading,
+                    ),
+                )
 
-            easyrip_web.run_server(host=host or "", port=port or 0, password=password)
+        case Cmd_type.server:
+            if (_params := get_web_server_params(cmd_list[1])) is False:
+                return False
+            easyrip_web.run_server(*_params)
 
         case Cmd_type.config:
             match cmd_list[1]:
                 case "list" | "":
                     config.show_config_list()
-                case "clear" | "clean" | "reset" | "regenerate":
+                case "regenerate" | "clear" | "clean":
                     config.regenerate_config()
                     init()
                 case "open":
@@ -703,6 +718,17 @@ def run_command(command: list[str] | str) -> bool:
                     log.error("Unsupported param: {}", param)
                     return False
 
+        case Cmd_type.prompt:
+            match cmd_list[1]:
+                case "history":
+                    with easyrip_prompt.PROMPT_HISTORY_FILE.open(
+                        "rt", encoding="utf-8"
+                    ) as f:
+                        for line in f.read().splitlines():
+                            log.send(line, is_format=False)
+                case "clear" | "clean":
+                    easyrip_prompt.clear()
+
         case Cmd_type.translate:
             if not (_infix := cmd_list[1]):
                 log.error("Need target infix")
@@ -761,6 +787,7 @@ def run_command(command: list[str] | str) -> bool:
             preset_name: str | Ripper.PresetName | None = None
             option_map: dict[str, str] = {}
             is_run: bool = False
+            web_server_params = None
             is_exit_when_run_finished: bool = False
             shutdown_sec_str: str | None = None
             enable_multithreading: bool = False
@@ -829,6 +856,13 @@ def run_command(command: list[str] | str) -> bool:
                             case "shutdown":
                                 shutdown_sec_str = cmd_list[i + 2] or "60"
                                 _skip += 1
+                            case "server":
+                                web_server_params = get_web_server_params(
+                                    cmd_list[i + 2]
+                                )
+                                if web_server_params is False:
+                                    return False
+                                _skip += 1
                             case _:
                                 _skip -= 1
 
@@ -1023,11 +1057,21 @@ def run_command(command: list[str] | str) -> bool:
                 return False
 
             if is_run:
-                run_ripper_list(
-                    is_exit_when_run_finished=is_exit_when_run_finished,
-                    shutdow_sec_str=shutdown_sec_str,
-                    enable_multithreading=enable_multithreading,
-                )
+                if web_server_params is None:
+                    run_ripper_list(
+                        is_exit_when_run_finished=is_exit_when_run_finished,
+                        shutdow_sec_str=shutdown_sec_str,
+                        enable_multithreading=enable_multithreading,
+                    )
+                else:
+                    easyrip_web.run_server(
+                        *web_server_params,
+                        after_start_server_hook=lambda: run_ripper_list(
+                            is_exit_when_run_finished=is_exit_when_run_finished,
+                            shutdow_sec_str=shutdown_sec_str,
+                            enable_multithreading=enable_multithreading,
+                        ),
+                    )
 
     return True
 
@@ -1045,7 +1089,10 @@ def init(is_first_run: bool = False) -> None:
     # 设置语言
     _sys_lang = get_system_language()
     Global_lang_val.gettext_target_lang = _sys_lang
-    if (_lang_config := config.get_user_profile("language")) not in {"auto", None}:
+    if (_lang_config := config.get_user_profile(Config_key.language)) not in {
+        "auto",
+        None,
+    }:
         Global_lang_val.gettext_target_lang = Lang_tag.from_str(str(_lang_config))
 
     # 设置日志文件路径名
@@ -1056,10 +1103,10 @@ def init(is_first_run: bool = False) -> None:
     # 设置日志级别
     try:
         log.print_level = getattr(
-            log.LogLevel, str(config.get_user_profile("log_print_level"))
+            log.LogLevel, str(config.get_user_profile(Config_key.log_print_level))
         )
         log.write_level = getattr(
-            log.LogLevel, str(config.get_user_profile("log_write_level"))
+            log.LogLevel, str(config.get_user_profile(Config_key.log_write_level))
         )
     except Exception as e:
         log.error(f"{e!r} {e}", deep=True)
@@ -1067,7 +1114,7 @@ def init(is_first_run: bool = False) -> None:
     if is_first_run:
         # 设置启动目录
         try:
-            if _path := str(config.get_user_profile("startup_directory")):
+            if _path := str(config.get_user_profile(Config_key.startup_directory)):
                 os.chdir(_path)
         except Exception as e:
             log.error(f"{e!r} {e}", deep=True)

easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -71,21 +71,24 @@ LANG_MAP: dict[str, str] = {
         "<int> <int>:\n"
         "  交换指定索引"
     ),
-    Cmd_type.run.value.param: "<run 选项>",
+    Cmd_type.run.value.param: "[<run 选项>] [-multithreading <0 | 1>]",
     Cmd_type.run.value.description: (
         "执行 Ripper list 中的 Ripper\n"
-        " \n"
+        "\n"
         "默认:\n"
         "  仅执行\n"
-        " \n"
+        "\n"
         "exit:\n"
         "  执行后退出程序\n"
-        " \n"
+        "\n"
         "shutdown [<秒数>]:\n"
         "  执行后关机\n"
-        "  默认: 60"
+        "  默认: 60\n"
+        "\n"
+        "server [<地址>]:[<端口>]@[<密码>]:\n"
+        "  详见对应的 help"
     ),
-    Cmd_type.server.value.param: "[[-a | -address] <地址>[:<端口>] [[-p | -password] <密码>]]",
+    Cmd_type.server.value.param: "[<地址>]:[<端口>]@[<密码>]",
     Cmd_type.server.value.description: (
         "启动 web 服务\n"
         "默认: server localhost:0\n"
@@ -103,6 +106,7 @@ LANG_MAP: dict[str, str] = {
         "  设置 config\n"
         "  例如 config set language en"
     ),
+    Cmd_type.prompt.value.param: "<prompt 选项>",
     Cmd_type.translate.value.param: "<中缀> <目标语言标签> [-overwrite]",
     Cmd_type.translate.value.description: (
         "翻译字幕文件\n"
@@ -238,16 +242,19 @@ LANG_MAP: dict[str, str] = {
     ),
     Opt_type._run.value.description: (
         "执行 Ripper list 中的 Ripper\n"
-        " \n"
+        "\n"
         "默认:\n"
         "  仅执行\n"
-        " \n"
+        "\n"
         "exit:\n"
         "  执行后退出程序\n"
-        " \n"
+        "\n"
         "shutdown [<秒数>]:\n"
         "  执行后关机\n"
-        "  默认: 60"
+        "  默认: 60\n"
+        "\n"
+        "server [<地址>]:[<端口>]@[<密码>]:\n"
+        "  详见对应的 help"
     ),
     Opt_type._ff_params_ff.value.description: (
         "设置 FFmpeg 的全局选项\n"  # .
@@ -353,6 +360,7 @@ LANG_MAP: dict[str, str] = {
     "User profile is not a valid dictionary": "用户配置文件不是有效的字典",
     "User profile is not found": "用户配置文件不存在",
     "Key '{}' is not found in user profile": "用户配置文件中不存在 {}",
+    "Save prompt history to config directory, otherwise save to memory. Take effect after reboot. Default: {}": "将 prompt 历史保存到 config 目录，否则保存到内存。重启后生效。默认: {}",
     # config about
     "Easy Rip's language, support incomplete matching. Default: {}. Supported: {}": "Easy Rip 的语言, 支持不完整匹配。默认: {}。支持: {}",
     "Auto check the update of Easy Rip. Default: {}": "自动检测 Easy Rip 更新。默认: {}",

easyrip/easyrip_prompt.py

@@ -0,0 +1,17 @@
+from prompt_toolkit.history import FileHistory
+
+from .global_val import C_Z, CONFIG_DIR
+
+
+class easyrip_prompt:
+    PROMPT_HISTORY_FILE = 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)

easyrip/easyrip_web/http_server.py

@@ -4,6 +4,7 @@ import os
 import secrets
 import signal
 from collections import deque
+from collections.abc import Callable
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from threading import Thread
 from time import sleep
@@ -204,7 +205,13 @@ class MainHTTPRequestHandler(BaseHTTPRequestHandler):
         )
 
 
-def run_server(host: str = "", port: int = 0, password: str | None = None) -> None:
+def run_server(
+    host: str = "",
+    port: int = 0,
+    password: str | None = None,
+    *,
+    after_start_server_hook: Callable[[], None] = lambda: None,
+) -> None:
     from ..easyrip_log import log
 
     MainHTTPRequestHandler.token = secrets.token_urlsafe(16)
@@ -223,6 +230,15 @@ def run_server(host: str = "", port: int = 0, password: str | None = None) -> No
 
     protocol = "HTTP"
 
+    def _hook() -> None:
+        try:
+            after_start_server_hook()
+        finally:
+            Event.is_run_command = False
+
+    Event.is_run_command = True
+    Thread(target=_hook, daemon=True).start()
+
     log.info(
         "Starting {protocol} service on port {port}...",
         protocol=protocol,

easyrip/global_val.py

@@ -1,5 +1,25 @@
+import os
+import sys
+from pathlib import Path
+
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.1.0"
+PROJECT_VERSION = "4.3.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"
+
+
+if sys.platform == "win32":
+    # Windows: C:\Users\<用户名>\AppData\Roaming\<app_name>
+    __config_dir = Path(os.getenv("APPDATA", ""))
+elif sys.platform == "darwin":
+    # macOS: ~/Library/Application Support/<app_name>
+    __config_dir = Path(os.path.expanduser("~")) / "Library" / "Application Support"
+else:
+    # Linux: ~/.config/<app_name>
+    __config_dir = Path(os.path.expanduser("~")) / ".config"
+CONFIG_DIR = Path(__config_dir) / PROJECT_NAME
+
+
+C_D = "\x04"
+C_Z = "\x1a"

{easyrip-4.1.0.dist-info → easyrip-4.3.0.dist-info}/METADATA

@@ -1,10 +1,12 @@
 Metadata-Version: 2.4
 Name: easyrip
-Version: 4.1.0
-Project-URL: Repository, https://github.com/op200/EasyRip
+Version: 4.3.0
+Author: op200
+License-Expression: AGPL-3.0-or-later
+Project-URL: Homepage, https://github.com/op200/EasyRip
+Project-URL: Source, https://github.com/op200/EasyRip
 Classifier: Topic :: Multimedia
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
@@ -21,13 +23,7 @@ License-File: LICENSE
 Requires-Dist: prompt-toolkit>=3.0.52
 Requires-Dist: fonttools>=4.61.0
 Requires-Dist: pycryptodome>=3.21.0
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
 Dynamic: license-file
-Dynamic: project-url
-Dynamic: requires-dist
-Dynamic: requires-python
 
 # Easy Rip
 
@@ -39,31 +35,17 @@ Easy Rip 网页版控制台](https://op200.github.io/EasyRip-WebPanel/)**
 
 ## Start
 
-* If you have Python environment  
-  如果你有 Python 环境
+1. Install [Python](https://www.python.org/)  
+  安装 [Python](https://www.python.org/)
+2. Install Easy Rip using pip: `pip install -U easyrip`  
+  使用 pip 安装 Easy Rip: `pip install -U easyrip`
+3. The you can use Easy Rip directly, run the command `easyrip`  
+  然后你就可以直接 Easy Rip 了，运行命令 `easyrip`
 
-  1. You can `pip install -U git+https://github.com/op200/EasyRip.git` to pull the version from the repositoryand, or `pip install -U easyrip` to obtain the stable version.  
-     你可以 `pip install -U git+https://github.com/op200/EasyRip.git` 获取仓库中的版本，或者 `pip install -U easyrip` 获取稳定版。
-
-  2. After installation, run `easyrip` on command.  
-     安装后直接在命令行运行 `easyrip`。
-
-* Or if you want to download a standalone exe file (not recommended)  
-  或者如果你想下载一个独立的可执行文件（不推荐）
-
-  *
-    Download exe in [Actions](https://github.com/op200/EasyRip/actions).
-    Or download exe or bat script collection in [Releases](https://github.com/op200/EasyRip/releases).
-
-    在 [Actions](https://github.com/op200/EasyRip/actions) 中下载最新的 exe。
-    或者在 [Releases](https://github.com/op200/EasyRip/releases) 中下载 exe 或 bat 脚本包。
-
-  *
-    The file `BatchScriptPackage` in [Releases](https://github.com/op200/EasyRip/releases) is a bat script collection.
-    It is used to facilitate ordinary users, it only has Chinese.
-
-    [Releases](https://github.com/op200/EasyRip/releases) 中每隔一段时间发布一次名为 BatchScriptPackage 的 bat 脚本包  
-    用于方便一般用户，其内只有中文
+* (If you have special requirements and want to use a separate file, you can download it from [Github Actions](https://github.com/op200/EasyRip/actions))  
+  (如果你有特殊需求，想使用独立文件，可以在 [Github Actions](https://github.com/op200/EasyRip/actions) 中下载)
+* (The file `BatchScriptPackage` in [Releases](https://github.com/op200/EasyRip/releases) is a bat script collection. It is used to facilitate ordinary users, it only has Chinese.)  
+  ([Releases](https://github.com/op200/EasyRip/releases) 中每隔一段时间发布一次名为 `BatchScriptPackage` 的 bat 脚本包，用于方便一般用户，其内只有中文。)
 
 ## Usage
 
@@ -75,7 +57,7 @@ Run `easyrip`, input `help` to get help doc
 
 ## Dependency
 
-* ### Python 3.13 (must >=3.12)
+* ### Python 3.14 (must >=3.12)
 
   If you want to develop, you need to install dependencies. If you just want to use them, you don't need to manually install dependencies.  
   如果你想开发，需要安装依赖，如果你只是想使用，不需要手动安装依赖。

{easyrip-4.1.0.dist-info → easyrip-4.3.0.dist-info}/RECORD

@@ -1,18 +1,20 @@
 easyrip/__init__.py,sha256=BlDIN9htmQXETt7M8pjYSOVrKevuuyfRn2ajQI4J7us,648
-easyrip/__main__.py,sha256=BWheIP5HEW4WuQeVNqyjFasSsTROgn1pTOP0XM3whWE,3892
-easyrip/easyrip_command.py,sha256=yncaSUzSbE5houTdd4qptSFw-jMSPo0ygzWKLm52fFw,25159
-easyrip/easyrip_config.py,sha256=CO7nTilnbhzGw9HCl2aiXCxtYs6eTfrAds8E-_qvCos,8360
+easyrip/__main__.py,sha256=lwEV17Xi1cBWWHd7GXloKDjuWe2empflf7rMkMiLWGw,4375
+easyrip/easyrip_command.py,sha256=KirlybDIkz3aYPlxqT_VCPsxfdCp-pi62KJc1P6Yc6g,26960
 easyrip/easyrip_log.py,sha256=0V5wBwbqWt56w_NHoLmQmkTHPnPLkYZCAbhDSYnLnDw,15611
-easyrip/easyrip_main.py,sha256=kPjP-yi4uSCnmlwpynUSnw22BnEtUIbQLwSi2ZUpozI,41738
-easyrip/global_val.py,sha256=ZqTz586C9eRs9dVsPbxySom6BxYyAi7wU7egqCMifdU,237
+easyrip/easyrip_main.py,sha256=dEDUoBDF6flbFrgwdnR8x7yofBdprHNe8Nwkqp00J04,43497
+easyrip/easyrip_prompt.py,sha256=cEWI3XFooUwwQcQ_C8dVfd5bP6TlqQSwRHtkj_ezZs4,432
+easyrip/global_val.py,sha256=_8DiZFRvM97uzbKlD2ELPtJwV5WjRXd-sTUtJAOuL1E,773
 easyrip/utils.py,sha256=u1Qi5z0ZF31f_dQHtvsfcfeKk5PirlTeuHnlqL4mkrs,6452
+easyrip/easyrip_config/config.py,sha256=9uskiGIpYLuS-vjzNASZlhdWLWXkEVxtSjODxcZU3pc,7935
+easyrip/easyrip_config/config_key.py,sha256=wANVusz9kNqsYJUvXM7DUQn6k_G6EO2VWTHWh9dOifw,394
 easyrip/easyrip_mlang/__init__.py,sha256=0XYa0kcnUPH1aaRV3ceIPuYO1Oov8LBxgVjel-1slvI,3226
 easyrip/easyrip_mlang/global_lang_val.py,sha256=Un20KGMVVMQbOaV_7VaHg3E1dvK2Y7kI1cPzq_sFWKY,9984
 easyrip/easyrip_mlang/lang_en.py,sha256=heUSPeVtY1Nf9eDhrjPM28N3PLsu62op3llbXAfXvAs,140
-easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=opi0FAluT_kqomyEofxj2k69Gl6yIhdBeGLf3wyKo5M,18066
+easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=0DtvBg7khE6NbFt1carSwgMNkigQbMx2e0LsDv4wFhY,18520
 easyrip/easyrip_mlang/translator.py,sha256=Vg0S0p2rpMNAy3LHTdK7qKFdkPEXlOoCCXcaH7PyAC4,5939
 easyrip/easyrip_web/__init__.py,sha256=tMyEeaSGeEJjND7MF0MBv9aDiDgaO3MOnppwxA70U2c,177
-easyrip/easyrip_web/http_server.py,sha256=Hi6XJuuSgpjN5EimzLBoMEKokNlE8BLy7UNKgrtR06A,8013
+easyrip/easyrip_web/http_server.py,sha256=iyulCAFQrJlz86Lrr-Dm3fhOnNCf79Bp6fVHhr0ephY,8350
 easyrip/easyrip_web/third_party_api.py,sha256=umj-QsfOa0IM60Ic2pXigVfnGfAiiC95fJSXQ-WFpJA,4419
 easyrip/ripper/__init__.py,sha256=o5gj8QRvkuVc0S9jbRjVOWXpLAaQKC0-n-o6Zx9Dowo,171
 easyrip/ripper/media_info.py,sha256=U_XLhNrprIQXWWdxOkGqQGN5V1wla55XxYhf5z9hRI0,4986
@@ -21,9 +23,9 @@ easyrip/ripper/font_subset/__init__.py,sha256=a6UoRH1AU1l5FkFgQ-wQxOswLmovgVUUl3
 easyrip/ripper/font_subset/ass.py,sha256=Z1TYmF32pJoXhwsjjZKgScjcsbiayXjp9tnM533ULqs,25806
 easyrip/ripper/font_subset/font.py,sha256=9yhZmZc-8wvbk2NDN3B4oJMt-UVByzM_pukzMzd-du4,7114
 easyrip/ripper/font_subset/subset.py,sha256=yj5JYZg1XPO1U0zsZUHSsOX105wrmE_g-2jLpcrvqqc,17137
-easyrip-4.1.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-easyrip-4.1.0.dist-info/METADATA,sha256=aZp0MtumO45vduMX8WLngISHEawZZTH4ZBZa1U5ZMm0,4035
-easyrip-4.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-easyrip-4.1.0.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
-easyrip-4.1.0.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
-easyrip-4.1.0.dist-info/RECORD,,
+easyrip-4.3.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+easyrip-4.3.0.dist-info/METADATA,sha256=ynq-ebYL9XrnQDIZsnE279h1RXP1ABOpZ-VgjJUFreI,3506
+easyrip-4.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+easyrip-4.3.0.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
+easyrip-4.3.0.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
+easyrip-4.3.0.dist-info/RECORD,,