easyrip 4.6.0__py3-none-any.whl → 4.7.0__py3-none-any.whl

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/easyrip_main.py

@@ -662,7 +662,6 @@ def run_command(command: Iterable[str] | str) -> bool:
             easyrip_web.run_server(*_params)
 
         case Cmd_type.config:
-            log.debug(cmd_list)
             match cmd_list[1]:
                 case "list" | "":
                     config.show_config_list()
@@ -1081,7 +1080,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/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/global_val.py

@@ -3,7 +3,7 @@ import sys
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.6.0"
+PROJECT_VERSION = "4.7.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/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/ripper/sub_and_font/font.py

@@ -55,7 +55,7 @@ def load_fonts(
     for file in path.iterdir() if path.is_dir() else (path,):
         if not (
             file.is_file()
-            and ((suffix := file.suffix.lower()) in {".ttf", ".otf", ".ttc"})
+            and (suffix := file.suffix.lower()) in {".ttf", ".otf", ".ttc"}
         ):
             continue
 
@@ -120,7 +120,7 @@ def load_fonts(
                 if is_regular:
                     if is_bold or is_italic:
                         log.error(
-                            "Font {} is Regular but Bold={} and Italic={}. Skip this font",
+                            'Font "{}" is Regular but Bold={} and Italic={}. Skip this font',
                             file,
                             is_bold,
                             is_italic,
@@ -134,15 +134,15 @@ def load_fonts(
                 else:
                     res_font.font_type = Font_type.Regular
                     log.warning(
-                        f"Font {file} does not have an English subfamily name. Defaulting to Regular"
+                        f'Font "{file}" does not have an English subfamily name. Defaulting to Regular'
                     )
 
                 res_font_list.append(res_font)
 
         except TTLibError as e:
-            log.error(f'Error loading font file "{file}": {e}')
+            log.error(f'Failed to load font file "{file}": {e}')
         except Exception as e:
-            log.error(f"Unexpected error for font {file}: {e}")
+            log.error(f'Unexpected error when load font "{file}": {e}')
 
     return res_font_list
 

easyrip/utils.py

@@ -7,7 +7,7 @@ import sys
 import time
 from itertools import zip_longest
 from pathlib import Path
-from typing import Final, get_args, get_origin
+from typing import Any, Final, TypeGuard, get_args, get_origin
 
 from Crypto.Cipher import AES as CryptoAES
 from Crypto.Util.Padding import pad, unpad
@@ -209,7 +209,7 @@ def non_ascii_str_len(s: str) -> int:
     return sum(2 - int(ord(c) < 256) for c in s)
 
 
-def type_match(val, b: type) -> bool:
+def type_match[T](val: Any, t: type[T]) -> TypeGuard[T]:
     """
     检查值是否匹配给定的类型（支持泛型）
 
@@ -222,35 +222,35 @@ def type_match(val, b: type) -> bool:
 
     Args:
         val: 要检查的值
-        b: 目标类型，可以是普通类型或泛型
+        t: 目标类型，可以是普通类型或泛型
 
     Returns:
         bool: 值是否匹配目标类型
 
     """
-    b_org = get_origin(b)
+    t_org = get_origin(t)
 
     # 如果不是泛型类型，直接使用 isinstance
-    if b_org is None:
-        return isinstance(val, b)
+    if t_org is None:
+        return isinstance(val, t)
 
     # 首先检查是否是 b_org 的实例
-    if not isinstance(val, b_org):
+    if not isinstance(val, t_org):
         return False
 
     # 获取类型参数
-    args = get_args(b)
+    args = get_args(t)
     if not args:  # 没有类型参数，如 List
         return True
 
     # 根据不同的原始类型进行检查
-    if b_org is list:
+    if t_org is list:
         # list[T] 检查
         if len(args) == 1:
             elem_type = args[0]
             return all(type_match(item, elem_type) for item in val)
 
-    elif b_org is tuple:
+    elif t_org is tuple:
         # tuple[T1, T2, ...] 或 tuple[T, ...] 检查
         if len(args) == 2 and args[1] is ...:  # 可变长度元组
             elem_type = args[0]
@@ -260,7 +260,7 @@ def type_match(val, b: type) -> bool:
             return False
         return all(type_match(item, t) for item, t in zip(val, args, strict=False))
 
-    elif b_org is dict:
+    elif t_org is dict:
         # dict[K, V] 检查
         if len(args) == 2:
             key_type, value_type = args
@@ -269,19 +269,19 @@ def type_match(val, b: type) -> bool:
                 for k, v in val.items()
             )
 
-    elif b_org is set:
+    elif t_org is set:
         # set[T] 检查
         if len(args) == 1:
             elem_type = args[0]
             return all(type_match(item, elem_type) for item in val)
 
-    elif b_org is frozenset:
+    elif t_org is frozenset:
         # frozenset[T] 检查
         if len(args) == 1:
             elem_type = args[0]
             return all(type_match(item, elem_type) for item in val)
 
-    elif hasattr(b_org, "__name__") and b_org.__name__ == "Union":
+    elif hasattr(t_org, "__name__") and t_org.__name__ == "Union":
         # Union[T1, T2, ...] 或 T1 | T2 检查
         return any(type_match(val, t) for t in args)
 

{easyrip-4.6.0.dist-info → easyrip-4.7.0.dist-info}/METADATA

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

{easyrip-4.6.0.dist-info → easyrip-4.7.0.dist-info}/RECORD

@@ -1,31 +1,31 @@
 easyrip/__init__.py,sha256=PIvSPDgswsIkWL4dsCe87knnxKmtvcrWYzmqAwZix_M,765
 easyrip/__main__.py,sha256=5t5NjuTSFW6jDp_HH4rTX8EOlf-GJI5HuTSwwndkw_I,4557
 easyrip/easyrip_command.py,sha256=vuT9xg2OCuUXHH58BxcFGbzrzLUzlpynjGzjtDsBnCk,27837
-easyrip/easyrip_log.py,sha256=0V5wBwbqWt56w_NHoLmQmkTHPnPLkYZCAbhDSYnLnDw,15611
-easyrip/easyrip_main.py,sha256=qF_u552kkVj8nnKNd46jHfkNwTODQfR297rISRgJkpU,43311
+easyrip/easyrip_log.py,sha256=i5r3OPGQ55c3_zCN0fmriPXiWxibq-w35FbNT7VfuuM,15610
+easyrip/easyrip_main.py,sha256=0f1cU1ewC6gkuaP9O7vSRaSmFgKPo1KWmOIOKBZTOXw,43277
 easyrip/easyrip_prompt.py,sha256=A5S7ybeJSGFkCmwdJ9TCQ_-lde7NWgkbFytZ2KnvkWI,2145
-easyrip/global_val.py,sha256=dBVsU5OVbawpZ64k7QOrad1gQRa8yVV6Z0wKzAFKMMY,773
-easyrip/utils.py,sha256=A2IuZ8-yxhpjNTIDXH1SqU7qOWXtMhU7llHwebEu8LQ,8715
+easyrip/global_val.py,sha256=AniWAdkEWv8c1YUWspoNETpN2nhjRJh15QQOK5FaDXw,773
+easyrip/utils.py,sha256=N1rMF1MyoC-YFBgy10_u29cFoowfhR-5Viea93O7wQ4,8750
 easyrip/easyrip_config/config.py,sha256=aj6Vg1rJkvICSTZ0ZONznR_MkvVr5u5ngkX_zfZopvU,9859
 easyrip/easyrip_config/config_key.py,sha256=_jjdKOunskUoG7UUWOz3QZK-s4LF_x6hmM9MKttyS2Q,766
 easyrip/easyrip_mlang/__init__.py,sha256=QHZt4BYJFkJuaPkN89pt_zkM2grifJakyRZbeyfH8f4,1893
 easyrip/easyrip_mlang/global_lang_val.py,sha256=Un20KGMVVMQbOaV_7VaHg3E1dvK2Y7kI1cPzq_sFWKY,9984
 easyrip/easyrip_mlang/lang_en.py,sha256=heUSPeVtY1Nf9eDhrjPM28N3PLsu62op3llbXAfXvAs,140
-easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=UhDwCofxh7ku5weVzcLV2Xel9_EzgjR8_Rbw9FJ9j0U,18530
+easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=zJ9z5dW8yZdg6VWUMw3e7VNFjn_NoMhk9lK-PZLrPSo,18530
 easyrip/easyrip_mlang/translator.py,sha256=Vg0S0p2rpMNAy3LHTdK7qKFdkPEXlOoCCXcaH7PyAC4,5939
 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=umj-QsfOa0IM60Ic2pXigVfnGfAiiC95fJSXQ-WFpJA,4419
 easyrip/ripper/media_info.py,sha256=mQq_vbQ7S9fWpb39HLkoZlAL-pqNfwxewv6X776Nf50,5078
 easyrip/ripper/param.py,sha256=x11G7AsU-1Ol37-psKNo8AtjKDdD8YPlXeNwJSbhZxw,11082
-easyrip/ripper/ripper.py,sha256=Ru3FI7c6toMEm1qgt_5XneeIYHTTv269nS6-Dmv1f6Y,50167
+easyrip/ripper/ripper.py,sha256=k00oHGk9X3ciJ8KzHa_jaHlTy5EXfdnJy9u0iSL3ia8,50343
 easyrip/ripper/sub_and_font/__init__.py,sha256=cBT7mxL7RRFaJXFPXuZ7RT-YK6FbnanaU5v6U9BOquw,153
 easyrip/ripper/sub_and_font/ass.py,sha256=eGi1eIDWAV1Ti_BYIAcAMwrAlXJ5f_zGYte3nNu4PeE,25532
-easyrip/ripper/sub_and_font/font.py,sha256=pzRtMrcL3ATFOMM5nsJQqSBbZtrnRodIgxLkjHai7kg,8075
+easyrip/ripper/sub_and_font/font.py,sha256=DBtTi32deXES1ylZiZ0qzcv9zvRQRIYBAH9Zbwij3G0,8086
 easyrip/ripper/sub_and_font/subset.py,sha256=VsFYTFuVWXW9ltkqWZIiwOIh-nGDKmW1tUv3oi5kpWw,17815
-easyrip-4.6.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-easyrip-4.6.0.dist-info/METADATA,sha256=IlgOWhd9fLGMssLGVZzDfZGtsfcHZyA10LhnHAtcxB4,3506
-easyrip-4.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-easyrip-4.6.0.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
-easyrip-4.6.0.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
-easyrip-4.6.0.dist-info/RECORD,,
+easyrip-4.7.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+easyrip-4.7.0.dist-info/METADATA,sha256=eume2bE0MFGaGnYxchUZM1U4Nc147fZjiYZQe0QDfWA,3506
+easyrip-4.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+easyrip-4.7.0.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
+easyrip-4.7.0.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
+easyrip-4.7.0.dist-info/RECORD,,