easyrip 4.15.0__py3-none-any.whl → 4.15.1__py3-none-any.whl

easyrip/__main__.py

@@ -107,6 +107,7 @@ def run() -> NoReturn:
                 )
                 for ctv in ctvs
                 for name in ctv.names
+                if not ctv.is_no_prompt_child
             }
         )
 
@@ -132,6 +133,7 @@ def run() -> NoReturn:
             )
             for ctv in ctvs
             for name in ctv.names
+            if not ctv.is_no_prompt_child
         }
 
     cmd_ctv_tuple = tuple(ct.value for ct in Cmd_type if ct != Cmd_type.Option)

easyrip/easyrip_command.py

@@ -28,6 +28,12 @@ class Cmd_type_val:
     _param: str
     _description: str
     childs: tuple["Cmd_type_val", ...]
+    is_no_prompt_child: bool
+    """此项作为父项的子项时，不在自动补全时使用"""
+    is_no_doc_child: bool
+    """此项作为父项的子项时，不在 doc 时使用"""
+    is_all_no_doc_childs: bool
+    """此项的所有子项不在 doc 时使用"""
 
     @property
     def param(self) -> str:
@@ -64,11 +70,17 @@ class Cmd_type_val:
         param: str = "",
         description: str = "",
         childs: tuple["Cmd_type_val", ...] = (),
+        is_no_prompt_child: bool = False,
+        is_no_doc_child: bool = False,
+        is_all_no_doc_childs: bool = False,
     ) -> None:
         self.names = names
         self.param = param
         self.description = description
         self.childs = childs
+        self.is_no_prompt_child = is_no_prompt_child
+        self.is_no_doc_child = is_no_doc_child
+        self.is_all_no_doc_childs = is_all_no_doc_childs
 
     def __eq__(self, other: object) -> bool:
         if isinstance(other, Cmd_type_val):
@@ -79,7 +91,19 @@ class Cmd_type_val:
         return hash(self.names)
 
     def to_doc(self) -> str:
-        return f"{' / '.join(self.names)} {self.param}\n{textwrap.indent(self.description, ' │ ', lambda _: True)}"
+        description: str = ((f"{self.description}\n") if self.description else "") + (
+            ""
+            if self.is_all_no_doc_childs
+            else "".join(
+                f"\n{child.to_doc()}"
+                for child in self.childs
+                if not child.is_no_doc_child
+            )
+        )
+        return (
+            f"{' / '.join(self.names)} {self.param}\n"
+            f"{textwrap.indent(description, ' │ ', lambda _: True)}"  # 永远返回 True 才能保证空行前也能加字符
+        )
 
 
 class Cmd_type(enum.Enum):
@@ -123,6 +147,7 @@ class Cmd_type(enum.Enum):
             Cmd_type_val(("send",)),
             Cmd_type_val(("debug",)),
         ),
+        is_all_no_doc_childs=True,
     )
     _run_any = Cmd_type_val(
         ("$",),
@@ -146,6 +171,7 @@ class Cmd_type(enum.Enum):
             Cmd_type_val(("fd",)),
             Cmd_type_val(("cfd",)),
         ),
+        is_all_no_doc_childs=True,
     )
     dir = ls = Cmd_type_val(
         ("dir", "ls"),
@@ -163,55 +189,54 @@ class Cmd_type(enum.Enum):
     list = Cmd_type_val(
         ("list",),
         param="<list option>",
-        description=(
-            "Operate Ripper list\n"
-            " \n"
-            "Default:\n"
-            "  Show Ripper list\n"
-            " \n"
-            "clear / clean:\n"
-            "  Clear Ripper list\n"
-            " \n"
-            "del / pop <index>:\n"
-            "  Delete a Ripper from Ripper list\n"
-            " \n"
-            "sort [n][r]:\n"
-            "  Sort list\n"
-            "  'n': Natural Sorting\n"
-            "  'r': Reverse\n"
-            " \n"
-            "<int> <int>:\n"
-            "  Exchange specified index"
-        ),
+        description="Operate Ripper list",
         childs=(
-            Cmd_type_val(("clear", "clean")),
-            Cmd_type_val(("del", "pop")),
-            Cmd_type_val(("sort",), childs=(Cmd_type_val(("n", "r", "nr")),)),
+            Cmd_type_val(
+                ("Default",), description="Show Ripper list", is_no_prompt_child=True
+            ),
+            Cmd_type_val(("clear", "clean"), description="Clear Ripper list"),
+            Cmd_type_val(
+                ("del", "pop"),
+                param="<index>",
+                description="Delete a Ripper from Ripper list",
+            ),
+            Cmd_type_val(
+                ("sort",),
+                param="[n][r]",
+                description=(
+                    "Sort list\n"  # .
+                    "'n': Natural Sorting\n"
+                    "'r': Reverse"
+                ),
+                childs=(Cmd_type_val(("n", "r", "nr")),),
+            ),
+            Cmd_type_val(
+                ("<int> <int>",),
+                description="Exchange specified index",
+                is_no_prompt_child=True,
+            ),
         ),
     )
     run = Cmd_type_val(
         ("run",),
         param="[<run option>] [-multithreading <0 | 1>]",
-        description=(
-            "Run the Ripper in the Ripper list\n"
-            "\n"
-            "Default:\n"
-            "  Only run\n"
-            "\n"
-            "exit:\n"
-            "  Close program when run finished\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"
-        ),
+        description="Run the Ripper from the Ripper list",
         childs=(
-            Cmd_type_val(("exit",)),
-            Cmd_type_val(("shutdown",)),
-            Cmd_type_val(("server",)),
+            Cmd_type_val(("Default",), description="Only run", is_no_prompt_child=True),
+            Cmd_type_val(("exit",), description="Close program when run finished"),
+            Cmd_type_val(
+                ("shutdown",),
+                param="[<sec>]",
+                description=(
+                    "Shutdown when run finished\n"  # .
+                    "Default: 60"
+                ),
+            ),
+            Cmd_type_val(
+                ("server",),
+                param="[<address>]:[<port>]@[<password>]",
+                description="See the corresponding help for details",
+            ),
         ),
     )
     server = Cmd_type_val(
@@ -226,23 +251,23 @@ class Cmd_type(enum.Enum):
     config = Cmd_type_val(
         ("config",),
         param="<config option>",
-        description=(
-            "regenerate | clear | clean\n"
-            "  Regenerate config file\n"
-            "open\n"
-            "  Open the directory where the config file is located\n"
-            "list\n"
-            "  Show all config adjustable options\n"
-            "set <key> <val>\n"
-            "  Set config\n"
-            "  e.g. config set language zh"
-        ),
         childs=(
-            Cmd_type_val(("regenerate", "clear", "clean")),
-            Cmd_type_val(("open",)),
-            Cmd_type_val(("list",)),
+            Cmd_type_val(
+                ("regenerate", "clear", "clean", "reset"),
+                description="Regenerate config file",
+            ),
+            Cmd_type_val(
+                ("open",),
+                description="Open the directory where the config file is located",
+            ),
+            Cmd_type_val(("list",), description="Show all config adjustable options"),
             Cmd_type_val(
                 ("set",),
+                param="<key> <val>",
+                description=(
+                    "Set config\n"  # .
+                    "e.g. config set language zh"
+                ),
                 childs=tuple(Cmd_type_val((k,)) for k in Config_key._member_map_),
             ),
         ),
@@ -250,25 +275,21 @@ class Cmd_type(enum.Enum):
     prompt = Cmd_type_val(
         ("prompt",),
         param="<prompt option>",
-        description=(
-            "history\n"  # .
-            "  Show prompt history\n"
-            "history_clear\n"
-            "  Delete history file\n"
-            "add <name:string> <cmd:string>\n"
-            "  Add a custom prompt\n"
-            "  e.g. prompt add myprompt echo my prompt\n"
-            "del <name:string>\n"
-            "  Delete a custom prompt"
-            "show\n"
-            "  Show custom prompt"
-        ),
         childs=(
-            Cmd_type_val(("history",)),
-            Cmd_type_val(("history_clear",)),
-            Cmd_type_val(("add",)),
-            Cmd_type_val(("del",)),
-            Cmd_type_val(("show",)),
+            Cmd_type_val(("history",), description="Show prompt history"),
+            Cmd_type_val(("history_clear",), description="Delete history file"),
+            Cmd_type_val(
+                ("add",),
+                param="<name:string> <cmd:string>",
+                description=(
+                    "Add a custom prompt\n"  # .
+                    "e.g. prompt add myprompt echo my prompt"
+                ),
+            ),
+            Cmd_type_val(
+                ("del",), param="<name:string>", description="Delete a custom prompt"
+            ),
+            Cmd_type_val(("show",), description="Show custom prompt"),
         ),
     )
     translate = Cmd_type_val(
@@ -287,6 +308,7 @@ class Cmd_type(enum.Enum):
             Cmd_type_val(("fd",)),
             Cmd_type_val(("cfd",)),
         ),
+        is_all_no_doc_childs=True,
     )
     assinfo = Cmd_type_val(
         ("assinfo",),
@@ -296,6 +318,7 @@ class Cmd_type(enum.Enum):
             Cmd_type_val(("fd",)),
             Cmd_type_val(("cfd",)),
         ),
+        is_all_no_doc_childs=True,
     )
     fontinfo = Cmd_type_val(
         ("fontinfo",),
@@ -305,6 +328,7 @@ class Cmd_type(enum.Enum):
             Cmd_type_val(("fd",)),
             Cmd_type_val(("cfd",)),
         ),
+        is_all_no_doc_childs=True,
     )
     Option = Cmd_type_val(
         ("Option",),
@@ -325,7 +349,7 @@ class Cmd_type(enum.Enum):
 
     @classmethod
     def to_doc(cls) -> str:
-        return "\n\n".join(ct.value.to_doc() for ct in cls)
+        return "\n".join(ct.value.to_doc() for ct in cls)
 
 
 class Opt_type(enum.Enum):
@@ -340,6 +364,7 @@ class Opt_type(enum.Enum):
             Cmd_type_val(("fd",)),
             Cmd_type_val(("cfd",)),
         ),
+        is_all_no_doc_childs=True,
     )
     _o_dir = Cmd_type_val(
         ("-o:dir",),
@@ -361,10 +386,12 @@ class Opt_type(enum.Enum):
         description=(
             "If enable, output file name will add auto infix:\n"
             "  no audio: '.v'\n"
-            "  with audio: '.va'\n"
-            "Default: 1"
+            "  with audio: '.va'"
+        ),
+        childs=(
+            Cmd_type_val(("Default:",), param="1", is_no_prompt_child=True),
+            Cmd_type_val(("0", "1"), is_no_doc_child=True),
         ),
-        childs=(Cmd_type_val(("0", "1")),),
     )
     _preset = _p = Cmd_type_val(
         ("-p", "-preset"),
@@ -375,7 +402,9 @@ class Opt_type(enum.Enum):
             "Preset name:\n"
             f"{Preset_name.to_help_string('  ')}"
         ),
-        childs=(Cmd_type_val(tuple(Preset_name._value2member_map_)),),
+        childs=(
+            Cmd_type_val(tuple(Preset_name._value2member_map_), is_no_doc_child=True),
+        ),
     )
     _pipe = Cmd_type_val(
         ("-pipe",),
@@ -411,7 +440,7 @@ class Opt_type(enum.Enum):
             "'auto:...' can only select which match infix.\n"
             "  e.g. 'auto:zh-Hans:zh-Hant'"
         ),
-        childs=(Cmd_type_val(("auto",)),),
+        childs=(Cmd_type_val(("auto",), is_no_doc_child=True),),
     )
     _only_mux_sub_path = Cmd_type_val(
         ("-only-mux-sub-path",),
@@ -425,7 +454,7 @@ class Opt_type(enum.Enum):
             "Mux ASS subtitles in MKV with subset\n"  # .
             "The usage of 'auto' is detailed in '-sub'"
         ),
-        childs=(Cmd_type_val(("auto",)),),
+        childs=(Cmd_type_val(("auto",), is_no_doc_child=True),),
     )
     _subset_font_dir = Cmd_type_val(
         ("-subset-font-dir",),
@@ -438,20 +467,20 @@ class Opt_type(enum.Enum):
     _subset_font_in_sub = Cmd_type_val(
         ("-subset-font-in-sub",),
         param="<0 | 1>",
-        description=(
-            "Encode fonts into ASS file instead of standalone files\n"  # .
-            "Default: 0"
+        description="Encode fonts into ASS file instead of standalone files",
+        childs=(
+            Cmd_type_val(("Default:",), param="0", is_no_prompt_child=True),
+            Cmd_type_val(("0", "1"), is_no_doc_child=True),
         ),
-        childs=(Cmd_type_val(("0", "1")),),
     )
     _subset_use_win_font = Cmd_type_val(
         ("-subset-use-win-font",),
         param="<0 | 1>",
-        description=(
-            "Use Windows fonts when can not find font in subset-font-dir\n"  # .
-            "Default: 0"
+        description="Use Windows fonts when can not find font in subset-font-dir",
+        childs=(
+            Cmd_type_val(("Default:",), param="0", is_no_prompt_child=True),
+            Cmd_type_val(("0", "1"), is_no_doc_child=True),
         ),
-        childs=(Cmd_type_val(("0", "1")),),
     )
     _subset_use_libass_spec = Cmd_type_val(
         ("-subset-use-libass-spec",),
@@ -459,38 +488,44 @@ class Opt_type(enum.Enum):
         description=(
             "Use libass specification when subset\n"
             'e.g. "11\\{22}33" ->\n'
-            '  "11\\33"   (VSFilter)\n'
-            '  "11{22}33" (libass)\n'
-            "Default: 1"
+            '       "11\\33"    (VSFilter)\n'
+            '       "11{22}33" (libass)'
+        ),
+        childs=(
+            Cmd_type_val(("Default:",), param="1", is_no_prompt_child=True),
+            Cmd_type_val(("0", "1"), is_no_doc_child=True),
         ),
-        childs=(Cmd_type_val(("0", "1")),),
     )
     _subset_drop_non_render = Cmd_type_val(
         ("-subset-drop-non-render",),
         param="<0 | 1>",
         description=(
-            "Drop non rendered content such as Comment lines, Name, Effect, etc. in ASS\n"
-            "Default: 1"
+            "Drop non rendered content such as Comment lines, Name, Effect, etc. in ASS"
+        ),
+        childs=(
+            Cmd_type_val(("Default:",), param="1", is_no_prompt_child=True),
+            Cmd_type_val(("0", "1"), is_no_doc_child=True),
         ),
-        childs=(Cmd_type_val(("0", "1")),),
     )
     _subset_drop_unkow_data = Cmd_type_val(
         ("-subset-drop-unkow-data",),
         param="<0 | 1>",
         description=(
-            "Drop lines that are not in {[Script Info], [V4+ Styles], [Events]} in ASS\n"
-            "Default: 1"
+            "Drop lines that are not in {[Script Info], [V4+ Styles], [Events]} in ASS"
+        ),
+        childs=(
+            Cmd_type_val(("Default:",), param="1", is_no_prompt_child=True),
+            Cmd_type_val(("0", "1"), is_no_doc_child=True),
         ),
-        childs=(Cmd_type_val(("0", "1")),),
     )
     _subset_strict = Cmd_type_val(
         ("-subset-strict",),
         param="<0 | 1>",
-        description=(
-            "Some error will interrupt subset\n"  # .
-            "Default: 0"
+        description="Some error will interrupt subset",
+        childs=(
+            Cmd_type_val(("Default:",), param="0", is_no_prompt_child=True),
+            Cmd_type_val(("0", "1"), is_no_doc_child=True),
         ),
-        childs=(Cmd_type_val(("0", "1")),),
     )
     _translate_sub = Cmd_type_val(
         ("-translate-sub",),
@@ -509,12 +544,15 @@ class Opt_type(enum.Enum):
             "Audio encoder:\n"
             f"{Audio_codec.to_help_string('  ')}"
         ),
-        childs=(Cmd_type_val(tuple(Audio_codec._value2member_map_)),),
+        childs=(
+            Cmd_type_val(tuple(Audio_codec._value2member_map_), is_no_doc_child=True),
+        ),
     )
     _b_a = Cmd_type_val(
         ("-b:a",),
         param="<string>",
-        description="Setting audio bitrate. Default '160k'",
+        description="Setting audio bitrate",
+        childs=(Cmd_type_val(("Default:",), param="160k", is_no_prompt_child=True),),
     )
     _muxer = Cmd_type_val(
         ("-muxer",),
@@ -523,9 +561,17 @@ class Opt_type(enum.Enum):
             "Setting muxer\n"
             "\n"  # .
             "Muxer:\n"
-            f"{Audio_codec.to_help_string('  ')}"
+            f"{Muxer.to_help_string('  ')}"
+        ),
+        childs=(Cmd_type_val(tuple(Muxer._value2member_map_), is_no_doc_child=True),),
+    )
+    _track_name = Cmd_type_val(
+        ("-track-name",),
+        param="<string>",
+        description=(
+            "Python list[str] format\n"  # .
+            "e.g. \"['0:name1', '1:name2']\""
         ),
-        childs=(Cmd_type_val(tuple(Muxer._value2member_map_)),),
     )
     _r = _fps = Cmd_type_val(
         ("-r", "-fps"),
@@ -534,7 +580,7 @@ class Opt_type(enum.Enum):
             "Setting FPS when muxing\n"
             "When using auto, the frame rate is automatically obtained from the input video and adsorbed to the nearest preset point"
         ),
-        childs=(Cmd_type_val(("auto",)),),
+        childs=(Cmd_type_val(("auto",), is_no_doc_child=True),),
     )
     _chapters = Cmd_type_val(
         ("-chapters",),
@@ -564,26 +610,23 @@ class Opt_type(enum.Enum):
     _run = Cmd_type_val(
         ("-run",),
         param="[<string>]",
-        description=(
-            "Run the Ripper from the Ripper list\n"
-            "\n"
-            "Default:\n"
-            "  Only run\n"
-            "\n"
-            "exit:\n"
-            "  Close program when run finished\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"
-        ),
+        description=("Run the Ripper from the Ripper list"),
         childs=(
-            Cmd_type_val(("exit",)),
-            Cmd_type_val(("shutdown",)),
-            Cmd_type_val(("server",)),
+            Cmd_type_val(("Default",), description="Only run", is_no_prompt_child=True),
+            Cmd_type_val(("exit",), description="Close program when run finished"),
+            Cmd_type_val(
+                ("shutdown",),
+                param="[<sec>]",
+                description=(
+                    "Shutdown when run finished\n"  # .
+                    "Default: 60"
+                ),
+            ),
+            Cmd_type_val(
+                ("server",),
+                param="[<address>]:[<port>]@[<password>]",
+                description="See the corresponding help for details",
+            ),
         ),
     )
     _ff_params_ff = _ff_params = Cmd_type_val(
@@ -615,19 +658,15 @@ class Opt_type(enum.Enum):
         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",
-                )
-            ),
+            Cmd_type_val(("cuda",)),
+            Cmd_type_val(("vaapi",)),
+            Cmd_type_val(("dxva2",)),
+            Cmd_type_val(("qsv",)),
+            Cmd_type_val(("d3d11va",)),
+            Cmd_type_val(("opencl",)),
+            Cmd_type_val(("vulkan",)),
+            Cmd_type_val(("d3d12va",)),
+            Cmd_type_val(("amf",)),
         ),
     )
     _ss = Cmd_type_val(
@@ -649,11 +688,11 @@ class Opt_type(enum.Enum):
     _hevc_strict = Cmd_type_val(
         ("-hevc-strict",),
         param="<0 | 1>",
-        description=(
-            "When the resolution >= 4K, close HME, and auto reduce the -ref\n"  # .
-            "Default: 1"
+        description="When the resolution >= 4K, close HME, and auto reduce the -ref",
+        childs=(
+            Cmd_type_val(("Default:",), param="1", is_no_prompt_child=True),
+            Cmd_type_val(("0", "1"), is_no_doc_child=True),
         ),
-        childs=(Cmd_type_val(("0", "1")),),
     )
     _multithreading = Cmd_type_val(
         ("-multithreading",),
@@ -662,16 +701,24 @@ class Opt_type(enum.Enum):
             "Use multi-threading to run Ripper list, suitable for situations with low performance occupancy\n"
             "e.g. -p subset or -p copy"
         ),
-        childs=(Cmd_type_val(("0", "1")),),
+        childs=(
+            Cmd_type_val(("Default:",), param="0", is_no_prompt_child=True),
+            Cmd_type_val(("0", "1"), is_no_doc_child=True),
+        ),
     )
     _quality_detection = Cmd_type_val(
         ("-quality-detection",),
         param="<algorithm>[:<threshold>]",
         description=(
             "Comparison of quality between detection and source after encoding is completed\n"
-            "Algorithm: ssim psnr vmaf"
+            "\n"
+            "Algorithm:"
+        ),
+        childs=(
+            Cmd_type_val(("ssim",), description="Default threshold: 0.9"),
+            Cmd_type_val(("psnr",), description="Default threshold: 30"),
+            Cmd_type_val(("vmaf",), description="Default threshold: 80"),
         ),
-        childs=(Cmd_type_val(("ssim", "psnr", "vmaf")),),
     )
 
     @classmethod
@@ -683,12 +730,13 @@ class Opt_type(enum.Enum):
 
     @classmethod
     def to_doc(cls) -> str:
-        return "\n\n".join(ct.value.to_doc() for ct in cls)
+        return "\n".join(ct.value.to_doc() for ct in cls)
 
 
 Cmd_type.help.value.childs = tuple(
     ct.value for ct in itertools.chain(Cmd_type, Opt_type) if ct is not Cmd_type.help
 )
+Cmd_type.help.value.is_all_no_doc_childs = True
 
 
 def get_help_doc() -> str:

easyrip/easyrip_main.py

@@ -467,7 +467,17 @@ def run_command(command: Iterable[str] | str) -> bool:
                         log.error("'{}' does not exist", cmd_list[1])
 
                     case _:
-                        log.send(_want_doc_cmd_type.value.to_doc(), is_format=False)
+                        _child = _want_doc_cmd_type.value
+                        for s in cmd_list[2:-1]:
+                            for ch in _child.childs:
+                                if s in ch.names:
+                                    _child = ch
+                                    break
+                            else:
+                                log.error("'{}' does not exist", s)
+                                break
+                        else:
+                            log.send(_child.to_doc(), is_format=False)
             else:
                 log.send(get_help_doc(), is_format=False)
 

easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -1,4 +1,4 @@
-from ..easyrip_command import Audio_codec, Cmd_type, Opt_type, Preset_name
+from ..easyrip_command import Audio_codec, Cmd_type, Muxer, Opt_type, Preset_name
 from .global_lang_val import Lang_tag
 
 LANG_TAG = Lang_tag(
@@ -46,43 +46,27 @@ LANG_MAP: dict[str, str] = {
     Cmd_type.mkdir.value.description: "新建文件目录",
     Cmd_type.cls.value.description: "清屏",
     Cmd_type.list.value.param: "<list 选项>",
-    Cmd_type.list.value.description: (
-        "操作 Ripper list\n"
-        " \n"
-        "默认:\n"
-        "  打印 Ripper list\n"
-        " \n"
-        "clear / clean:\n"
-        "  清空 Ripper list\n"
-        " \n"
-        "del / pop <index>:\n"
-        "  删除 Ripper list 中指定的一个 Ripper\n"
-        " \n"
-        "sort [n][r]:\n"
-        "  排序 list\n"
-        "  'n': 自然排序\n"
-        "  'r': 倒序\n"
-        " \n"
-        "<int> <int>:\n"
-        "  交换指定索引"
-    ),
+    Cmd_type.list.value.description: "操作 Ripper list",
+    Cmd_type.list.value.childs[0].description: "打印 Ripper list",
+    Cmd_type.list.value.childs[1].description: "清空 Ripper list",
+    Cmd_type.list.value.childs[2].description: "删除 Ripper list 中指定的一个 Ripper",
+    Cmd_type.list.value.childs[3].description: (
+        "排序 list\n"  # .
+        "'n': 自然排序\n"
+        "'r': 倒序"
+    ),
+    Cmd_type.list.value.childs[4].description: "交换指定索引",
     Cmd_type.run.value.param: "[<run 选项>] [-multithreading <0 | 1>]",
-    Cmd_type.run.value.description: (
-        "执行 Ripper list 中的 Ripper\n"
-        "\n"
-        "默认:\n"
-        "  仅执行\n"
-        "\n"
-        "exit:\n"
-        "  执行后退出程序\n"
-        "\n"
-        "shutdown [<秒数>]:\n"
-        "  执行后关机\n"
-        "  默认: 60\n"
-        "\n"
-        "server [<地址>]:[<端口>]@[<密码>]:\n"
-        "  详见对应的 help"
-    ),
+    Cmd_type.run.value.description: "执行 Ripper list 中的 Ripper",
+    Cmd_type.run.value.childs[0].description: "仅执行",
+    Cmd_type.run.value.childs[1].description: "执行后退出程序",
+    Cmd_type.run.value.childs[2].param: "[<秒数>]",
+    Cmd_type.run.value.childs[2].description: (
+        "执行后关机\n"  # .
+        "默认: 60"
+    ),
+    Cmd_type.run.value.childs[3].param: "[<地址>]:[<端口>]@[<密码>]",
+    Cmd_type.run.value.childs[3].description: "详见对应的 help",
     Cmd_type.server.value.param: "[<地址>]:[<端口>]@[<密码>]",
     Cmd_type.server.value.description: (
         "启动 web 服务\n"
@@ -90,18 +74,22 @@ LANG_MAP: dict[str, str] = {
         "客户端发送命令 'kill' 可以退出 Ripper 的运行, 注意, FFmpeg需要接受多次^C信号才能强制终止, 单次^C会等待文件输出完才会终止"
     ),
     Cmd_type.config.value.param: "<config 选项>",
-    Cmd_type.config.value.description: (
-        "regenerate | clear | clean | reset\n"
-        "  重新生成 config 文件\n"
-        "open\n"
-        "  打开 config 文件所在目录\n"
-        "list\n"
-        "  展示所有 config 可调选项\n"
-        "set <key> <val>\n"
-        "  设置 config\n"
-        "  例如 config set language en"
+    Cmd_type.config.value.childs[0].description: "重新生成 config 文件",
+    Cmd_type.config.value.childs[1].description: "打开 config 文件所在目录",
+    Cmd_type.config.value.childs[2].description: "展示所有 config 可调选项",
+    Cmd_type.config.value.childs[3].description: (
+        "设置 config\n"  # .
+        "例如 config set language en"
     ),
     Cmd_type.prompt.value.param: "<prompt 选项>",
+    Cmd_type.prompt.value.childs[0].description: "打印 prompt 历史",
+    Cmd_type.prompt.value.childs[1].description: "删除 prompt 历史文件",
+    Cmd_type.prompt.value.childs[2].description: (
+        "增加一个自定义 prompt\n"  # .
+        "e.g. prompt add myprompt echo my prompt"
+    ),
+    Cmd_type.prompt.value.childs[3].description: "删除一个自定义 prompt",
+    Cmd_type.prompt.value.childs[4].description: "打印自定义 prompt",
     Cmd_type.translate.value.param: "<中缀> <目标语言标签> [-overwrite]",
     Cmd_type.translate.value.description: (
         "翻译字幕文件\n"
@@ -125,8 +113,7 @@ LANG_MAP: dict[str, str] = {
     Opt_type._auto_infix.value.description: (
         "如果启用, 输出的文件将添加自动中缀:\n"  # .
         "  无音轨: '.v'\n"
-        "  有音轨: '.va'\n"
-        "默认: 1"
+        "  有音轨: '.va'"
     ),
     Opt_type._preset.value.description: (
         "设置预设\n"
@@ -162,32 +149,24 @@ LANG_MAP: dict[str, str] = {
         '默认: 优先当前目录, 其次当前目录下含有 "font" 的文件夹 (不分大小写)'
     ),
     Opt_type._subset_font_in_sub.value.description: (
-        "将字体编码到 ASS 文件中, 而不是单独的字体文件\n"  # .
-        "默认: 0"
+        "将字体编码到 ASS 文件中, 而不是单独的字体文件"
     ),
     Opt_type._subset_use_win_font.value.description: (
-        "无法从 subset-font-dir 找到字体时使用 Windows 字体\n"  # .
-        "默认: 0"
+        "无法从 subset-font-dir 找到字体时使用 Windows 字体"
     ),
     Opt_type._subset_use_libass_spec.value.description: (
         "子集化时使用 libass 规范\n"
         'e.g. "11\\{22}33" ->\n'
-        '  "11\\33"   (VSFilter)\n'
-        '  "11{22}33" (libass)\n'
-        "默认: 1"
+        '       "11\\33"    (VSFilter)\n'
+        '       "11{22}33" (libass)'
     ),
     Opt_type._subset_drop_non_render.value.description: (
-        "丢弃 ASS 中的注释行、Name、Effect等非渲染内容\n"  # .
-        "默认: 1"
+        "丢弃 ASS 中的注释行、Name、Effect等非渲染内容"
     ),
     Opt_type._subset_drop_unkow_data.value.description: (
-        "丢弃 ASS 中的非 {[Script Info], [V4+ Styles], [Events]} 行\n"  # .
-        "默认: 1"
-    ),
-    Opt_type._subset_strict.value.description: (
-        "子集化时报错则中断\n"  # .
-        "默认: 0"
+        "丢弃 ASS 中的非 {[Script Info], [V4+ Styles], [Events]} 行"
     ),
+    Opt_type._subset_strict.value.description: "子集化时报错则中断",
     Opt_type._translate_sub.value.param: "<中缀>:<语言标签>",
     Opt_type._translate_sub.value.description: (
         "临时生成字幕的翻译文件\n"  # .
@@ -199,13 +178,12 @@ LANG_MAP: dict[str, str] = {
         "音频编码器:\n"
         f"{Audio_codec.to_help_string('  ')}"
     ),
-    Opt_type._b_a.value.description: "设置音频码率。默认值 '160k'",
+    Opt_type._b_a.value.description: "设置音频码率",
     Opt_type._muxer.value.description: (
         "设置复用器\n"
         "\n"  # .
         "可用的复用器:\n"
-        "  mp4\n"
-        "  mkv"
+        f"{Muxer.to_help_string('  ')}"
     ),
     Opt_type._r.value.description: (
         "设置封装的帧率\n"  # .
@@ -224,22 +202,6 @@ LANG_MAP: dict[str, str] = {
         "当 -preset custom 时, 这个选项将作为输出文件的后缀\n"  # .
         '默认: ""'
     ),
-    Opt_type._run.value.description: (
-        "执行 Ripper list 中的 Ripper\n"
-        "\n"
-        "默认:\n"
-        "  仅执行\n"
-        "\n"
-        "exit:\n"
-        "  执行后退出程序\n"
-        "\n"
-        "shutdown [<秒数>]:\n"
-        "  执行后关机\n"
-        "  默认: 60\n"
-        "\n"
-        "server [<地址>]:[<端口>]@[<密码>]:\n"
-        "  详见对应的 help"
-    ),
     Opt_type._ff_params_ff.value.description: (
         "设置 FFmpeg 的全局选项\n"  # .
         "等同于 ffmpeg <option> ... -i ..."
@@ -262,8 +224,7 @@ LANG_MAP: dict[str, str] = {
         "等同于 ffmpeg -i ... -t <time> ..."
     ),
     Opt_type._hevc_strict.value.description: (
-        "当分辨率 >= 4K 时, 关闭 HME, 并自动降低 -ref\n"  # .
-        "默认: 1"
+        "当分辨率 >= 4K 时, 关闭 HME, 并自动降低 -ref"
     ),
     Opt_type._multithreading.value.description: (
         "使用多线程执行 Ripper list, 适合性能占用低的情况\n"  # .
@@ -327,6 +288,7 @@ LANG_MAP: dict[str, str] = {
     "Command run failed: status code {}\n  Failed command: {}": "命令执行失败: 状态码 {}\n  失败的命令: {}",
     "There have error in running": "执行时出错",
     "{} param illegal": "{} 参数非法",
+    "{} param illegal: {}": "{} 参数非法: {}",
     'The file "{}" already exists, skip translating it': '文件 "{}" 已存在, 跳过翻译',
     "Subset failed, cancel mux": "子集化失败, 取消混流",
     "FFmpeg report: {}": "FFmpeg 报告: {}",

easyrip/global_val.py

@@ -4,7 +4,7 @@ from functools import cache
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.15.0"
+PROJECT_VERSION = "4.15.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/ripper.py

@@ -1,3 +1,4 @@
+import ast
 import csv
 import os
 import re
@@ -14,8 +15,13 @@ from typing import Final, Self, final
 
 from .. import easyrip_web
 from ..easyrip_log import log
-from ..easyrip_mlang import Global_lang_val, gettext, translate_subtitles
-from ..utils import get_base62_time, read_text
+from ..easyrip_mlang import (
+    Global_lang_val,
+    Mlang_exception,
+    gettext,
+    translate_subtitles,
+)
+from ..utils import get_base62_time, read_text, type_match
 from .media_info import Media_info, Stream_error
 from .param import (
     FONT_SUFFIX_SET,
@@ -245,6 +251,37 @@ class Ripper:
 
         # Muxer
         muxer_format_str_list: list[str]
+        _track_name_org_str = self.option_map.get("track-name", "[]")
+        try:
+            track_name_list = ast.literal_eval(_track_name_org_str)
+        except Exception as e:
+            raise Mlang_exception("{} param illegal", "-track-name") from e
+        if not type_match(track_name_list, list[str]):
+            raise Mlang_exception("{} param illegal", "-track-name")
+        for i in range(len(track_name_list)):
+            track_name = track_name_list[i]
+            if '"' in track_name:
+                if "'" in track_name:
+                    raise Mlang_exception(
+                        "{} param illegal: {}",
+                        "-track-name",
+                        "The '\"' and \"'\" can not exist simultaneously",
+                    )
+                track_name = f"'{track_name}'"
+            else:
+                track_name = f'"{track_name}"'
+            track_name_list[i] = track_name
+        log.debug(f"-track-name <- {_track_name_org_str!r}", is_format=False)
+        log.debug(f"-track-name -> {track_name_list!r}", is_format=False)
+
+        mkv_all_need_opt_str: str = (
+            "".join(f"--track-name {track_name} " for track_name in track_name_list)
+        ) + (
+            f"--chapters {chapters} "
+            if (chapters := self.option_map.get("chapters"))
+            else ""
+        )
+
         if muxer := self.option_map.get("muxer"):
             muxer = Ripper.Muxer(muxer)
 
@@ -284,11 +321,7 @@ class Ripper:
                                 if force_fps and only_mux_sub_path is None
                                 else ""
                             )
-                            + (
-                                f"--chapters {chapters} "
-                                if (chapters := self.option_map.get("chapters"))
-                                else ""
-                            )
+                            + mkv_all_need_opt_str
                             + (
                                 " ".join(
                                     (
@@ -428,13 +461,19 @@ class Ripper:
                                 _encoder_format_str += f" -rem {_audio_info.index + 1}"
                         else:
                             _encoder_format_str = (
-                                'mkvmerge -o "{output}" --no-audio "{input}"'
+                                'mkvmerge -o "{output}" '
+                                + mkv_all_need_opt_str
+                                + '--no-audio "{input}"'
                             )
                     case "copy":
                         _encoder_format_str = (
                             'mp4box -add "{input}" -new "{output}"'
                             if muxer == Ripper.Muxer.mp4
-                            else 'mkvmerge -o "{output}" "{input}"'
+                            else (
+                                'mkvmerge -o "{output}" '
+                                + mkv_all_need_opt_str
+                                + '"{input}"'
+                            )
                         )
                 if _encoder_format_str is not None:
                     encoder_format_str_list = [_encoder_format_str]

{easyrip-4.15.0.dist-info → easyrip-4.15.1.dist-info}/METADATA

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

{easyrip-4.15.0.dist-info → easyrip-4.15.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 easyrip/__init__.py,sha256=DULQoFEAEHYk7dS8Zxky56so7qDPqHm7jUc_Zop1eXw,616
-easyrip/__main__.py,sha256=RmJ2_bFzJmyymKnJpTqrbQc64tjK-ziGEen8sGsMm8c,5791
-easyrip/easyrip_command.py,sha256=ZEQ8v8FHaSB7tKKMv0HY0NXOftR1S3gRaPTslfxc9tk,30650
+easyrip/__main__.py,sha256=cLtwb8SRXw34e9iddeQ1iP3CTGBVdZPWRu2ISxoCKz4,5879
+easyrip/easyrip_command.py,sha256=rHphOQgBVBKFL8bqiAXjP9we1RUPqaLZyyCDt2niblk,33632
 easyrip/easyrip_log.py,sha256=R-dM3CWUBFITtG7GSD1zy4X4MhZqxkoiBPjlIpI76cY,15573
-easyrip/easyrip_main.py,sha256=9KMpKUal8ApWZr80AQ7UwO1n6HUSWeVo2SuJ4pMW1f8,48130
+easyrip/easyrip_main.py,sha256=E1gur17OruwlJtd9h32aDXtnwhOYsjJVpb6JcVYEyRc,48586
 easyrip/easyrip_prompt.py,sha256=TOmRJDigGRz7wRWFNakJdfNI1tn9vGekq6FH5ypmQfA,7068
-easyrip/global_val.py,sha256=Q6PBQ8iB8H7cJN5KRaLBAj8mHdGCj47EAiLzW62cSrg,866
+easyrip/global_val.py,sha256=UDCyNlA-5DQ2WznuzjHHD2Vn7TQ2xZSmHJhSr5Qqjgo,866
 easyrip/utils.py,sha256=N1rMF1MyoC-YFBgy10_u29cFoowfhR-5Viea93O7wQ4,8750
 easyrip/easyrip_config/config.py,sha256=KWXZMEYxdXYUGLQ-MR0A7nnOwR6QZdVrWBopfb2QZSA,9869
 easyrip/easyrip_config/config_key.py,sha256=_jjdKOunskUoG7UUWOz3QZK-s4LF_x6hmM9MKttyS2Q,766
@@ -12,21 +12,21 @@ easyrip/easyrip_mlang/__init__.py,sha256=QqnL0kgV_trGPeLF5gawP1qAlj0GXUadLNhMSdK
 easyrip/easyrip_mlang/global_lang_val.py,sha256=pG9DxPl6vUOZoFHYQKCM-AM0TYWbd8L4S65CUQFPRh4,4998
 easyrip/easyrip_mlang/lang_en.py,sha256=fTM9ejuPW6gEfSMbnMEW-LzlUfvj0YGfoUfmHZpRzms,121
 easyrip/easyrip_mlang/lang_tag_val.py,sha256=Ec-U0XglpSYvmkHlcEBueSj8ocTLSTH3cacElAkmYVU,5184
-easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=-GyAtjhSHqfR2x1mDgW3CdMz7odd58uJzONK67wow8g,19032
+easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=OuWg_sNEzNkvlF1EPMFDZrucfQ1Y92zKFkIfXIfiCR8,19009
 easyrip/easyrip_mlang/translator.py,sha256=jlgZYSPHvwv1Pps3akKkSgVsGcLtV2psKaXyZH4QCbA,5870
 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=E-60yoY6D0pPUfYW1VIh0763htyV5z6getzlLtLAdQc,4624
 easyrip/ripper/media_info.py,sha256=KdSodS6nIp2BWEer5y4mD5xwyhP15_PgNRhz2fnHmw0,5082
 easyrip/ripper/param.py,sha256=PfJzJz9LPCB5hAM9G4GjPxdn_EZRgAz-vxYzuHGQLp8,13084
-easyrip/ripper/ripper.py,sha256=FkbOi1H_IQtcOmr1sMnRgZvPEnxkMvINV2EiFIjSIqI,58898
+easyrip/ripper/ripper.py,sha256=NynEAr3IzjdgC9dwKRPzTA0eTWf7Z3dJUU0eB2_R-6E,60364
 easyrip/ripper/sub_and_font/__init__.py,sha256=cBT7mxL7RRFaJXFPXuZ7RT-YK6FbnanaU5v6U9BOquw,153
 easyrip/ripper/sub_and_font/ass.py,sha256=EhDkVY5JXU77euWPId7H2v85j444m8ZLm7wUid7TYd8,35307
 easyrip/ripper/sub_and_font/font.py,sha256=X2dPcPzbwQf3fv_g_mxO-zY7puVAX9Nv-9QHn88q4oA,7745
 easyrip/ripper/sub_and_font/subset.py,sha256=--rAA3VH1rm_jBOC3yMs3rOJpn3tPuvfXqkimbBtx3s,18653
-easyrip-4.15.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-easyrip-4.15.0.dist-info/METADATA,sha256=EeTyI6jF0S972Q706cZggO-ffPg8Y7hUMUIF0uJWf00,3540
-easyrip-4.15.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-easyrip-4.15.0.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
-easyrip-4.15.0.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
-easyrip-4.15.0.dist-info/RECORD,,
+easyrip-4.15.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+easyrip-4.15.1.dist-info/METADATA,sha256=OS5rQst0rSXHYrhJ7CpQbImZ_PU0nlfKAHNSPOHQ2iA,3540
+easyrip-4.15.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+easyrip-4.15.1.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
+easyrip-4.15.1.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
+easyrip-4.15.1.dist-info/RECORD,,