easyrip 4.6.0__tar.gz → 4.6.1__tar.gz

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

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

{easyrip-4.6.0 → easyrip-4.6.1}/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()

{easyrip-4.6.0 → easyrip-4.6.1}/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.6.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-4.6.0 → easyrip-4.6.1}/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-4.6.0 → easyrip-4.6.1}/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 → easyrip-4.6.1}/easyrip.egg-info/PKG-INFO

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