easyrip 4.11.3__py3-none-any.whl → 4.12.0__py3-none-any.whl

easyrip/easyrip_mlang/translator.py

@@ -5,12 +5,7 @@ from time import sleep
 from typing import Final
 
 from ..easyrip_web.third_party_api import zhconvert
-from .global_lang_val import (
-    Lang_tag,
-    Lang_tag_language,
-    Lang_tag_region,
-    Lang_tag_script,
-)
+from .global_lang_val import Lang_tag
 
 
 def translate_subtitles(
@@ -64,52 +59,52 @@ def translate_subtitles(
     match Lang_tag.from_str(infix):
         case (
             Lang_tag(
-                language=Lang_tag_language.zh,
-                script=Lang_tag_script.Hans,
+                language=Lang_tag.Language.zh,
+                script=Lang_tag.Script.Hans,
                 region=_,
             )
             | Lang_tag(
-                language=Lang_tag_language.zh,
+                language=Lang_tag.Language.zh,
                 script=_,
-                region=Lang_tag_region.CN,
+                region=Lang_tag.Region.CN,
             )
         ):
             # 简体 -> 繁体 or 非 CN 简体 CN 化
             match target_lang_tag:
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
+                    language=Lang_tag.Language.zh,
                     script=_,
-                    region=Lang_tag_region.HK,
+                    region=Lang_tag.Region.HK,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.HK
 
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
+                    language=Lang_tag.Language.zh,
                     script=_,
-                    region=Lang_tag_region.TW,
+                    region=Lang_tag.Region.TW,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.TW
 
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
-                    script=Lang_tag_script.Hant,
+                    language=Lang_tag.Language.zh,
+                    script=Lang_tag.Script.Hant,
                     region=_,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.Hant
 
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
-                    script=Lang_tag_script.Hant,
-                    region=Lang_tag_region.CN,
+                    language=Lang_tag.Language.zh,
+                    script=Lang_tag.Script.Hant,
+                    region=Lang_tag.Region.CN,
                 ):  # 特殊情况
                     raise Exception(
                         gettext("Unsupported language tag: {}", target_lang_tag)
                     )
 
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
+                    language=Lang_tag.Language.zh,
                     script=_,
-                    region=Lang_tag_region.CN,
+                    region=Lang_tag.Region.CN,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.CN
 
@@ -120,28 +115,28 @@ def translate_subtitles(
 
         case (
             Lang_tag(
-                language=Lang_tag_language.zh,
-                script=Lang_tag_script.Hant,
+                language=Lang_tag.Language.zh,
+                script=Lang_tag.Script.Hant,
                 region=_,
             )
             | Lang_tag(
-                language=Lang_tag_language.zh,
+                language=Lang_tag.Language.zh,
                 script=_,
-                region=Lang_tag_region.HK | Lang_tag_region.TW,
+                region=Lang_tag.Region.HK | Lang_tag.Region.TW,
             )
         ):
             # 繁体 -> 简体
             match target_lang_tag:
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
+                    language=Lang_tag.Language.zh,
                     script=_,
-                    region=Lang_tag_region.CN,
+                    region=Lang_tag.Region.CN,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.CN
 
                 case Lang_tag(
-                    language=Lang_tag_language.zh,
-                    script=Lang_tag_script.Hans,
+                    language=Lang_tag.Language.zh,
+                    script=Lang_tag.Script.Hans,
                     region=_,
                 ):
                     zhconvert_target_lang = zhconvert.Target_lang.Hans

easyrip/global_val.py

@@ -4,7 +4,7 @@ from functools import cache
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.11.3"
+PROJECT_VERSION = "4.12.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"

easyrip/ripper/param.py

@@ -29,6 +29,8 @@ class Preset_name(enum.Enum):
 
     vvenc = "vvenc"
 
+    ffv1 = "ffv1"
+
     h264_amf = "h264_amf"
     h264_nvenc = "h264_nvenc"
     h264_qsv = "h264_qsv"
@@ -66,6 +68,16 @@ class Preset_name(enum.Enum):
             prefix=prefix,
         )
 
+    def get_param_name_set[T: set[LiteralString] | None](
+        self, default: T = None, /
+    ) -> set[LiteralString] | T:
+        return _PRESET__PARAM_NAME_SET.get(self, default)
+
+    def get_param_default_dict[T: dict[LiteralString, LiteralString] | None](
+        self, default: T = None, /
+    ) -> dict[LiteralString, LiteralString] | T:
+        return _PRESET__DEFAULT_PARAMS.get(self, default)
+
 
 class Audio_codec(enum.Enum):
     copy = "copy"
@@ -119,8 +131,19 @@ class Muxer(enum.Enum):
         )
         return DEFAULT
 
+    @classmethod
+    def to_help_string(cls, prefix: str = ""):
+        return textwrap.indent(
+            reduce(
+                lambda acc,
+                add: f"{acc}{' ' if add.endswith(acc.split()[-1][-4:]) else '\n'}{add}",
+                tuple[str](cls._member_map_),
+            ),
+            prefix=prefix,
+        )
+
 
-X265_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
+_X265_PARAM_NAME_SET: Final[set[LiteralString]] = {
     "crf",
     "qpmin",
     "qpmax",
@@ -148,6 +171,7 @@ X265_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
     "open-gop",
     "gop-lookahead",
     "rc-lookahead",
+    "lookahead-slices",
     "rect",
     "amp",
     "cbqpoffs",
@@ -160,8 +184,13 @@ X265_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
     "max-tu-size",
     "level-idc",
     "sao",
-)
-X264_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
+    # 性能
+    "lookahead-threads",
+    "asm",
+    "frame-threads",
+    "pools",
+}
+_X264_PARAM_NAME_SET: Final[set[LiteralString]] = {
     "threads",
     "crf",
     "psy-rd",
@@ -182,8 +211,29 @@ X264_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
     "fast-pskip",
     "partitions",
     "direct",
-)
+}
+_FFV1_PARAM_NAME_SET: Final[set[LiteralString]] = {
+    "slicecrc",
+    "coder",
+    "context",
+    "qtable",
+    "remap_mode",
+    "remap_optimizer",
+}
 
+_PRESET__PARAM_NAME_SET: Final[dict[Preset_name, set[LiteralString]]] = {
+    Preset_name.x264: _X264_PARAM_NAME_SET,
+    Preset_name.x264fast: _X264_PARAM_NAME_SET,
+    Preset_name.x264slow: _X264_PARAM_NAME_SET,
+    Preset_name.x265: _X265_PARAM_NAME_SET,
+    Preset_name.x265fast4: _X265_PARAM_NAME_SET,
+    Preset_name.x265fast3: _X265_PARAM_NAME_SET,
+    Preset_name.x265fast2: _X265_PARAM_NAME_SET,
+    Preset_name.x265fast: _X265_PARAM_NAME_SET,
+    Preset_name.x265slow: _X265_PARAM_NAME_SET,
+    Preset_name.x265full: _X265_PARAM_NAME_SET,
+    Preset_name.ffv1: _FFV1_PARAM_NAME_SET,
+}
 
 _DEFAULT_X265_PARAMS: Final[dict[LiteralString, LiteralString]] = {
     "crf": "20",
@@ -236,19 +286,9 @@ _DEFAULT_X265_PARAMS: Final[dict[LiteralString, LiteralString]] = {
 }
 
 
-PRESET_OPT_NAME: Final[dict[Preset_name, tuple[LiteralString, ...]]] = {
-    Preset_name.x264: X264_PARAMS_NAME,
-    Preset_name.x264fast: X264_PARAMS_NAME,
-    Preset_name.x264slow: X264_PARAMS_NAME,
-    Preset_name.x265: X265_PARAMS_NAME,
-    Preset_name.x265fast4: X265_PARAMS_NAME,
-    Preset_name.x265fast3: X265_PARAMS_NAME,
-    Preset_name.x265fast2: X265_PARAMS_NAME,
-    Preset_name.x265fast: X265_PARAMS_NAME,
-    Preset_name.x265slow: X265_PARAMS_NAME,
-    Preset_name.x265full: X265_PARAMS_NAME,
-}
-DEFAULT_PRESET_PARAMS: Final[dict[Preset_name, dict[LiteralString, LiteralString]]] = {
+_PRESET__DEFAULT_PARAMS: Final[
+    dict[Preset_name, dict[LiteralString, LiteralString]]
+] = {
     Preset_name.x264fast: {
         "threads": "auto",
         "crf": "20",