easyrip 4.4.0__tar.gz → 4.5.1__tar.gz

{easyrip-4.4.0 → easyrip-4.5.1}/PKG-INFO

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

{easyrip-4.4.0 → easyrip-4.5.1}/easyrip/__main__.py

@@ -64,6 +64,7 @@ def run() -> NoReturn:
                                 in {
                                     *Cmd_type.cd.value.names,
                                     *Cmd_type.mediainfo.value.names,
+                                    *Cmd_type.fontinfo.value.names,
                                 }
                                 else ()
                             ),
@@ -128,8 +129,11 @@ def run() -> NoReturn:
             log.debug("Manually force exit")
             sys.exit(0)
 
-        if not run_command(command):
-            log.warning("Stop run command")
+        try:
+            if not run_command(command):
+                log.warning("Stop run command")
+        except KeyboardInterrupt:
+            log.warning("Manually stop run command")
 
 
 if __name__ == "__main__":

{easyrip-4.4.0 → easyrip-4.5.1}/easyrip/easyrip_command.py

@@ -490,7 +490,7 @@ class Opt_type(enum.Enum):
             "Audio encoder:\n"  # .
             f"{Audio_codec.to_help_string('  ')}"
         ),
-        childs=(Cmd_type_val(("copy", "libopus", "flac")),),
+        childs=(Cmd_type_val(tuple(Audio_codec._value2member_map_)),),
     )
     _b_a = Cmd_type_val(
         ("-b:a",),

{easyrip-4.4.0 → easyrip-4.5.1}/easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -1,4 +1,4 @@
-from ..easyrip_command import Cmd_type, Opt_type
+from ..easyrip_command import Audio_codec, Cmd_type, Opt_type, Preset_name
 from .global_lang_val import (
     Lang_tag,
     Lang_tag_language,
@@ -135,18 +135,8 @@ LANG_MAP: dict[str, str] = {
     ),
     Opt_type._preset.value.description: (
         "设置预设\n"
-        "预设名:\n"
-        "  custom\n"
-        "  subset\n"
-        "  copy\n"
-        "  flac\n"
-        "  x264fast x264slow\n"
-        "  x265fast4 x265fast3 x265fast2 x265fast x265slow x265full\n"
-        "  svtav1\n"
-        "  vvenc\n"
-        "  h264_amf h264_nvenc h264_qsv\n"
-        "  hevc_amf hevc_nvenc hevc_qsv\n"
-        "  av1_amf av1_nvenc av1_qsv"
+        "预设名:\n"  # .
+        f"{Preset_name.to_help_string('  ')}"
     ),
     Opt_type._pipe.value.description: (
         "选择一个 vpy 文件作为管道的输入, 这个 vpy 必须有 input 全局变量\n"
@@ -209,11 +199,8 @@ LANG_MAP: dict[str, str] = {
     ),
     Opt_type._c_a.value.description: (
         "设置音频编码器\n"
-        " \n"  # .
-        "音频编码器:\n"
-        "  copy\n"
-        "  libopus\n"
-        "  flac"
+        "音频编码器:\n"  # .
+        f"{Audio_codec.to_help_string('  ')}"
     ),
     Opt_type._b_a.value.description: "设置音频码率。默认值 '160k'",
     Opt_type._muxer.value.description: (

{easyrip-4.4.0 → easyrip-4.5.1}/easyrip/global_val.py

@@ -3,7 +3,7 @@ import sys
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.4.0"
+PROJECT_VERSION = "4.5.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.4.0 → easyrip-4.5.1}/easyrip/ripper/sub_and_font/font.py

@@ -40,7 +40,13 @@ class Font:
         self.font.close()
 
 
-def load_fonts(path: str | Path, lazy: bool = True) -> list[Font]:
+def load_fonts(
+    path: str | Path,
+    *,
+    lazy: bool = True,
+    strict: bool = False,
+) -> list[Font]:
+    """strict: Skip UnicodeDecodeError font file"""
     if isinstance(path, str):
         path = Path(path)
 
@@ -59,6 +65,7 @@ def load_fonts(path: str | Path, lazy: bool = True) -> list[Font]:
                 if suffix == ".ttc"
                 else [TTFont(file=file, lazy=lazy)]
             ):
+                skip_this_font: bool = False
                 table_name: table__n_a_m_e | None = font.get("name")
 
                 if table_name is None:
@@ -76,7 +83,16 @@ def load_fonts(path: str | Path, lazy: bool = True) -> list[Font]:
                     if name_id not in {1, 2}:
                         continue
 
-                    name_str: str = record.toUnicode()
+                    try:
+                        name_str: str = record.toUnicode()
+                    except UnicodeDecodeError as e:
+                        error_text = f"Unicode decode error in font \"{file}\": {e}: '{record.toUnicode('replace')}'. Skip this {'font' if strict else 'name record'}."
+                        if strict:
+                            log.error(error_text, is_format=False)
+                            skip_this_font = True
+                            break
+                        log.warning(error_text, is_format=False)
+                        continue
 
                     match name_id:
                         case 1:  # Font Family Name
@@ -94,6 +110,9 @@ def load_fonts(path: str | Path, lazy: bool = True) -> list[Font]:
                                     case "italic" | "oblique":
                                         is_italic = True
 
+                if skip_this_font:
+                    continue
+
                 if not res_font.familys:
                     log.warning(f"Font {file} has no family names. Skip this font")
                     continue
@@ -121,16 +140,18 @@ def load_fonts(path: str | Path, lazy: bool = True) -> list[Font]:
                 res_font_list.append(res_font)
 
         except TTLibError as e:
-            log.warning(f'Error loading font file "{file}": {e}')
-        except UnicodeDecodeError as e:
-            log.warning(f"Unicode decode error for font {file}: {e}")
+            log.error(f'Error loading font file "{file}": {e}')
         except Exception as e:
             log.error(f"Unexpected error for font {file}: {e}")
 
     return res_font_list
 
 
-def load_windows_fonts(lazy: bool = True) -> list[Font]:
+def load_windows_fonts(
+    *,
+    lazy: bool = True,
+    strict: bool = False,
+) -> list[Font]:
     paths: tuple[str, ...] = (
         os.path.join(os.environ["SYSTEMROOT"], "Fonts"),
         os.path.join(os.environ["LOCALAPPDATA"], "Microsoft/Windows/Fonts"),
@@ -138,7 +159,7 @@ def load_windows_fonts(lazy: bool = True) -> list[Font]:
 
     return list(
         itertools.chain.from_iterable(
-            load_fonts(path=path, lazy=lazy) for path in paths
+            load_fonts(path, lazy=lazy, strict=strict) for path in paths
         )
     )
 

{easyrip-4.4.0 → easyrip-4.5.1}/easyrip/ripper/sub_and_font/subset.py

@@ -282,9 +282,9 @@ def subset(
     # 加载 Font
     fonts: Final[list[Font]] = []
     for _path in font_path_list:
-        fonts.extend(load_fonts(_path))
+        fonts.extend(load_fonts(_path, strict=strict))
     if use_win_font:
-        fonts.extend(load_windows_fonts())
+        fonts.extend(load_windows_fonts(strict=strict))
 
     font_sign__font: dict[tuple[str, Font_type], Font] = {}
     for _font in fonts:

{easyrip-4.4.0 → easyrip-4.5.1}/easyrip.egg-info/PKG-INFO

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