easyrip 4.12.0__tar.gz → 4.13.0__tar.gz

{easyrip-4.12.0 → easyrip-4.13.0}/PKG-INFO

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

{easyrip-4.12.0 → easyrip-4.13.0}/easyrip/__main__.py

@@ -74,6 +74,7 @@ def run() -> NoReturn:
                                 in {
                                     *Cmd_type.cd.value.names,
                                     *Cmd_type.mediainfo.value.names,
+                                    *Cmd_type.assinfo.value.names,
                                     *Cmd_type.fontinfo.value.names,
                                 }
                                 else ()
@@ -98,6 +99,7 @@ def run() -> NoReturn:
                     *Opt_type._i.value.names,
                     *Opt_type._o_dir.value.names,
                     *Opt_type._o.value.names,
+                    *Opt_type._pipe.value.names,
                     *Opt_type._sub.value.names,
                     *Opt_type._only_mux_sub_path.value.names,
                     *Opt_type._soft_sub.value.names,
@@ -141,7 +143,7 @@ def run() -> NoReturn:
 
         try:
             if not run_command(command):
-                log.warning("Stop run command")
+                log.warning("Command run terminated")
         except KeyboardInterrupt:
             log.warning("Manually stop run command")
 

{easyrip-4.12.0 → easyrip-4.13.0}/easyrip/easyrip_command.py

@@ -268,7 +268,6 @@ class Cmd_type(enum.Enum):
             "Translate subtitle files\n"
             "e.g. 'translate zh-Hans zh-Hant' will translate all '*.zh-Hans.ass' files into zh-Hant"
         ),
-        childs=(Cmd_type_val(("-overwrite",)),),
     )
     mediainfo = Cmd_type_val(
         ("mediainfo",),
@@ -279,6 +278,15 @@ class Cmd_type(enum.Enum):
             Cmd_type_val(("cfd",)),
         ),
     )
+    assinfo = Cmd_type_val(
+        ("assinfo",),
+        param="<<path> | 'fd' | 'cfd'> [-use-libass-spec <0|1>] [-show-chars-len <0|1>]",
+        description="Get the ass info by the Ass class",
+        childs=(
+            Cmd_type_val(("fd",)),
+            Cmd_type_val(("cfd",)),
+        ),
+    )
     fontinfo = Cmd_type_val(
         ("fontinfo",),
         param="<<path> | 'fd' | 'cfd'>",
@@ -443,7 +451,7 @@ class Opt_type(enum.Enum):
             'e.g. "11\\{22}33" ->\n'
             '  "11\\33"   (VSFilter)\n'
             '  "11{22}33" (libass)\n'
-            "Default: 0"
+            "Default: 1"
         ),
         childs=(Cmd_type_val(("0", "1")),),
     )

{easyrip-4.12.0 → easyrip-4.13.0}/easyrip/easyrip_main.py

@@ -37,7 +37,7 @@ from .easyrip_mlang import (
 from .easyrip_prompt import easyrip_prompt
 from .ripper.media_info import Media_info
 from .ripper.ripper import Ripper
-from .ripper.sub_and_font import load_fonts
+from .ripper.sub_and_font import Ass, load_fonts
 from .utils import change_title, check_ver, read_text
 
 __all__ = ["init", "run_command"]
@@ -305,6 +305,10 @@ def run_ripper_list(
             except Exception as e:
                 log.error(e, deep=True)
                 log.warning("Stop run Ripper")
+            except KeyboardInterrupt:
+                log.warning("Manually stop run and clear Ripper list")
+                Ripper.ripper_list.clear()
+                raise
 
         with ThreadPoolExecutor() as executor:
             for ripper in Ripper.ripper_list:
@@ -322,6 +326,10 @@ def run_ripper_list(
             except Exception as e:
                 log.error(e, deep=True)
                 log.warning("Stop run Ripper")
+            except KeyboardInterrupt:
+                log.warning("Manually stop run and clear Ripper list")
+                Ripper.ripper_list.clear()
+                raise
             sleep(0.5)
 
     if log.warning_num > warning_num:
@@ -494,8 +502,8 @@ def run_command(command: Iterable[str] | str) -> bool:
         case Cmd_type.exit:
             sys.exit(0)
 
-        case Cmd_type.cd | Cmd_type.mediainfo | Cmd_type.fontinfo:
-            _path_tuple: tuple[str, ...] | None = None
+        case Cmd_type.cd | Cmd_type.mediainfo | Cmd_type.assinfo | Cmd_type.fontinfo:
+            _path_tuple: Iterable[str] | None = None
 
             match cmd_list[1]:
                 case "fd" | "cfd" as fd_param:
@@ -527,6 +535,46 @@ def run_command(command: Iterable[str] | str) -> bool:
                 case Cmd_type.mediainfo:
                     for _path in _path_tuple:
                         log.send(f"{_path}: {Media_info.from_path(_path)}")
+                case Cmd_type.assinfo:
+                    USE_LIBASS_SPEC_OPT_NAME = "-use-libass-spec"
+                    use_libass_spec: bool = True
+                    SHOW_CHARS_LEN_OPT_NAME = "-show-chars-len"
+                    show_chars_len: bool = False
+                    is_use_opt: bool = False
+                    for i, s in tuple(enumerate(cmd_list))[2:]:
+                        if s == USE_LIBASS_SPEC_OPT_NAME:
+                            use_libass_spec = cmd_list[i + 1] != "0"
+                            is_use_opt = True
+                        if s == SHOW_CHARS_LEN_OPT_NAME:
+                            show_chars_len = cmd_list[i + 1] != "0"
+                            is_use_opt = True
+                    if is_use_opt:
+                        _path_tuple = cmd_list[1:2]
+                    log.send(
+                        "  ".join(
+                            (
+                                f"{USE_LIBASS_SPEC_OPT_NAME} {1 if use_libass_spec else 0}",
+                                f"{SHOW_CHARS_LEN_OPT_NAME} {1 if show_chars_len else 0}",
+                            )
+                        )
+                    )
+                    for _path in _path_tuple:
+                        try:
+                            ass = Ass(_path)
+                        except Exception as e:
+                            log.error(e)
+                            return False
+
+                        log.send(_path)
+                        for font_sign, ss in ass.get_font_info(
+                            use_libass_spec=use_libass_spec,
+                        ).items():
+                            show_chars_len_log_str = ""
+                            if show_chars_len:
+                                show_chars_len_log_str = f": {len(ss)}"
+                            log.send(
+                                f"  ( {font_sign[0]} / {font_sign[1].name} ){show_chars_len_log_str}"
+                            )
                 case Cmd_type.fontinfo:
                     for _font in itertools.chain.from_iterable(
                         load_fonts(_path) for _path in _path_tuple

{easyrip-4.12.0 → easyrip-4.13.0}/easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -174,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"  # .
@@ -277,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 后关机",
@@ -300,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": "开始",

{easyrip-4.12.0 → easyrip-4.13.0}/easyrip/global_val.py

@@ -4,7 +4,7 @@ from functools import cache
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.12.0"
+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-4.12.0 → easyrip-4.13.0}/easyrip/ripper/ripper.py

@@ -901,18 +901,18 @@ class Ripper:
 
                     _font_in_sub = self.option_map.get("subset-font-in-sub", "0") == "1"
                     _use_win_font = (
-                        self.option_map.get("subset-use-win-font", "0") == "1"
+                        self.option_map.get("subset-use-win-font", "0") != "0"
                     )
                     _use_libass_spec = (
-                        self.option_map.get("subset-use-libass-spec", "0") == "1"
+                        self.option_map.get("subset-use-libass-spec", "1") != "0"
                     )
                     _drop_non_render = (
-                        self.option_map.get("subset-drop-non-render", "1") == "1"
+                        self.option_map.get("subset-drop-non-render", "1") != "0"
                     )
                     _drop_unkow_data = (
-                        self.option_map.get("subset-drop-unkow-data", "1") == "1"
+                        self.option_map.get("subset-drop-unkow-data", "1") != "0"
                     )
-                    _strict = self.option_map.get("subset-strict", "0") == "1"
+                    _strict = self.option_map.get("subset-strict", "0") != "0"
 
                     subset_res = subset(
                         _ass_list,
@@ -1057,11 +1057,12 @@ class Ripper:
         )
         is_cmd_run_failed: bool = False
         for i, cmd in enumerate(cmd_list, 1):
-            log.info(
+            log.info("Run the command {}", i)
+            log.debug(
                 "Run the command {}",
                 f"{i}:\n  {cmd}",
             )
-            if _cmd_res := os.system(cmd) != 0:
+            if (_cmd_res := os.system(cmd)) != 0:
                 is_cmd_run_failed = True
                 log.error(
                     "Command run failed: status code {}\n  Failed command: {}",

{easyrip-4.12.0 → easyrip-4.13.0}/easyrip/ripper/sub_and_font/ass.py

@@ -862,3 +862,163 @@ class Ass:
             ),
         )
         return "\n\n".join(filter(bool, generator)) + "\n"
+
+    def get_font_info(
+        self,
+        *,
+        use_libass_spec: bool = True,
+    ):
+        """获取 ASS 中需要的字体，以及对应的字符"""
+        from .font import Font_type
+        from .subset import _bold_italic_to_font_type
+
+        DEFAULT_STYLE_NAME = "Default"
+
+        font_sign__str: dict[tuple[str, Font_type], str] = {}
+
+        # Styles
+        style__font_sign: dict[str, tuple[str, Font_type]] = {}
+        for style in self.styles.data:
+            _is_vertical: bool = style.Fontname[0] == "@"
+            _font_name: str = style.Fontname[1:] if _is_vertical else style.Fontname
+            # 获取
+            style__font_sign[style.Name] = (
+                _font_name,
+                _bold_italic_to_font_type(style.Bold, style.Italic),
+            )
+
+        # Events
+        for event in self.events.data:
+            if event.type != Event_type.Dialogue:
+                continue
+
+            default_font_sign: tuple[str, Font_type]
+
+            # 获取每行的默认字体
+            if event.Style not in style__font_sign:
+                if DEFAULT_STYLE_NAME in style__font_sign:
+                    log.warning(
+                        "The style '{}' not in Styles. Defaulting to the style '{}'",
+                        event.Style,
+                        DEFAULT_STYLE_NAME,
+                    )
+                    default_font_sign = style__font_sign[DEFAULT_STYLE_NAME]
+                else:
+                    log.warning(
+                        "The style '{}' and the style 'Default' not in Styles. Defaulting to no font",
+                        event.Style,
+                    )
+                    default_font_sign = ("", Font_type.Regular)
+            else:
+                default_font_sign = style__font_sign[event.Style]
+
+            # 解析 Text
+            current_font_sign: tuple[str, Font_type] = default_font_sign
+            for is_tag, text in Event_data.parse_text(event.Text, use_libass_spec):
+                if is_tag:
+                    tag_fn: str | None = None
+                    tag_bold: str | None = None
+                    tag_italic: str | None = None
+
+                    for tag, value in re.findall(
+                        r"\\\s*(fn|b(?![a-zA-Z])|i(?![a-zA-Z])|r)([^\\}]*)", text
+                    ):
+                        assert isinstance(tag, str) and isinstance(value, str)
+
+                        proc_value = value.strip()
+                        if proc_value.startswith("("):
+                            proc_value = proc_value[1:]
+                            if (_index := proc_value.find(")")) != -1:
+                                proc_value = proc_value[:_index]
+                            proc_value = proc_value.strip()
+
+                        match tag:
+                            case "fn":
+                                tag_fn = proc_value
+                            case "b":
+                                tag_bold = proc_value
+                            case "i":
+                                tag_italic = proc_value
+                            case "r":
+                                r_value = proc_value if "(" in value else value.rstrip()
+                                if r_value in style__font_sign:
+                                    current_font_sign = style__font_sign[r_value]
+                                else:
+                                    # 空为还原样式, 非样式表内样式名效果同空, 但发出不规范警告
+                                    current_font_sign = default_font_sign
+                                    if r_value != "":
+                                        log.warning(
+                                            "The \\r style '{}' not in Styles", r_value
+                                        )
+
+                    new_fontname: str = current_font_sign[0]
+                    new_bold: bool
+                    new_italic: bool
+                    new_bold, new_italic = current_font_sign[1].value
+
+                    if tag_fn is not None:
+                        match tag_fn:
+                            case "":
+                                new_fontname = default_font_sign[0]
+                            case _:
+                                _is_vertical: bool = tag_fn.startswith("@")
+                                new_fontname = tag_fn[1:] if _is_vertical else tag_fn
+
+                    if tag_bold is not None:
+                        match tag_bold:
+                            case "":
+                                new_bold = default_font_sign[1].value[0]
+                            case "0":
+                                new_bold = False
+                            case "1":
+                                new_bold = True
+                            case _:
+                                log.error(
+                                    "Illegal format: '{}' in line: {}",
+                                    f"\\b{tag_bold}",
+                                    event.Text,
+                                )
+
+                    if tag_italic is not None:
+                        match tag_italic:
+                            case "":
+                                new_italic = default_font_sign[1].value[1]
+                            case "0":
+                                new_italic = False
+                            case "1":
+                                new_italic = True
+                            case _:
+                                log.error(
+                                    "Illegal format: '{}' in line: {}",
+                                    f"\\i{tag_italic}",
+                                    event.Text,
+                                )
+
+                    current_font_sign = (
+                        new_fontname,
+                        Font_type((new_bold, new_italic)),
+                    )
+
+                elif current_font_sign[0]:  # 空字符串为不使用字体
+                    add_text = re.sub(r"\\[nN]", "", text).replace("\\h", "\u00a0")
+
+                    if current_font_sign not in font_sign__str:
+                        font_sign__str[current_font_sign] = ""
+
+                    font_sign__str[current_font_sign] += add_text
+
+        return {font_sign: set(s) for font_sign, s in font_sign__str.items()}
+
+    @classmethod
+    def analysis_font_info(
+        cls,
+        ass: Self | Path | str,
+        /,
+        *,
+        use_libass_spec: bool = True,
+    ):
+        if isinstance(ass, str):
+            ass = Path(ass)
+        if isinstance(ass, Path):
+            ass = cls(ass)
+        return ass.get_font_info(use_libass_spec=use_libass_spec)

{easyrip-4.12.0 → easyrip-4.13.0}/easyrip/ripper/sub_and_font/subset.py

@@ -33,7 +33,7 @@ def subset(
     *,
     font_in_sub: bool = False,
     use_win_font: bool = False,
-    use_libass_spec: bool = False,
+    use_libass_spec: bool = True,
     drop_non_render: bool = True,
     drop_unkow_data: bool = True,
     strict: bool = False,

{easyrip-4.12.0 → easyrip-4.13.0}/easyrip.egg-info/PKG-INFO

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