easyrip 4.11.0__tar.gz → 4.11.2__tar.gz

{easyrip-4.11.0 → easyrip-4.11.2}/PKG-INFO

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

{easyrip-4.11.0 → easyrip-4.11.2}/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
@@ -595,6 +595,21 @@ class Opt_type(enum.Enum):
         ("-hwaccel",),
         param="<string>",
         description="Use FFmpeg hwaccel (See 'ffmpeg -hwaccels' for details)",
+        childs=(
+            Cmd_type_val(
+                names=(
+                    "cuda",
+                    "vaapi",
+                    "dxva2",
+                    "qsv",
+                    "d3d11va",
+                    "opencl",
+                    "vulkan",
+                    "d3d12va",
+                    "amf",
+                )
+            ),
+        ),
     )
     _ss = Cmd_type_val(
         ("-ss",),
@@ -763,8 +778,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 +806,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 and words[-1] in add_comp_words)
+        ) and not text.endswith(" "):
+            # 不在根(上个单词没让这个单词回退到根) or 匹配额外提示
+            # 且尾部不是空格
+            # 即当前单词完全匹配，输出匹配成功提示
+
             yield from (
                 Completion(
                     text=words[-1],
@@ -786,8 +824,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 +836,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 +850,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 +881,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-4.11.0 → easyrip-4.11.2}/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-4.11.0 → easyrip-4.11.2}/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-4.11.0 → easyrip-4.11.2}/easyrip/easyrip_mlang/translator.py

@@ -42,20 +42,20 @@ def translate_subtitles(
 
     file_list: Final[list[tuple[Path, str]]] = []
     for f in directory.iterdir():
-        if f.suffix not in {".ass", ".ssa", ".srt"} or (
-            file_intersection_selector is not None
-            and f not in file_intersection_selector
+        if (
+            not f.is_file()
+            or f.suffix not in {".ass", ".ssa", ".srt"}
+            or (
+                file_intersection_selector is not None
+                and not all(map(f.samefile, file_intersection_selector))
+            )
         ):
             continue
 
-        if len(_stems := f.stem.split(".")) < 1:
-            continue
-        if infix == _stems[-1]:
+        if (_stems := f.stem.split(".")) and (infix == _stems[-1]):
             file_list.append(
                 (
-                    f.with_name(
-                        f"{'.'.join(f.stem.split('.')[:-1])}.{target_lang_tag}{f.suffix}"
-                    ),
+                    f.with_name(f"{'.'.join(_stems[:-1])}.{target_lang_tag}{f.suffix}"),
                     read_text(f),
                 )
             )

{easyrip-4.11.0 → easyrip-4.11.2}/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-4.11.2/easyrip/global_val.py

@@ -0,0 +1,29 @@
+import os
+import sys
+from functools import cache
+from pathlib import Path
+
+PROJECT_NAME = "Easy Rip"
+PROJECT_VERSION = "4.11.2"
+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"
+
+
+@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"
+C_Z = "\x1a"

{easyrip-4.11.0 → easyrip-4.11.2}/easyrip/ripper/param.py

@@ -434,7 +434,7 @@ DEFAULT_PRESET_PARAMS: Final[dict[Preset_name, dict[LiteralString, LiteralString
         {
             "crf": "17",
             "qpmin": "3",
-            "qpmax": "21.5",
+            "qpmax": "23",
             "psy-rd": "2.2",
             "rd": "5",
             "rdoq-level": "2",

{easyrip-4.11.0 → easyrip-4.11.2}/easyrip/ripper/ripper.py

@@ -802,11 +802,42 @@ class Ripper:
                     )
 
             case Ripper.Preset_name.subset:
+                # 临时翻译
+                add_tr_file_list: Final[list[Path]] = []
+                if translate_sub := self.option_map.get("translate-sub"):
+                    _tr = translate_sub.split(":")
+                    if len(_tr) != 2:
+                        log.error("{} param illegal", "-translate-sub")
+                    else:
+                        try:
+                            _file_list = translate_subtitles(
+                                Path(self.output_dir),
+                                _tr[0],
+                                _tr[1],
+                                file_intersection_selector=self.input_path_list,
+                            )
+                        except Exception as e:
+                            log.error(e, is_format=False)
+                        else:
+                            for f_and_s in _file_list:
+                                if f_and_s[0].is_file():
+                                    log.warning(
+                                        'The file "{}" already exists, skip translating it',
+                                        f_and_s[0],
+                                    )
+                                    continue
+
+                                with f_and_s[0].open(
+                                    "wt", encoding="utf-8-sig", newline="\n"
+                                ) as f:
+                                    f.write(f_and_s[1])
+                                    add_tr_file_list.append(f_and_s[0])
+
                 _output_dir = Path(self.output_dir) / basename
                 _output_dir.mkdir(parents=True, exist_ok=True)
 
-                _ass_list: list[Path] = []
-                _other_sub_list: list[Path] = []
+                _ass_list: Final[list[Path]] = add_tr_file_list.copy()
+                _other_sub_list: Final[list[Path]] = []
 
                 for path in self.input_path_list:
                     if path.suffix == ".ass":
@@ -861,6 +892,13 @@ class Ripper:
                 for path in _other_sub_list:
                     shutil.copy2(path, _output_dir / path.name)
 
+                # 清理临时文件
+                for f in add_tr_file_list:
+                    try:
+                        f.unlink()
+                    except Exception as e:
+                        log.error(f"{e!r} {e}", deep=True, is_format=False)
+
                 if subset_res is False:
                     log.error("Run {} failed", "subset")
                 return subset_res
@@ -1085,39 +1123,9 @@ class Ripper:
                     log.warning("-soft-sub is empty")
                 log.info("-soft-sub list = {}", soft_sub_list)
 
-                # 临时翻译
-                add_tr_files: Final[list[Path]] = []
-                if translate_sub := self.option_map.get("translate-sub"):
-                    _tr = translate_sub.split(":")
-                    if len(_tr) != 2:
-                        log.error("{} param illegal", "-translate-sub")
-                    else:
-                        try:
-                            _file_list = translate_subtitles(
-                                Path(self.output_dir),
-                                _tr[0],
-                                _tr[1],
-                                file_intersection_selector=soft_sub_list,
-                            )
-                        except Exception as e:
-                            log.error(e, is_format=False)
-                        else:
-                            for f_and_s in _file_list:
-                                if f_and_s[0].is_file():
-                                    log.warning(
-                                        'The file "{}" already exists, skip translating it',
-                                        f_and_s[0],
-                                    )
-                                    continue
-                                with f_and_s[0].open(
-                                    "wt", encoding="utf-8-sig", newline="\n"
-                                ) as f:
-                                    f.write(f_and_s[1])
-                                    add_tr_files.append(f_and_s[0])
-
                 # 子集化
                 if Ripper(
-                    soft_sub_list + add_tr_files,
+                    soft_sub_list,
                     (subset_folder.name,),
                     self.output_dir,
                     Ripper.Preset_name.subset,
@@ -1161,11 +1169,6 @@ class Ripper:
 
                 # 清理临时文件
                 shutil.rmtree(subset_folder)
-                for f in add_tr_files:
-                    try:
-                        f.unlink()
-                    except Exception as e:
-                        log.error(f"{e!r} {e}", deep=True, is_format=False)
 
         # 获取 ffmpeg report 中的报错
         if FF_REPORT_LOG_FILE.is_file():

{easyrip-4.11.0 → easyrip-4.11.2}/easyrip.egg-info/PKG-INFO

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

easyrip-4.11.0/easyrip/global_val.py

@@ -1,25 +0,0 @@
-import os
-import sys
-from pathlib import Path
-
-PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.11.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"