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

easyrip/__main__.py

@@ -6,7 +6,7 @@ import Crypto
 import fontTools
 import prompt_toolkit
 from prompt_toolkit import ANSI, prompt
-from prompt_toolkit.completion import PathCompleter, merge_completers
+from prompt_toolkit.completion import merge_completers
 from prompt_toolkit.history import InMemoryHistory
 from prompt_toolkit.key_binding import KeyBindings, KeyPressEvent
 from prompt_toolkit.keys import Keys
@@ -21,7 +21,7 @@ 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, easyrip_prompt
+from .easyrip_prompt import ConfigFileHistory, SmartPathCompleter, easyrip_prompt
 from .global_val import C_D, C_Z
 
 
@@ -48,7 +48,7 @@ def run() -> NoReturn:
     def _(event: KeyPressEvent) -> None:
         event.app.current_buffer.insert_text(C_D)
 
-    path_completer = PathCompleter()
+    path_completer = SmartPathCompleter()
 
     def _ctv_to_nc(ctvs: Iterable[Cmd_type_val]) -> CmdCompleter:
         return CmdCompleter(
@@ -105,6 +105,7 @@ def run() -> NoReturn:
         if config.get_user_profile(Config_key.prompt_history_save_file)
         else InMemoryHistory()
     )
+
     while True:
         try:
             command = prompt(

easyrip/easyrip_command.py

@@ -25,10 +25,24 @@ from .easyrip_config.config_key import Config_key
 @dataclass(slots=True, init=False, eq=False)
 class Cmd_type_val:
     names: tuple[str, ...]
-    param: str
+    _param: str
     _description: str
     childs: tuple["Cmd_type_val", ...]
 
+    @property
+    def param(self) -> str:
+        try:
+            from .easyrip_mlang import gettext
+
+            return gettext(self._param, is_format=False)
+
+        except ImportError:  # 启动时，原字符串导入翻译文件
+            return self._param
+
+    @param.setter
+    def param(self, val: str) -> None:
+        self._param = val
+
     @property
     def description(self) -> str:
         try:
@@ -688,10 +702,14 @@ def get_help_doc() -> str:
 
 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
+    name: lambda opt=opt: opt.value.param
+    for opt in Opt_type
+    for name in opt.value.names
 }
 META_DICT_CMD_TYPE = {
-    name: opt.value.param for opt in Cmd_type for name in opt.value.names
+    name: lambda opt=opt: opt.value.param
+    for opt in Cmd_type
+    for name in opt.value.names
 }
 
 
@@ -710,6 +728,7 @@ class CmdCompleter(NestedCompleter):
     ) -> Iterable[Completion]:
         # Split document.
         text = document.text_before_cursor.lstrip()
+        words = text.split(" ")
         stripped_len = len(document.text_before_cursor) - len(text)
 
         # If there is a space, check for the first term, and use a
@@ -730,12 +749,30 @@ class CmdCompleter(NestedCompleter):
 
                 yield from completer.get_completions(new_document, complete_event)
 
+        elif words and (_cmd := Cmd_type.from_str(words[-1])) is not None:
+            yield from (
+                Completion(
+                    text=words[-1],
+                    start_position=-len(words[-1]),
+                    display_meta=META_DICT_CMD_TYPE.get(words[-1], ""),
+                ),
+                Completion(
+                    text="",
+                    display="✔",
+                    display_meta=(
+                        f"{_desc_list[0]}..."
+                        if len(_desc_list := _cmd.value.description.split("\n")) > 1
+                        else _desc_list[0]
+                    ),
+                ),
+            )
+
         # No space in the input: behave exactly like `WordCompleter`.
         else:
             # custom
             completer = FuzzyWordCompleter(
                 tuple(self.options),
-                meta_dict=META_DICT_CMD_TYPE,
+                meta_dict=META_DICT_CMD_TYPE,  # pyright: ignore[reportArgumentType]
                 WORD=True,
             )
             yield from completer.get_completions(document, complete_event)
@@ -750,7 +787,7 @@ class OptCompleter(Completer):
     ) -> Iterable[Completion]:
         text = document.text_before_cursor.lstrip()
 
-        words = text.split()
+        words = text.split(" ")
 
         if len(words) >= 1 and not text.startswith("-"):
             return
@@ -774,7 +811,17 @@ class OptCompleter(Completer):
                     start_position=-len(words[-1]),
                     display_meta=META_DICT_OPT_TYPE.get(words[-1], ""),
                 ),
-                Completion(text="", display="✔"),
+                Completion(
+                    text="",
+                    display="✔",
+                    display_meta=(
+                        ""
+                        if (_opt := Opt_type.from_str(text)) is None
+                        else f"{_desc_list[0]}..."
+                        if len(_desc_list := _opt.value.description.split("\n")) > 1
+                        else _desc_list[0]
+                    ),
+                ),
             )
 
         elif isinstance(opt_tree_pos_list[-1], Completer):

easyrip/easyrip_main.py

@@ -10,7 +10,7 @@ import sys
 import threading
 import tkinter as tk
 import tomllib
-from collections.abc import Callable
+from collections.abc import Callable, Iterable
 from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime
 from multiprocessing import shared_memory
@@ -399,19 +399,16 @@ def get_web_server_params(
     return (host or "", int(port), password)
 
 
-def run_command(command: list[str] | str) -> bool:
-    if isinstance(command, list):
-        cmd_list = command
-
-    else:
-        try:
-            cmd_list = [
-                cmd.strip('"').strip("'").replace("\\\\", "\\")
-                for cmd in shlex.split(command, posix=False)
-            ]
-        except ValueError as e:
-            log.error(e)
-            return False
+def run_command(command: Iterable[str] | str) -> bool:
+    try:
+        cmd_list: list[str] = (
+            shlex.split(command.replace("\\", "\\\\") if os.name == "nt" else command)
+            if isinstance(command, str)
+            else list(command)
+        )
+    except ValueError as e:
+        log.error(e)
+        return False
 
     if len(cmd_list) == 0:
         return True

easyrip/easyrip_mlang/__init__.py

@@ -1,4 +1,4 @@
-import ctypes
+import locale
 
 from . import lang_en, lang_zh_Hans_CN
 from .global_lang_val import (
@@ -18,6 +18,7 @@ __all__ = [
     "Lang_tag_region",
     "Lang_tag_script",
     "Lang_tag_val",
+    "Mlang_exception",
     "get_system_language",
     "gettext",
     "translate_subtitles",
@@ -31,50 +32,10 @@ all_supported_lang_map: dict[Lang_tag, dict[str, str]] = {
 
 
 def get_system_language() -> Lang_tag:
-    # 获取系统默认的 UI 语言
-    user_default_ui_lang = ctypes.windll.kernel32.GetUserDefaultUILanguage()
-    lang_int = user_default_ui_lang & 0xFF  # 主要语言
-    sub_lang_int = user_default_ui_lang >> 10  # 次要语言
-
-    # 语言代码映射
-    lang_map = {
-        0x09: Lang_tag_language.en,  # 英语
-        0x04: Lang_tag_language.zh,  # 中文
-        0x0C: Lang_tag_language.fr,  # 法语
-        0x07: Lang_tag_language.de,  # 德语
-        0x0A: Lang_tag_language.es,  # 西班牙语
-        0x10: Lang_tag_language.it,  # 意大利语
-        0x13: Lang_tag_language.ja,  # 日语
-        0x14: Lang_tag_language.ko,  # 韩语
-        0x16: Lang_tag_language.ru,  # 俄语
-    }
-
-    # 次要语言代码映射
-    sub_lang_map = {
-        0x01: Lang_tag_region.US,  # 美国
-        0x02: Lang_tag_region.GB,  # 英国
-        0x03: Lang_tag_region.AU,  # 澳大利亚
-        0x04: Lang_tag_region.CA,  # 加拿大
-        0x05: Lang_tag_region.NZ,  # 新西兰
-        0x06: Lang_tag_region.IE,  # 爱尔兰
-        0x07: Lang_tag_region.ZA,  # 南非
-        0x08: Lang_tag_region.JM,  # 牙买加
-        0x09: Lang_tag_region.TT,  # 加勒比地区
-        0x0A: Lang_tag_region.BZ,  # 伯利兹
-        0x0B: Lang_tag_region.TT,  # 特立尼达和多巴哥
-        0x0D: Lang_tag_region.PH,  # 菲律宾
-        0x0E: Lang_tag_region.IN,  # 印度
-        0x0F: Lang_tag_region.MY,  # 马来西亚
-        0x10: Lang_tag_region.SG,  # 新加坡
-        0x11: Lang_tag_region.HK,  # 香港特别行政区
-        0x12: Lang_tag_region.MO,  # 澳门特别行政区
-        0x13: Lang_tag_region.TW,  # 台湾地区
-        0x00: Lang_tag_region.CN,  # 中国大陆
-    }
-
-    return Lang_tag(
-        language=lang_map.get(lang_int, Lang_tag_language.Unknown),
-        region=sub_lang_map.get(sub_lang_int, Lang_tag_region.Unknown),
+    return (
+        Lang_tag()
+        if (sys_lang := locale.getdefaultlocale()[0]) is None
+        else Lang_tag.from_str(sys_lang.replace("_", "-"))
     )
 
 
@@ -102,3 +63,17 @@ def gettext(
             log.debug(f"{e!r} in gettext when str.format", deep=True, is_format=False)
 
     return new_text
+
+
+class Mlang_exception(Exception):
+    def __init__(
+        self,
+        *args: object,
+        **kwargs: object,
+    ) -> None:
+        msg = args[0]
+        if isinstance(msg, str):
+            new_msg: str = gettext(msg, *args[1:], is_format=True, **kwargs)
+            super().__init__(new_msg)
+        else:
+            super().__init__(msg, *args[1:])

easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -313,6 +313,7 @@ LANG_MAP: dict[str, str] = {
     "'{}' successfully: {}": "'{}' 成功: {}",
     "Unsupported option: {}": "不支持的选项: {}",
     "Unsupported param: {}": "不支持的参数: {}",
+    "There is no audio stream in the video, so '-c:a' cannot be used": "视频中没有音频流，所以无法使用 '-c:a'",
     "Unsupported '{}' param: {}": "'{}' 不支持此参数: {}",
     "Manually force exit": "手动强制退出",
     "or run this command to update using pip: {}": "或运行以下命令以使用 pip 更新: {}",
@@ -380,4 +381,5 @@ LANG_MAP: dict[str, str] = {
     "Run {} failed": "执行 {} 失败",
     "Unknown error": "未知错误",
     "'{}' execution failed: {}": "'{}' 执行失败: {}",
+    "No closing quotation": "没有闭合引号",
 }

easyrip/easyrip_prompt.py

@@ -1,3 +1,8 @@
+import os
+from collections.abc import Iterable
+
+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
@@ -15,3 +20,54 @@ 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 get_completions(
+        self,
+        document: Document,
+        complete_event: CompleteEvent,  # noqa: ARG002
+    ) -> Iterable[Completion]:
+        text = document.text_before_cursor.strip("\"'")
+
+        try:
+            directory = (
+                os.path.dirname(os.path.join(".", text))
+                if os.path.dirname(text)
+                else "."
+            )
+
+            prefix = os.path.basename(text)
+
+            filenames: list[tuple[str, str]] = (
+                [
+                    (directory, filename)
+                    for filename in os.listdir(directory)
+                    if filename.startswith(prefix)
+                ]
+                if os.path.isdir(directory)
+                else []
+            )
+
+            for directory, filename in sorted(filenames, key=lambda k: k[1]):
+                completion = filename[len(prefix) :]
+                full_name = os.path.join(directory, filename)
+
+                if os.path.isdir(full_name):
+                    filename += "/"
+
+                yield Completion(
+                    text=(
+                        f'{"" if any(c in text for c in "\\/") else '"'}{completion}"'
+                        if any(c in r"""!$%&()*:;<=>?[]^`{|}~""" for c in completion)
+                        else completion
+                    ),
+                    start_position=0,
+                    display=filename,
+                )
+
+        except OSError:
+            pass

easyrip/global_val.py

@@ -3,7 +3,7 @@ import sys
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.3.0"
+PROJECT_VERSION = "4.3.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"

easyrip/ripper/font_subset/ass.py

@@ -4,7 +4,8 @@ import re
 from dataclasses import dataclass, field
 from pathlib import Path
 
-from ...easyrip_log import gettext, log
+from ...easyrip_log import log
+from ...easyrip_mlang import Mlang_exception
 from ...utils import read_text, uudecode_ssa, uuencode_ssa
 
 
@@ -584,18 +585,8 @@ class Unknown_data:
         )
 
 
-class Ass_generate_error(Exception):
-    def __init__(
-        self,
-        *args: object,
-        **kwargs: object,
-    ) -> None:
-        msg = args[0]
-        if isinstance(msg, str):
-            new_msg: str = gettext(msg, *args[1:], is_format=True, **kwargs)
-            super().__init__(new_msg)
-        else:
-            super().__init__(msg, *args[1:])
+class Ass_generate_error(Mlang_exception):
+    pass
 
 
 class Ass:

easyrip/ripper/media_info.py

@@ -5,9 +5,14 @@ from pathlib import Path
 from typing import Self, final
 
 from ..easyrip_log import log
+from ..easyrip_mlang import Mlang_exception
 from ..utils import time_str_to_sec
 
 
+class Stream_error(Mlang_exception):
+    pass
+
+
 @final
 @dataclass(slots=True)
 class Audio_info:

easyrip/ripper/ripper.py

@@ -16,7 +16,7 @@ from ..easyrip_log import log
 from ..easyrip_mlang import Global_lang_val, gettext, translate_subtitles
 from ..utils import get_base62_time
 from .font_subset import subset
-from .media_info import Media_info
+from .media_info import Media_info, Stream_error
 
 FF_PROGRESS_LOG_FILE = Path("FFProgress.log")
 FF_REPORT_LOG_FILE = Path("FFReport.log")
@@ -248,6 +248,11 @@ class Ripper:
 
         # Audio
         if audio_encoder_str := self.option_map.get("c:a"):
+            if not self.media_info.audio_info:
+                raise Stream_error(
+                    "There is no audio stream in the video, so '-c:a' cannot be used"
+                )
+
             if audio_encoder_str not in Ripper.AudioCodec._member_map_:
                 raise ValueError(
                     gettext("Unsupported '{}' param: {}", "-c:a", audio_encoder_str)

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

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

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

@@ -1,31 +1,31 @@
 easyrip/__init__.py,sha256=BlDIN9htmQXETt7M8pjYSOVrKevuuyfRn2ajQI4J7us,648
-easyrip/__main__.py,sha256=lwEV17Xi1cBWWHd7GXloKDjuWe2empflf7rMkMiLWGw,4375
-easyrip/easyrip_command.py,sha256=KirlybDIkz3aYPlxqT_VCPsxfdCp-pi62KJc1P6Yc6g,26960
+easyrip/__main__.py,sha256=2i4xz_WNXXEiJqbs_zaVz9hvkY90dAhT_CzB38G68KA,4386
+easyrip/easyrip_command.py,sha256=tPyokfHJhLXknUG3BnR03V1l_Xd_cnLWjfsIrM7_Iz4,28491
 easyrip/easyrip_log.py,sha256=0V5wBwbqWt56w_NHoLmQmkTHPnPLkYZCAbhDSYnLnDw,15611
-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/easyrip_main.py,sha256=pTme6KA0dJL7PWhhd9yQmUVrHwCD4iAzwEhmE8zw7c0,43459
+easyrip/easyrip_prompt.py,sha256=A5S7ybeJSGFkCmwdJ9TCQ_-lde7NWgkbFytZ2KnvkWI,2145
+easyrip/global_val.py,sha256=V-2k_peorGwp6YASUDGF7iQgla1KwjcK1kRPEenv7ds,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/__init__.py,sha256=QHZt4BYJFkJuaPkN89pt_zkM2grifJakyRZbeyfH8f4,1893
 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=0DtvBg7khE6NbFt1carSwgMNkigQbMx2e0LsDv4wFhY,18520
+easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=6oczt-ziN39wIk0c-9JBfV7H7Rth99m3FI0ViHgBQew,18697
 easyrip/easyrip_mlang/translator.py,sha256=Vg0S0p2rpMNAy3LHTdK7qKFdkPEXlOoCCXcaH7PyAC4,5939
 easyrip/easyrip_web/__init__.py,sha256=tMyEeaSGeEJjND7MF0MBv9aDiDgaO3MOnppwxA70U2c,177
 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
-easyrip/ripper/ripper.py,sha256=XyWU2J27xxl-2xUV6u46nspDQPx_AnozP9-LZ8SJbew,61968
+easyrip/ripper/media_info.py,sha256=mQq_vbQ7S9fWpb39HLkoZlAL-pqNfwxewv6X776Nf50,5078
+easyrip/ripper/ripper.py,sha256=MZ0wdu4l8-qrvEjsYCOkQbIF8Yesb8vJGQxzP7wRqs0,62170
 easyrip/ripper/font_subset/__init__.py,sha256=a6UoRH1AU1l5FkFgQ-wQxOswLmovgVUUl3rLaJnN8Co,88
-easyrip/ripper/font_subset/ass.py,sha256=Z1TYmF32pJoXhwsjjZKgScjcsbiayXjp9tnM533ULqs,25806
+easyrip/ripper/font_subset/ass.py,sha256=eGi1eIDWAV1Ti_BYIAcAMwrAlXJ5f_zGYte3nNu4PeE,25532
 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.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,,
+easyrip-4.3.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+easyrip-4.3.1.dist-info/METADATA,sha256=7pmdwL-dQiOlaYELaqHgOgN12U53kFQ7LQTW5mxjBhA,3506
+easyrip-4.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+easyrip-4.3.1.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
+easyrip-4.3.1.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
+easyrip-4.3.1.dist-info/RECORD,,