easyrip 4.11.3__tar.gz → 4.12.0__tar.gz

{easyrip-4.11.3 → easyrip-4.12.0}/PKG-INFO

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

{easyrip-4.11.3 → easyrip-4.12.0}/easyrip/__init__.py

@@ -7,13 +7,7 @@ from .easyrip_main import (
     init,
     run_command,
 )
-from .easyrip_mlang import (
-    Global_lang_val,
-    Lang_tag,
-    Lang_tag_language,
-    Lang_tag_region,
-    Lang_tag_script,
-)
+from .easyrip_mlang import Global_lang_val, Lang_tag
 from .ripper.media_info import Media_info
 from .ripper.ripper import Ripper
 from .ripper.sub_and_font import Ass, Font, load_fonts
@@ -23,9 +17,6 @@ __all__ = [
     "Font",
     "Global_lang_val",
     "Lang_tag",
-    "Lang_tag_language",
-    "Lang_tag_region",
-    "Lang_tag_script",
     "Media_info",
     "Ripper",
     "check_env",

{easyrip-4.11.3 → easyrip-4.12.0}/easyrip/easyrip_command.py

@@ -18,7 +18,7 @@ from prompt_toolkit.document import Document
 
 from . import global_val
 from .easyrip_config.config_key import Config_key
-from .ripper.param import PRESET_OPT_NAME, Audio_codec, Preset_name
+from .ripper.param import Audio_codec, Muxer, Preset_name
 
 
 @final
@@ -353,7 +353,8 @@ class Opt_type(enum.Enum):
         param="<string>",
         description=(
             "Setting preset\n"
-            "Preset name:\n"  # .
+            "\n"  # .
+            "Preset name:\n"
             f"{Preset_name.to_help_string('  ')}"
         ),
         childs=(Cmd_type_val(tuple(Preset_name._value2member_map_)),),
@@ -486,7 +487,8 @@ class Opt_type(enum.Enum):
         param="<string>",
         description=(
             "Setting audio encoder\n"
-            "Audio encoder:\n"  # .
+            "\n"  # .
+            "Audio encoder:\n"
             f"{Audio_codec.to_help_string('  ')}"
         ),
         childs=(Cmd_type_val(tuple(Audio_codec._value2member_map_)),),
@@ -501,11 +503,11 @@ class Opt_type(enum.Enum):
         param="<string>",
         description=(
             "Setting muxer\n"
-            " \n"  # .
+            "\n"  # .
             "Muxer:\n"
-            "  mp4\n"
-            "  mkv\n"
+            f"{Audio_codec.to_help_string('  ')}"
         ),
+        childs=(Cmd_type_val(tuple(Muxer._value2member_map_)),),
     )
     _r = _fps = Cmd_type_val(
         ("-r", "-fps"),
@@ -789,8 +791,10 @@ class OptCompleter(Completer):
             _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]}
+            if _preset_name is not None:
+                add_set: set[str] = {
+                    f"-{n}" for n in _preset_name.get_param_name_set(set())
+                }
                 add_comp_words |= add_set
                 add_comp_meta_dict |= dict.fromkeys(add_set, f"{_preset} param")
 
@@ -859,7 +863,13 @@ class OptCompleter(Completer):
 
             yield from merge_completers(
                 (
-                    _nested_dict_to_nc(new_nd),
+                    merge_completers(
+                        (
+                            _nested_dict_to_nc(new_nd),
+                            FuzzyCompleter(_nested_dict_to_nc(new_nd), WORD=True),
+                        ),
+                        deduplicate=True,
+                    ),
                     FuzzyCompleter(
                         WordCompleter(
                             words=tuple(opt_tree_pos_list[-1]),

{easyrip-4.11.3 → easyrip-4.12.0}/easyrip/easyrip_main.py

@@ -30,14 +30,12 @@ from .easyrip_log import log
 from .easyrip_mlang import (
     Global_lang_val,
     Lang_tag,
-    Lang_tag_language,
     get_system_language,
     gettext,
     translate_subtitles,
 )
 from .easyrip_prompt import easyrip_prompt
 from .ripper.media_info import Media_info
-from .ripper.param import DEFAULT_PRESET_PARAMS, PRESET_OPT_NAME
 from .ripper.ripper import Ripper
 from .ripper.sub_and_font import load_fonts
 from .utils import change_title, check_ver, read_text
@@ -419,40 +417,41 @@ def run_command(command: Iterable[str] | str) -> bool:
                             log.send(_want_doc_cmd_type.value.to_doc(), is_format=False)
                         elif cmd_list[2] in Ripper.Preset_name._value2member_map_:
                             _preset = Ripper.Preset_name(cmd_list[2])
-                            if (
-                                _preset in DEFAULT_PRESET_PARAMS
-                                or _preset in PRESET_OPT_NAME
-                            ):
-                                if _preset in PRESET_OPT_NAME:
-                                    log.send(
-                                        "Params that can be directly used:\n{}",
-                                        textwrap.indent(
-                                            "\n".join(
-                                                f"-{n}"
-                                                for n in PRESET_OPT_NAME[_preset]
-                                            ),
-                                            prefix="  ",
-                                        ),
-                                    )
-                                if _preset in DEFAULT_PRESET_PARAMS:
-                                    _default_params = DEFAULT_PRESET_PARAMS[_preset]
-                                    max_name_len = (
-                                        max(len(str(n)) for n in _default_params) + 1
-                                    )
-                                    log.send(
-                                        "Default val:\n{}",
-                                        textwrap.indent(
-                                            "\n".join(
-                                                f"{f'-{n}':>{max_name_len}}  {v}"
-                                                for n, v in _default_params.items()
-                                            ),
-                                            prefix="  ",
-                                        ),
-                                    )
-                            else:
+                            _param_default_dict = _preset.get_param_default_dict()
+                            _param_name_set = _preset.get_param_name_set()
+                            if not any((_param_default_dict, _param_name_set)):
                                 log.send(
                                     "The preset '{}' has no separate help", cmd_list[2]
                                 )
+                            if _param_name_set:
+                                log.send(
+                                    "Params that can be directly used:\n{}",
+                                    textwrap.indent(
+                                        "\n".join(f"-{n}" for n in _param_name_set),
+                                        prefix="  ",
+                                    ),
+                                )
+                            if _param_default_dict:
+                                max_name_len = (
+                                    max(len(str(n)) for n in _param_default_dict) + 1
+                                )
+                                log.send(
+                                    "Default val:\n{}",
+                                    textwrap.indent(
+                                        "\n".join(
+                                            f"{f'-{n}':>{max_name_len}}  {v}"
+                                            for n, v in _param_default_dict.items()
+                                        ),
+                                        prefix="  ",
+                                    ),
+                                )
+                                log.send(
+                                    "  FFmpeg format:\n    {}",
+                                    ":".join(
+                                        f"{n}={v}"
+                                        for n, v in _param_default_dict.items()
+                                    ),
+                                )
                         else:
                             log.error("'{}' is not a member of preset", cmd_list[2])
 
@@ -1156,7 +1155,7 @@ def init(is_first_run: bool = False) -> None:
 
         if (
             lang_tag := Lang_tag.from_str(file.stem[5:])
-        ).language is not Lang_tag_language.Unknown:
+        ).language is not Lang_tag.Language.Unknown:
             easyrip_mlang.all_supported_lang_map[lang_tag] = lang_map
 
             log.debug("Loading \"{}\" as '{}' language successfully", file, lang_tag)

{easyrip-4.11.3 → easyrip-4.12.0}/easyrip/easyrip_mlang/__init__.py

@@ -1,22 +1,13 @@
 import locale
 
 from . import lang_en, lang_zh_Hans_CN
-from .global_lang_val import (
-    Global_lang_val,
-    Lang_tag,
-    Lang_tag_language,
-    Lang_tag_region,
-    Lang_tag_script,
-    Lang_tag_val,
-)
+from .global_lang_val import Global_lang_val, Lang_tag
+from .lang_tag_val import Lang_tag_val
 from .translator import translate_subtitles
 
 __all__ = [
     "Global_lang_val",
     "Lang_tag",
-    "Lang_tag_language",
-    "Lang_tag_region",
-    "Lang_tag_script",
     "Lang_tag_val",
     "Mlang_exception",
     "get_system_language",

easyrip-4.12.0/easyrip/easyrip_mlang/global_lang_val.py

@@ -0,0 +1,160 @@
+import enum
+from collections.abc import Iterable
+from dataclasses import dataclass
+from typing import Self, final
+
+
+@final
+@dataclass(slots=True, kw_only=True)
+class Lang_tag:
+    from .lang_tag_val import Lang_tag_language as Language
+    from .lang_tag_val import Lang_tag_region as Region
+    from .lang_tag_val import Lang_tag_script as Script
+
+    language: Language = Language.Unknown
+    script: Script = Script.Unknown
+    region: Region = Region.Unknown
+
+    class Match_priority(enum.Enum):
+        script = enum.auto()
+        region = enum.auto()
+
+    def match(
+        self,
+        target_tags: Iterable[Self],
+        *,
+        is_incomplete_match: bool = True,
+        priority: Match_priority = Match_priority.script,
+        is_allow_mismatch_language: bool = False,
+    ) -> Self | None:
+        """启用不完整匹配时，找到最匹配的第一项"""
+        target_tags_tuple = tuple(target_tags)
+        del target_tags
+
+        matching_tags_tuple = tuple(
+            tag for tag in target_tags_tuple if tag.language is self.language
+        )
+        if not matching_tags_tuple:
+            if is_allow_mismatch_language:
+                matching_tags_tuple = target_tags_tuple
+            else:
+                return None
+
+        if self in matching_tags_tuple:
+            return self
+        if not is_incomplete_match:
+            return None
+
+        same_region_tuple = tuple(
+            tag for tag in matching_tags_tuple if tag.region is self.region
+        )
+
+        same_script_tuple = tuple(
+            tag for tag in matching_tags_tuple if tag.script is self.script
+        )
+
+        if priority_same_tuple := (
+            same_script_tuple + same_region_tuple
+            if priority is self.__class__.Match_priority.script
+            else same_region_tuple + same_script_tuple
+        ):
+            return priority_same_tuple[0]
+
+        return matching_tags_tuple[0]
+
+    @classmethod
+    def from_str(
+        cls,
+        str_tag: str,
+    ) -> Self:
+        """
+        输入语言标签字符串，输出标签对象
+
+        e.g. zh-Hans-CN -> Self(Language.zh, Script.Hans, Region.CN)
+        """
+        from ..easyrip_mlang import gettext
+
+        str_tag_list = str_tag.split("-")
+
+        language: Lang_tag.Language = cls.Language.from_name(str_tag_list[0])
+        script: Lang_tag.Script = cls.Script.Unknown
+        region: Lang_tag.Region = cls.Region.Unknown
+
+        for i, s in enumerate(str_tag_list[1:]):
+            if s in cls.Script._member_map_:
+                if i != 0:
+                    raise ValueError(
+                        gettext("The input language tag string format is illegal")
+                    )
+                script = cls.Script[s]
+            elif s in cls.Region._member_map_:
+                region = cls.Region[s]
+
+        return cls(
+            language=language,
+            script=script,
+            region=region,
+        )
+
+    def __str__(self) -> str:
+        """返回语言标签字符串"""
+        if self.language == self.__class__.Language.Unknown:
+            raise Exception("The Language is Unknown")
+
+        res_str: str = self.language.name
+        if self.script != self.__class__.Script.Unknown:
+            res_str += f"-{self.script.name}"
+        if self.region != self.__class__.Region.Unknown:
+            res_str += f"-{self.region.name}"
+
+        return res_str
+
+    def __hash__(self) -> int:
+        return hash((self.language, self.script, self.region))
+
+
+class Global_lang_val:
+    gettext_target_lang: Lang_tag = Lang_tag()
+
+    @staticmethod
+    def language_tag_to_local_str(language_tag: str) -> str:
+        from ..easyrip_mlang import gettext
+
+        tag_list = language_tag.split("-")
+        tag_list_len = len(tag_list)
+
+        if tag_list_len == 0:
+            raise Exception(gettext("The input language tag string format is illegal"))
+
+        res_str_list: list[str] = [
+            _local_name
+            if (_org_name := tag_list[0]) in Lang_tag.Language._member_map_
+            and (_local_name := Lang_tag.Language[_org_name].value.local_name)
+            else _org_name
+        ]
+
+        if tag_list_len >= 2:
+            _org_name = tag_list[1]
+
+            if _org_name in Lang_tag.Script.__members__:
+                _local_name = Lang_tag.Script[_org_name].value.local_name
+            elif _org_name in Lang_tag.Region._member_map_:
+                _local_name = Lang_tag.Region[_org_name].value.local_name
+            else:
+                _local_name = _org_name
+
+            res_str_list.append(_local_name)
+
+        if tag_list_len >= 3:
+            _org_name = tag_list[2]
+
+            if _org_name in Lang_tag.Region._member_map_:
+                _local_name = Lang_tag.Region[_org_name].value.local_name
+            else:
+                _local_name = _org_name
+
+            res_str_list.append(_local_name)
+
+        return (" - " if any(" " in s for s in res_str_list) else "-").join(
+            res_str_list
+        )

easyrip-4.12.0/easyrip/easyrip_mlang/lang_en.py

@@ -0,0 +1,5 @@
+from .global_lang_val import Lang_tag
+
+LANG_TAG = Lang_tag(language=Lang_tag.Language.en)
+
+LANG_MAP: dict[str, str] = {}

easyrip-4.11.3/easyrip/easyrip_mlang/global_lang_val.py → easyrip-4.12.0/easyrip/easyrip_mlang/lang_tag_val.py

@@ -1,7 +1,6 @@
 import enum
-from collections.abc import Iterable
 from dataclasses import dataclass
-from typing import Self, final
+from typing import final
 
 
 @final
@@ -144,155 +143,3 @@ class Lang_tag_region(enum.Enum):
             return cls[name]
         except KeyError:
             return cls.Unknown
-
-
-@final
-@dataclass(slots=True, kw_only=True)
-class Lang_tag:
-    language: Lang_tag_language = Lang_tag_language.Unknown
-    script: Lang_tag_script = Lang_tag_script.Unknown
-    region: Lang_tag_region = Lang_tag_region.Unknown
-
-    class Match_priority(enum.Enum):
-        script = enum.auto()
-        region = enum.auto()
-
-    def match(
-        self,
-        target_tags: Iterable[Self],
-        *,
-        is_incomplete_match: bool = True,
-        priority: Match_priority = Match_priority.script,
-        is_allow_mismatch_language: bool = False,
-    ) -> Self | None:
-        """启用不完整匹配时，找到最匹配的第一项"""
-        target_tags_tuple = tuple(target_tags)
-        del target_tags
-
-        matching_tags_tuple = tuple(
-            tag for tag in target_tags_tuple if tag.language is self.language
-        )
-        if not matching_tags_tuple:
-            if is_allow_mismatch_language:
-                matching_tags_tuple = target_tags_tuple
-            else:
-                return None
-
-        if self in matching_tags_tuple:
-            return self
-        if not is_incomplete_match:
-            return None
-
-        same_region_tuple = tuple(
-            tag for tag in matching_tags_tuple if tag.region is self.region
-        )
-
-        same_script_tuple = tuple(
-            tag for tag in matching_tags_tuple if tag.script is self.script
-        )
-
-        if priority_same_tuple := (
-            same_script_tuple + same_region_tuple
-            if priority is Lang_tag.Match_priority.script
-            else same_region_tuple + same_script_tuple
-        ):
-            return priority_same_tuple[0]
-
-        return matching_tags_tuple[0]
-
-    @classmethod
-    def from_str(
-        cls,
-        str_tag: str,
-    ) -> Self:
-        """
-        输入语言标签字符串，输出标签对象
-
-        e.g. zh-Hans-CN -> Self(Language.zh, Script.Hans, Region.CN)
-        """
-        from ..easyrip_mlang import gettext
-
-        str_tag_list = str_tag.split("-")
-
-        language = Lang_tag_language.from_name(str_tag_list[0])
-        script: Lang_tag_script = Lang_tag_script.Unknown
-        region: Lang_tag_region = Lang_tag_region.Unknown
-
-        for i, s in enumerate(str_tag_list[1:]):
-            if s in Lang_tag_script._member_map_:
-                if i != 0:
-                    raise ValueError(
-                        gettext("The input language tag string format is illegal")
-                    )
-                script = Lang_tag_script[s]
-            elif s in Lang_tag_region._member_map_:
-                region = Lang_tag_region[s]
-
-        return cls(
-            language=language,
-            script=script,
-            region=region,
-        )
-
-    def __str__(self) -> str:
-        """返回语言标签字符串"""
-        if self.language == Lang_tag_language.Unknown:
-            raise Exception("The Language is Unknown")
-
-        res_str: str = self.language.name
-        if self.script != Lang_tag_script.Unknown:
-            res_str += f"-{self.script.name}"
-        if self.region != Lang_tag_region.Unknown:
-            res_str += f"-{self.region.name}"
-
-        return res_str
-
-    def __hash__(self) -> int:
-        return hash((self.language, self.script, self.region))
-
-
-class Global_lang_val:
-    gettext_target_lang: Lang_tag = Lang_tag()
-
-    @staticmethod
-    def language_tag_to_local_str(language_tag: str) -> str:
-        from ..easyrip_mlang import gettext
-
-        tag_list = language_tag.split("-")
-        tag_list_len = len(tag_list)
-
-        if tag_list_len == 0:
-            raise Exception(gettext("The input language tag string format is illegal"))
-
-        res_str_list: list[str] = [
-            _local_name
-            if (_org_name := tag_list[0]) in Lang_tag_language._member_map_
-            and (_local_name := Lang_tag_language[_org_name].value.local_name)
-            else _org_name
-        ]
-
-        if tag_list_len >= 2:
-            _org_name = tag_list[1]
-
-            if _org_name in Lang_tag_script.__members__:
-                _local_name = Lang_tag_script[_org_name].value.local_name
-            elif _org_name in Lang_tag_region._member_map_:
-                _local_name = Lang_tag_region[_org_name].value.local_name
-            else:
-                _local_name = _org_name
-
-            res_str_list.append(_local_name)
-
-        if tag_list_len >= 3:
-            _org_name = tag_list[2]
-
-            if _org_name in Lang_tag_region._member_map_:
-                _local_name = Lang_tag_region[_org_name].value.local_name
-            else:
-                _local_name = _org_name
-
-            res_str_list.append(_local_name)
-
-        return (" - " if any(" " in s for s in res_str_list) else "-").join(
-            res_str_list
-        )

{easyrip-4.11.3 → easyrip-4.12.0}/easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -1,15 +1,10 @@
 from ..easyrip_command import Audio_codec, Cmd_type, Opt_type, Preset_name
-from .global_lang_val import (
-    Lang_tag,
-    Lang_tag_language,
-    Lang_tag_region,
-    Lang_tag_script,
-)
+from .global_lang_val import Lang_tag
 
 LANG_TAG = Lang_tag(
-    language=Lang_tag_language.zh,
-    script=Lang_tag_script.Hans,
-    region=Lang_tag_region.CN,
+    language=Lang_tag.Language.zh,
+    script=Lang_tag.Script.Hans,
+    region=Lang_tag.Region.CN,
 )
 
 LANG_MAP: dict[str, str] = {
@@ -135,7 +130,8 @@ LANG_MAP: dict[str, str] = {
     ),
     Opt_type._preset.value.description: (
         "设置预设\n"
-        "预设名:\n"  # .
+        "\n"  # .
+        "预设名:\n"
         f"{Preset_name.to_help_string('  ')}"
     ),
     Opt_type._pipe.value.description: (
@@ -199,13 +195,14 @@ LANG_MAP: dict[str, str] = {
     ),
     Opt_type._c_a.value.description: (
         "设置音频编码器\n"
-        "音频编码器:\n"  # .
+        "\n"  # .
+        "音频编码器:\n"
         f"{Audio_codec.to_help_string('  ')}"
     ),
     Opt_type._b_a.value.description: "设置音频码率。默认值 '160k'",
     Opt_type._muxer.value.description: (
         "设置复用器\n"
-        " \n"  # .
+        "\n"  # .
         "可用的复用器:\n"
         "  mp4\n"
         "  mkv"
@@ -323,6 +320,9 @@ LANG_MAP: dict[str, str] = {
     "Failed to add Ripper: {}": "添加 Ripper 失败: {}",
     "'{}' is not a valid '{}', set to default value '{}'. Valid options are: {}": "'{}' 不存在于 '{}', 已设为默认值 '{}'。有以下值可用: {}",
     "The preset custom must have custom:format or custom:template": "custom 预设必须要有 custom:format 或 custom:template",
+    "Run the following commands in order:\n{}": "按顺序执行以下命令:\n{}",
+    "Run the command {}": "执行命令 {}",
+    "Command run failed: status code {}\n  Failed command: {}": "命令执行失败: 状态码 {}\n  失败的命令: {}",
     "There have error in running": "执行时出错",
     "{} param illegal": "{} 参数非法",
     'The file "{}" already exists, skip translating it': '文件 "{}" 已存在, 跳过翻译',