easyrip 4.6.1__tar.gz → 4.8.0__tar.gz

{easyrip-4.6.1 → easyrip-4.8.0}/PKG-INFO

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

{easyrip-4.6.1 → easyrip-4.8.0}/easyrip/easyrip_log.py

@@ -106,7 +106,7 @@ class log:
         only_print = enum.auto()
         only_write = enum.auto()
 
-    html_filename: str = "encoding_log.html"  # 在调用前覆写
+    html_filename: str = "EasyRip_log.html"  # 在调用前覆写
     print_level: LogLevel = LogLevel.send
     write_level: LogLevel = LogLevel.send
 

{easyrip-4.6.1 → easyrip-4.8.0}/easyrip/easyrip_main.py

@@ -8,6 +8,7 @@ import shlex
 import shutil
 import subprocess
 import sys
+import textwrap
 import threading
 import tkinter as tk
 import tomllib
@@ -36,7 +37,8 @@ from .easyrip_mlang import (
 )
 from .easyrip_prompt import easyrip_prompt
 from .ripper.media_info import Media_info
-from .ripper.ripper import DEFAULT_PRESET_PARAMS, Ripper
+from .ripper.ripper import Ripper
+from .ripper.param import DEFAULT_PRESET_PARAMS, PRESET_OPT_NAME
 from .ripper.sub_and_font import load_fonts
 from .utils import change_title, check_ver, read_text
 
@@ -424,16 +426,39 @@ 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:
-                                log.send(
-                                    json.dumps(
-                                        DEFAULT_PRESET_PARAMS[_preset], indent=2
-                                    ),
-                                    is_format=False,
-                                )
+                            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:
                                 log.send(
-                                    "The preset '{}' has no default val", cmd_list[2]
+                                    "The preset '{}' has no separate help", cmd_list[2]
                                 )
                         else:
                             log.error("'{}' is not a member of preset", cmd_list[2])
@@ -1080,7 +1105,7 @@ def init(is_first_run: bool = False) -> None:
         Global_lang_val.gettext_target_lang = Lang_tag.from_str(str(_lang_config))
 
     # 设置日志文件路径名
-    log.html_filename = gettext("encoding_log.html")
+    log.html_filename = gettext(log.html_filename)
     if _path := str(config.get_user_profile(Config_key.force_log_file_path) or ""):
         log.html_filename = os.path.join(_path, log.html_filename)
 

{easyrip-4.6.1 → easyrip-4.8.0}/easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -308,7 +308,7 @@ LANG_MAP: dict[str, str] = {
     "Current work directory has an other Easy Rip is running: {}": "当前工作目录存在其他 Easy Rip 正在运行: {}",
     "Stop run command": "命令执行终止",
     # log
-    "encoding_log.html": "编码日志.html",
+    "EasyRip_log.html": "EasyRip日志.html",
     "Start": "开始",
     "Input file pathname": "输入文件路径名",
     "Output directory": "输出目录",

{easyrip-4.6.1 → easyrip-4.8.0}/easyrip/easyrip_web/third_party_api.py

@@ -82,8 +82,13 @@ class github:
 
         try:
             with urllib.request.urlopen(req) as response:
-                data = json.loads(response.read().decode("utf-8"))
-                return data.get("tag_name")
+                data: dict = json.loads(response.read().decode("utf-8"))
+                ver = data.get("tag_name")
+                if ver is None:
+                    return None
+                if isinstance(ver, str):
+                    return ver.lstrip("v")
+                raise ValueError(f"ver = {ver!r}")
         except Exception as e:
             log.debug(
                 "'{}' execution failed: {}",

{easyrip-4.6.1 → easyrip-4.8.0}/easyrip/global_val.py

@@ -3,7 +3,7 @@ import sys
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.6.1"
+PROJECT_VERSION = "4.8.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-4.6.1 → easyrip-4.8.0}/easyrip/ripper/param.py

@@ -120,50 +120,6 @@ class Muxer(enum.Enum):
         return DEFAULT
 
 
-_DEFAULT_X265_PARAMS: Final[dict[LiteralString, LiteralString]] = {
-    "crf": "20",
-    "qpmin": "6",
-    "qpmax": "32",
-    "rd": "3",
-    "psy-rd": "2",
-    "rdoq-level": "0",
-    "psy-rdoq": "0",
-    "qcomp": "0.68",
-    "keyint": "250",
-    "min-keyint": "2",
-    "deblock": "0,0",
-    "me": "umh",
-    "merange": "57",
-    "hme": "1",
-    "hme-search": "hex,hex,hex",
-    "hme-range": "16,57,92",
-    "aq-mode": "2",
-    "aq-strength": "1",
-    "tu-intra-depth": "1",
-    "tu-inter-depth": "1",
-    "limit-tu": "0",
-    "bframes": "16",
-    "ref": "8",
-    "subme": "2",
-    "open-gop": "1",
-    "gop-lookahead": "0",
-    "rc-lookahead": "20",
-    "rect": "0",
-    "amp": "0",
-    "cbqpoffs": "0",
-    "crqpoffs": "0",
-    "ipratio": "1.4",
-    "pbratio": "1.3",
-    "early-skip": "1",
-    "ctu": "64",
-    "min-cu-size": "8",
-    "max-tu-size": "32",
-    "level-idc": "0",
-    "sao": "0",
-    "weightb": "1",
-    "info": "1",
-}
-
 X265_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
     "crf",
     "qpmin",
@@ -205,7 +161,6 @@ X265_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
     "level-idc",
     "sao",
 )
-
 X264_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
     "threads",
     "crf",
@@ -225,8 +180,68 @@ X264_PARAMS_NAME: Final[tuple[LiteralString, ...]] = (
     "min-keyint",
     "trellis",
     "fast-pskip",
+    "partitions",
+    "direct",
 )
 
+
+_DEFAULT_X265_PARAMS: Final[dict[LiteralString, LiteralString]] = {
+    "crf": "20",
+    "qpmin": "6",
+    "qpmax": "32",
+    "rd": "3",
+    "psy-rd": "2",
+    "rdoq-level": "0",
+    "psy-rdoq": "0",
+    "qcomp": "0.68",
+    "keyint": "250",
+    "min-keyint": "2",
+    "deblock": "0,0",
+    "me": "umh",
+    "merange": "57",
+    "hme": "1",
+    "hme-search": "hex,hex,hex",
+    "hme-range": "16,57,92",
+    "aq-mode": "2",
+    "aq-strength": "1",
+    "tu-intra-depth": "1",
+    "tu-inter-depth": "1",
+    "limit-tu": "0",
+    "bframes": "16",
+    "ref": "8",
+    "subme": "2",
+    "open-gop": "1",
+    "gop-lookahead": "0",
+    "rc-lookahead": "20",
+    "rect": "0",
+    "amp": "0",
+    "cbqpoffs": "0",
+    "crqpoffs": "0",
+    "ipratio": "1.4",
+    "pbratio": "1.3",
+    "early-skip": "1",
+    "ctu": "64",
+    "min-cu-size": "8",
+    "max-tu-size": "32",
+    "level-idc": "0",
+    "sao": "0",
+    "weightb": "1",
+    "info": "1",
+}
+
+
+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_name.x264fast: {
         "threads": "auto",
@@ -248,6 +263,8 @@ DEFAULT_PRESET_PARAMS: Final[dict[Preset_name, dict[LiteralString, LiteralString
         "trellis": "1",
         "fast-pskip": "1",
         "weightb": "1",
+        "partitions": "all",
+        "direct": "auto",
     },
     Preset_name.x264slow: {
         "threads": "auto",
@@ -269,6 +286,8 @@ DEFAULT_PRESET_PARAMS: Final[dict[Preset_name, dict[LiteralString, LiteralString
         "trellis": "2",
         "fast-pskip": "0",
         "weightb": "1",
+        "partitions": "all",
+        "direct": "auto",
     },
     Preset_name.x265fast4: _DEFAULT_X265_PARAMS
     | dict[LiteralString, LiteralString](
@@ -448,6 +467,7 @@ DEFAULT_PRESET_PARAMS: Final[dict[Preset_name, dict[LiteralString, LiteralString
     ),
 }
 
+
 SUBTITLE_SUFFIX_SET: Final[set[LiteralString]] = {
     ".srt",
     ".ass",

{easyrip-4.6.1 → easyrip-4.8.0}/easyrip/ripper/ripper.py

@@ -643,7 +643,9 @@ class Ripper:
                 _option_map = {
                     "crf": self.option_map.get("crf"),
                     "qp": self.option_map.get("qp"),
-                    "pix_fmt": self.option_map.get("pix_fmt"),
+                    "pix_fmt": self.option_map.get(
+                        "pix_fmt", None if is_pipe_input else "yuv420p10le"
+                    ),
                     "preset:v": self.option_map.get("preset:v"),
                     "svtav1-params": self.option_map.get("svtav1-params"),
                 }
@@ -664,7 +666,9 @@ class Ripper:
             case Ripper.Preset_name.vvenc:
                 _option_map = {
                     "qp": self.option_map.get("qp"),
-                    "pix_fmt": self.option_map.get("pix_fmt"),
+                    "pix_fmt": self.option_map.get(
+                        "pix_fmt", None if is_pipe_input else "yuv420p10le"
+                    ),
                     "preset:v": self.option_map.get("preset:v"),
                     "vvenc-params": self.option_map.get("vvenc-params"),
                 }

{easyrip-4.6.1 → easyrip-4.8.0}/easyrip.egg-info/PKG-INFO

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