easyrip 4.11.0__py3-none-any.whl → 4.11.1__py3-none-any.whl

easyrip/easyrip_command.py

@@ -19,7 +19,7 @@ from prompt_toolkit.document import Document
 
 from . import global_val
 from .easyrip_config.config_key import Config_key
-from .ripper.param import Audio_codec, Preset_name
+from .ripper.param import PRESET_OPT_NAME, Audio_codec, Preset_name
 
 
 @final
@@ -763,8 +763,24 @@ class OptCompleter(Completer):
         if len(words) >= 1 and not text.startswith("-"):
             return
 
-        opt_tree_pos_list: list[nested_dict | Completer] = [self.opt_tree]
+        add_comp_words: set[str] = set()
+        add_comp_meta_dict: dict[str, str] = {}
+        if _preset := tuple(
+            words[i + 1]
+            for i, word in enumerate(words[:-1])
+            for opt_p_name in Opt_type._preset.value.names
+            if word == opt_p_name
+        ):
+            _preset = _preset[-1]
+            _preset_name = None
+            if _preset in Preset_name._member_map_:
+                _preset_name = Preset_name[_preset]
+            if _preset_name is not None and _preset_name in PRESET_OPT_NAME:
+                add_set: set[str] = {f"-{n}" for n in PRESET_OPT_NAME[_preset_name]}
+                add_comp_words |= add_set
+                add_comp_meta_dict |= dict.fromkeys(add_set, f"{_preset} param")
 
+        opt_tree_pos_list: list[nested_dict | Completer] = [self.opt_tree]
         for word in words:
             if isinstance(opt_tree_pos_list[-1], Completer):
                 opt_tree_pos_list.append(self.opt_tree.get(word, self.opt_tree))
@@ -775,7 +791,14 @@ class OptCompleter(Completer):
                     )
                 )
 
-        if opt_tree_pos_list[-1] is not self.opt_tree and not text.endswith(" "):
+        if (
+            (opt_tree_pos_list[-1] is not self.opt_tree)
+            or (words[-1] in add_comp_words)
+        ) and not text.endswith(" "):
+            # 不在根(上个单词没让这个单词回退到根) or 匹配额外提示
+            # 且尾部不是空格
+            # 即当前单词完全匹配，输出匹配成功提示
+
             yield from (
                 Completion(
                     text=words[-1],
@@ -786,8 +809,10 @@ class OptCompleter(Completer):
                     text="",
                     display="✔",
                     display_meta=(
-                        ""
-                        if (_opt := Opt_type.from_str(text)) is None
+                        add_comp_meta_dict[words[-1]]
+                        if words[-1] in add_comp_meta_dict
+                        else ""
+                        if (_opt := Opt_type.from_str(words[-1])) is None
                         else f"{_desc_list[0]}..."
                         if len(_desc_list := _opt.value.description.split("\n")) > 1
                         else _desc_list[0]
@@ -796,6 +821,8 @@ class OptCompleter(Completer):
             )
 
         elif isinstance(opt_tree_pos_list[-1], Completer):
+            # 上个单词进入独立提示，意味着当前的提示可能会是路径提示
+
             # 直接使用 PathCompleter 会因为上下文问题失效，所以将上文套进 NestedCompleter
             new_nd: nested_dict = {}
             new_nd_pos: nested_dict = new_nd
@@ -808,6 +835,8 @@ class OptCompleter(Completer):
             )
 
         elif len(words) >= 2 and isinstance(opt_tree_pos_list[-2], Completer):
+            # 上上个单词进入独立提示
+
             new_nd: nested_dict = {}
             new_nd_pos: nested_dict = new_nd
             for word in words[:-2]:
@@ -837,19 +866,22 @@ class OptCompleter(Completer):
             ).get_completions(document=document, complete_event=complete_event)
 
         else:
+            # 没有独立提示
+
             yield from FuzzyCompleter(
                 WordCompleter(
                     words=tuple(
-                        opt_tree_pos_list[-1]
+                        set(opt_tree_pos_list[-1])
                         | (
-                            {}
+                            set()
                             if text.endswith(" ")
                             or len(words) <= 1
                             or isinstance(opt_tree_pos_list[-2], Completer)
-                            else opt_tree_pos_list[-2]
+                            else set(opt_tree_pos_list[-2])
                         )
+                        | add_comp_words
                     ),
-                    meta_dict=META_DICT_OPT_TYPE,
+                    meta_dict=META_DICT_OPT_TYPE | add_comp_meta_dict,
                     WORD=True,  # 匹配标点
                     match_middle=True,
                 ),

easyrip/easyrip_config/config.py

@@ -5,7 +5,7 @@ from typing import Literal, get_origin, overload
 
 from ..easyrip_log import log
 from ..easyrip_mlang import all_supported_lang_map, gettext
-from ..global_val import CONFIG_DIR
+from ..global_val import get_CONFIG_DIR
 from ..utils import type_match
 from .config_key import CONFIG_TYPE_DICT, CONFIG_VERSION, Config_key
 
@@ -33,7 +33,7 @@ class config:
 
     @classmethod
     def init(cls) -> None:
-        cls._config_dir = CONFIG_DIR
+        cls._config_dir = get_CONFIG_DIR()
         cls._config_file = cls._config_dir / "config.json"
 
         if not cls._config_file.is_file():

easyrip/easyrip_main.py

@@ -221,13 +221,6 @@ def get_input_prompt(is_color: bool = False) -> str:
     return f"{os.path.realpath(os.getcwd())}> {cmd_prompt}"
 
 
-if os.name == "nt":
-    try:
-        ctypes.windll.user32.SetProcessDPIAware()
-    except Exception:
-        log.warning("Windows DPI Aware failed")
-
-
 def file_dialog(
     *,
     is_askdir: bool = False,
@@ -1086,6 +1079,12 @@ def run_command(command: Iterable[str] | str) -> bool:
 
 
 def init(is_first_run: bool = False) -> None:
+    if os.name == "nt":
+        try:
+            ctypes.windll.user32.SetProcessDPIAware()
+        except Exception:
+            log.warning("Windows DPI Aware failed")
+
     if is_first_run:
         # 当前路径添加到环境变量
         new_path = os.path.realpath(os.getcwd())

easyrip/easyrip_prompt.py

@@ -5,11 +5,11 @@ from prompt_toolkit.completion import CompleteEvent, Completer, Completion
 from prompt_toolkit.document import Document
 from prompt_toolkit.history import FileHistory
 
-from .global_val import C_Z, CONFIG_DIR
+from .global_val import C_Z, get_CONFIG_DIR
 
 
 class easyrip_prompt:
-    PROMPT_HISTORY_FILE = CONFIG_DIR / "prompt_history.txt"
+    PROMPT_HISTORY_FILE = get_CONFIG_DIR() / "prompt_history.txt"
 
     @classmethod
     def clear(cls) -> None:

easyrip/global_val.py

@@ -1,24 +1,28 @@
 import os
 import sys
+from functools import cache
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.11.0"
+PROJECT_VERSION = "4.11.1"
 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
+@cache
+def get_CONFIG_DIR():
+    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"
+
+    return Path(__config_dir) / PROJECT_NAME
 
 
 C_D = "\x04"

{easyrip-4.11.0.dist-info → easyrip-4.11.1.dist-info}/METADATA

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

{easyrip-4.11.0.dist-info → easyrip-4.11.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 easyrip/__init__.py,sha256=PIvSPDgswsIkWL4dsCe87knnxKmtvcrWYzmqAwZix_M,765
 easyrip/__main__.py,sha256=bPVlHqJb3BG-qZOY4JlJdKj7MKeRb_3EfoMbfoNN-gU,4943
-easyrip/easyrip_command.py,sha256=X9_8t9Sxl1-gILpsQ5PueCwozTQgjgL2cImzOZ6pO7w,27837
+easyrip/easyrip_command.py,sha256=b56InUyV2XXRYsb6Jlh0wB0rrfjAQtLoKvrFDUvhBAc,29250
 easyrip/easyrip_log.py,sha256=R-dM3CWUBFITtG7GSD1zy4X4MhZqxkoiBPjlIpI76cY,15573
-easyrip/easyrip_main.py,sha256=QgIrsonjXNin72nv7WWePTlpj9soGZCBVv1cwFNS4a4,44691
-easyrip/easyrip_prompt.py,sha256=A5S7ybeJSGFkCmwdJ9TCQ_-lde7NWgkbFytZ2KnvkWI,2145
-easyrip/global_val.py,sha256=Z9Y8N7MpqegW-5LDs8bn1dhmqjSSbEB2P6Oeye_sJ-4,774
+easyrip/easyrip_main.py,sha256=l_LMkM0EDpY0N9Ib5O1wSho6k9JG7JIh62ajU622XHE,44710
+easyrip/easyrip_prompt.py,sha256=RJoE4H_ft4jmlMIBxDcEAfLvLQqabYKUuQUBqJAztlY,2155
+easyrip/global_val.py,sha256=iZRAExu6I12ibGcV8FGxwsUU8uvOpp4n7nxFM0yl1kQ,866
 easyrip/utils.py,sha256=N1rMF1MyoC-YFBgy10_u29cFoowfhR-5Viea93O7wQ4,8750
-easyrip/easyrip_config/config.py,sha256=aj6Vg1rJkvICSTZ0ZONznR_MkvVr5u5ngkX_zfZopvU,9859
+easyrip/easyrip_config/config.py,sha256=KWXZMEYxdXYUGLQ-MR0A7nnOwR6QZdVrWBopfb2QZSA,9869
 easyrip/easyrip_config/config_key.py,sha256=_jjdKOunskUoG7UUWOz3QZK-s4LF_x6hmM9MKttyS2Q,766
 easyrip/easyrip_mlang/__init__.py,sha256=QHZt4BYJFkJuaPkN89pt_zkM2grifJakyRZbeyfH8f4,1893
 easyrip/easyrip_mlang/global_lang_val.py,sha256=Un20KGMVVMQbOaV_7VaHg3E1dvK2Y7kI1cPzq_sFWKY,9984
@@ -23,9 +23,9 @@ easyrip/ripper/sub_and_font/__init__.py,sha256=cBT7mxL7RRFaJXFPXuZ7RT-YK6FbnanaU
 easyrip/ripper/sub_and_font/ass.py,sha256=hJhVN7CqehN9xW1W295gmkPnG-somqlxnwXzRidbA2M,28645
 easyrip/ripper/sub_and_font/font.py,sha256=X2dPcPzbwQf3fv_g_mxO-zY7puVAX9Nv-9QHn88q4oA,7745
 easyrip/ripper/sub_and_font/subset.py,sha256=qGH3H26nHnyGFfFwvktEIKncHpm086DqxYjVhNoVDdM,18654
-easyrip-4.11.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-easyrip-4.11.0.dist-info/METADATA,sha256=-5Cnc5K0zC8oUEFqgcomSavHeKGeejLu-h6-xhysxsA,3507
-easyrip-4.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-easyrip-4.11.0.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
-easyrip-4.11.0.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
-easyrip-4.11.0.dist-info/RECORD,,
+easyrip-4.11.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+easyrip-4.11.1.dist-info/METADATA,sha256=H1UAHneIUawu_q9qnTjIeXZPTyiFsiwXi4Qg1uDoB84,3507
+easyrip-4.11.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+easyrip-4.11.1.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
+easyrip-4.11.1.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
+easyrip-4.11.1.dist-info/RECORD,,