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

easyrip/easyrip_mlang/lang_tag_val.py

@@ -0,0 +1,145 @@
+import enum
+from dataclasses import dataclass
+from typing import final
+
+
+@final
+@dataclass(slots=True, init=False, eq=False)
+class Lang_tag_val:
+    en_name: str
+    _local_name: str | None
+
+    @property
+    def local_name(self) -> str:
+        return self.en_name if self._local_name is None else self._local_name
+
+    @local_name.setter
+    def local_name(self, val: str | None) -> None:
+        if val is not None and len(val) == 0:
+            raise ValueError("The length of the name cannot be 0")
+
+        self._local_name = val
+
+    def __init__(self, *, en_name: str, local_name: str | None = None) -> None:
+        if len(en_name) == 0:
+            raise ValueError("The length of the name cannot be 0")
+
+        self.en_name = en_name
+        self.local_name = local_name
+
+    def __str__(self) -> str:
+        return f"{self.__class__.__name__}(en_name={self.en_name}, local_name={self._local_name})"
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, Lang_tag_val):
+            return self.en_name == other.en_name
+        return False
+
+    def __hash__(self) -> int:
+        return hash(self.en_name)
+
+
+class Lang_tag_language(enum.Enum):
+    Unknown = Lang_tag_val(en_name="Unknown")
+
+    # ISO 639-1
+    en = Lang_tag_val(en_name="English", local_name="English")
+    zh = Lang_tag_val(en_name="Chinese", local_name="中文")
+    fr = Lang_tag_val(en_name="French", local_name="Français")
+    de = Lang_tag_val(en_name="German", local_name="Deutsch")
+    es = Lang_tag_val(en_name="Spanish", local_name="Español")
+    it = Lang_tag_val(en_name="Italian", local_name="Italiano")
+    ja = Lang_tag_val(en_name="Japanese", local_name="日本語")
+    ko = Lang_tag_val(en_name="Korean", local_name="한국어")
+    ru = Lang_tag_val(en_name="Russian", local_name="Русский")
+    ar = Lang_tag_val(en_name="Arabic", local_name="العربية")
+
+    # ISO 639-2
+    eng = en
+    zho = chi = zh
+    fra = fre = fr
+    deu = ger = de
+    spa = es
+    ita = it
+    jpn = ja
+    kor = ko
+    rus = ru
+    ara = ar
+
+    # ISO 639-3
+    # 与 p2 重叠的放在 p2
+    cdo = Lang_tag_val(en_name="Min Dong Chinese", local_name="闽东语")
+    cjy = Lang_tag_val(en_name="Jinyu Chinese", local_name="晋语")
+    cmn = Lang_tag_val(en_name="Mandarin Chinese", local_name="普通话")
+    cnp = Lang_tag_val(en_name="Northern Ping Chinese", local_name="北平语")
+    wuu = Lang_tag_val(en_name="Wu Chinese", local_name="吴语")
+    yue = Lang_tag_val(en_name="Yue Chinese", local_name="粤语")
+    hak = Lang_tag_val(en_name="Hakka Chinese", local_name="客家话")
+    nan = Lang_tag_val(en_name="Min Nan Chinese", local_name="闽南语")
+    och = Lang_tag_val(en_name="Old Chinese", local_name="古汉语")
+
+    @classmethod
+    def _missing_(cls, value: object):
+        return cls.Unknown
+
+    @classmethod
+    def from_name(cls, name: str):
+        try:
+            return cls[name]
+        except KeyError:
+            return cls.Unknown
+
+
+class Lang_tag_script(enum.Enum):
+    Unknown = Lang_tag_val(en_name="Unknown")
+
+    Hans = Lang_tag_val(en_name="Simplified Chinese", local_name="简体")
+    Hant = Lang_tag_val(en_name="Traditional Chinese", local_name="繁體")
+    Latn = Lang_tag_val(en_name="Latin", local_name="Latina")
+    Cyrl = Lang_tag_val(en_name="Cyrillic", local_name="Кириллица")
+    Arab = Lang_tag_val(en_name="Arabic", local_name="العربية")
+
+    @classmethod
+    def _missing_(cls, value: object):
+        return cls.Unknown
+
+    @classmethod
+    def from_name(cls, name: str):
+        try:
+            return cls[name]
+        except KeyError:
+            return cls.Unknown
+
+
+class Lang_tag_region(enum.Enum):
+    Unknown = Lang_tag_val(en_name="Unknown")
+
+    US = Lang_tag_val(en_name="United States", local_name="United States")
+    GB = Lang_tag_val(en_name="United Kingdom", local_name="United Kingdom")
+    AU = Lang_tag_val(en_name="Australia", local_name="Australia")
+    CA = Lang_tag_val(en_name="Canada", local_name="Canada")
+    NZ = Lang_tag_val(en_name="New Zealand", local_name="New Zealand")
+    IE = Lang_tag_val(en_name="Ireland", local_name="Éire")
+    ZA = Lang_tag_val(en_name="South Africa", local_name="South Africa")
+    JM = Lang_tag_val(en_name="Jamaica", local_name="Jamaica")
+    TT = Lang_tag_val(en_name="Caribbean", local_name="Caribbean")
+    BZ = Lang_tag_val(en_name="Belize", local_name="Belize")
+    PH = Lang_tag_val(en_name="Philippines", local_name="Pilipinas")
+    IN = Lang_tag_val(en_name="India", local_name="भारत")
+    MY = Lang_tag_val(en_name="Malaysia", local_name="Malaysia")
+    SG = Lang_tag_val(en_name="Singapore", local_name="Singapura")
+    MO = Lang_tag_val(en_name="Macau SAR", local_name="澳門")
+    HK = Lang_tag_val(en_name="Hong Kong SAR", local_name="香港")
+    TW = Lang_tag_val(en_name="Taiwan", local_name="台灣")
+    CN = Lang_tag_val(en_name="China", local_name="中国大陆")
+
+    @classmethod
+    def _missing_(cls, value: object):
+        return cls.Unknown
+
+    @classmethod
+    def from_name(cls, name: str):
+        try:
+            return cls[name]
+        except KeyError:
+            return cls.Unknown

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: (
@@ -178,7 +174,7 @@ LANG_MAP: dict[str, str] = {
         'e.g. "11\\{22}33" ->\n'
         '  "11\\33"   (VSFilter)\n'
         '  "11{22}33" (libass)\n'
-        "默认: 0"
+        "默认: 1"
     ),
     Opt_type._subset_drop_non_render.value.description: (
         "丢弃 ASS 中的注释行、Name、Effect等非渲染内容\n"  # .
@@ -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"
@@ -280,7 +277,8 @@ LANG_MAP: dict[str, str] = {
     "Check env...": "检测环境中...",
     # "The MediaInfo must be CLI ver": "MediaInfo 必须是 CLI 版本",
     "Easy Rip command": "Easy Rip 命令",
-    "Stop run Ripper": "Ripper 执行终止",
+    "Stop run and clear Ripper list": "终止执行并清空 Ripper list",
+    "Manually stop run and clear Ripper list": "手动终止执行并清空 Ripper list",
     "There are {} {} during run": "执行期间有 {} 个 {}",
     "Execute shutdown in {}s": "{}s 后执行关机",
     "{} run completed, shutdown in {}s": "{} 执行完成, {}s 后关机",
@@ -303,10 +301,11 @@ LANG_MAP: dict[str, str] = {
     "There is no audio stream in the video, so '-c:a' cannot be used": "视频中没有音频流，所以无法使用 '-c:a'",
     "Unsupported '{}' param: {}": "'{}' 不支持此参数: {}",
     "Manually force exit": "手动强制退出",
+    "Command run terminated": "命令执行终止",
+    "Manually stop run command": "手动终止执行命令",
     "Suggest running the following command to upgrade using pip: {}": "建议运行以下命令以使用 pip 更新: {}",
     "Wrong sec in -shutdown, change to default 60s": "-shutdown 设定的秒数错误, 改为默认值 60s",
     "Current work directory has an other Easy Rip is running: {}": "当前工作目录存在其他 Easy Rip 正在运行: {}",
-    "Stop run command": "命令执行终止",
     # log
     "EasyRip_log.html": "EasyRip日志.html",
     "Start": "开始",
@@ -323,6 +322,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': '文件 "{}" 已存在, 跳过翻译',

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.13.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",