easyrip 4.1.0__tar.gz → 4.3.0__tar.gz

{easyrip-4.1.0 → easyrip-4.3.0}/PKG-INFO

@@ -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.3.0/README.md

@@ -0,0 +1,65 @@
+# Easy Rip
+
+Self-use codec tool  
+自用压制工具
+
+**[Easy Rip Web Panel  
+Easy Rip 网页版控制台](https://op200.github.io/EasyRip-WebPanel/)**
+
+## Start
+
+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`
+
+* (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
+
+Run `easyrip`, input `help` to get help doc  
+运行 `easyrip`，键入 `help` 获取帮助文档
+
+[View usage in wiki  
+在 Wiki 中查看用法](https://github.com/op200/EasyRip/wiki)
+
+## Dependency
+
+* ### 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.  
+  如果你想开发，需要安装依赖，如果你只是想使用，不需要手动安装依赖。
+
+  ```pwsh
+  pip install -U prompt-toolkit fonttools pycryptodome
+  ```
+
+  * [prompt-toolkit](https://pypi.org/project/prompt-toolkit/)
+  * [fonttools](https://pypi.org/project/fonttools/)
+  * [pycryptodome](https://pypi.org/project/pycryptodome/)
+
+* ### CLI
+
+  Command line dependencies are necessary.  
+  命令行依赖是必须的。
+
+  * [ffmpeg & ffprobe](https://ffmpeg.org/)
+  * [flac](https://xiph.org/flac/)
+  * [mp4box](https://gpac.io/)
+  * [mp4fpsmod](https://github.com/nu774/mp4fpsmod)
+  * [mkvpropedit & mkvmerge](https://mkvtoolnix.download/)
+  <!-- * [MediaInfo](https://mediaarea.net/en/MediaInfo) -->
+
+## Supported languages
+
+* en
+* zh-Hans-CN
+
+If you want to add or modify translation, edit the `easyrip/easyrip_mlang`
+
+Or add translate file, see [Wiki](https://github.com/op200/EasyRip/wiki/Language-file) for details

{easyrip-4.1.0 → easyrip-4.3.0}/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-4.1.0 → easyrip-4.3.0}/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-4.1.0/easyrip/easyrip_config.py → easyrip-4.3.0/easyrip/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-4.3.0/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"