easyrip 4.9.1__py3-none-any.whl → 4.11.0__py3-none-any.whl

easyrip/easyrip_log.py

@@ -397,8 +397,6 @@ class log:
             **fmt_kwargs,
         )
 
-    warn = warning
-
     @classmethod
     def error(
         cls,
@@ -428,8 +426,6 @@ class log:
             **fmt_kwargs,
         )
 
-    err = error
-
     @classmethod
     def send(
         cls,

easyrip/global_val.py

@@ -3,7 +3,7 @@ import sys
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.9.1"
+PROJECT_VERSION = "4.11.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

@@ -1081,6 +1081,8 @@ class Ripper:
                     soft_sub_list = [Path(s) for s in soft_sub.split("?")]
 
                 subset_folder = Path(self.output_dir) / f"subset_temp_{temp_name}"
+                if not soft_sub_list:
+                    log.warning("-soft-sub is empty")
                 log.info("-soft-sub list = {}", soft_sub_list)
 
                 # 临时翻译

easyrip/ripper/sub_and_font/ass.py

@@ -2,11 +2,13 @@ import enum
 import itertools
 import re
 from dataclasses import dataclass, field
+from functools import total_ordering
 from pathlib import Path
+from typing import Self
 
 from ...easyrip_log import log
 from ...easyrip_mlang import Mlang_exception
-from ...utils import read_text, uudecode_ssa, uuencode_ssa
+from ...utils import read_text, time_str_to_sec, uudecode_ssa, uuencode_ssa
 
 
 class Style_fmt_it(enum.Enum):
@@ -63,7 +65,7 @@ class Script_info:
 class Style_data:
     Name: str
     Fontname: str
-    Fontsize: int
+    Fontsize: float
     PrimaryColour: str
     SecondaryColour: str
     OutlineColour: str
@@ -212,7 +214,7 @@ class Styles:
             res = Style_data(
                 Name=style_tuple[self.fmt_index[Style_fmt_it.Name]],
                 Fontname=style_tuple[self.fmt_index[Style_fmt_it.Fontname]],
-                Fontsize=int(style_tuple[self.fmt_index[Style_fmt_it.Fontsize]]),
+                Fontsize=float(style_tuple[self.fmt_index[Style_fmt_it.Fontsize]]),
                 PrimaryColour=style_tuple[self.fmt_index[Style_fmt_it.PrimaryColour]],
                 SecondaryColour=style_tuple[
                     self.fmt_index[Style_fmt_it.SecondaryColour]
@@ -264,6 +266,75 @@ class Styles:
         )
 
 
+@total_ordering
+class Ass_time:
+    def __init__(
+        self,
+        h: int = 0,
+        m: int = 0,
+        s: int = 0,
+        ms: int = 0,
+    ) -> None:
+        self.h = h
+        self.m = m
+        self.s = s
+        self.ms = ms
+
+    def __str__(self) -> str:
+        return f"{self.h:02d}:{self.m:02d}:{self.s:02d}.{self.ms // 10:02d}"
+
+    def __hash__(self) -> int:
+        return hash((self.h, self.m, self.s, self.ms))
+
+    def __eq__(self, value: object) -> bool:
+        if isinstance(value, Ass_time):
+            return (self.h, self.m, self.s, self.ms) == (
+                value.h,
+                value.m,
+                value.s,
+                value.ms,
+            )
+        return NotImplemented
+
+    def __lt__(self, value: object) -> bool:
+        if isinstance(value, Ass_time):
+            return (self.h, self.m, self.s, self.ms) < (
+                value.h,
+                value.m,
+                value.s,
+                value.ms,
+            )
+        return NotImplemented
+
+    def __add__(self, other: object) -> Self:
+        if isinstance(other, Ass_time):
+            return self.__class__.from_ms(self.total_ms() + other.total_ms())
+        return NotImplemented
+
+    def __sub__(self, other: object) -> Self:
+        if isinstance(other, Ass_time):
+            return self.__class__.from_ms(self.total_ms() - other.total_ms())
+        return NotImplemented
+
+    @classmethod
+    def from_ms(cls, ms: int) -> Self:
+        return cls(
+            ms // 3_600_000,
+            (ms % 3_600_000) // 60_000,
+            (ms % 60_000) // 1000,
+            ms % 1000,
+        )
+
+    @classmethod
+    def from_str(cls, ass_time_str: str) -> Self:
+        return cls.from_ms(
+            round(time_str_to_sec(ass_time_str) * 1000),
+        )
+
+    def total_ms(self) -> int:
+        return self.h * 3_600_000 + self.m * 60_000 + self.s * 1000 + self.ms
+
+
 class Event_fmt_it(enum.Enum):
     Layer = "Layer"
     Start = "Start"
@@ -291,8 +362,8 @@ class Event_data:
     type: Event_type
 
     Layer: int
-    Start: str
-    End: str
+    Start: Ass_time
+    End: Ass_time
     Style: str
     Name: str
     MarginL: int
@@ -451,8 +522,12 @@ class Events:
             res = Event_data(
                 type=event_type,
                 Layer=int(event_tuple[self.fmt_index[Event_fmt_it.Layer]]),
-                Start=event_tuple[self.fmt_index[Event_fmt_it.Start]],
-                End=event_tuple[self.fmt_index[Event_fmt_it.End]],
+                Start=Ass_time.from_str(
+                    event_tuple[self.fmt_index[Event_fmt_it.Start]],
+                ),
+                End=Ass_time.from_str(
+                    event_tuple[self.fmt_index[Event_fmt_it.End]],
+                ),
                 Style=event_tuple[self.fmt_index[Event_fmt_it.Style]],
                 Name=event_tuple[self.fmt_index[Event_fmt_it.Name]],
                 MarginL=int(event_tuple[self.fmt_index[Event_fmt_it.MarginL]]),
@@ -496,7 +571,11 @@ class Events:
                     )
                     for event in self.data
                     if (drop_non_render is False)
-                    or (event.type != Event_type.Comment and event.Text)
+                    or (
+                        event.type != Event_type.Comment
+                        and event.Text
+                        and event.Start < event.End
+                    )
                 ),
             )
         )
@@ -613,143 +692,156 @@ class Ass:
         new_unknown_data: Unknown_data | None = None
 
         for line in filter(bool, map(str.strip, read_text(path).splitlines())):
-            if line.startswith("[") and line.endswith("]"):
-                if new_unknown_data is not None:
-                    self.unknown_data.append(new_unknown_data)
-                    new_unknown_data = None
-
-                match head := line[1:-1]:
-                    case "Script Info":
-                        state = State.script_info
-                    case "V4+ Styles":
-                        state = State.styles
-                    case "Fonts":
-                        state = State.fonts
-                    case "Graphics":
-                        state = State.graphics
-                    case "Events":
-                        state = State.events
-                    case _:
-                        if bool(re.search(r"[a-z]", head)):
-                            state = State.unknown
-                            new_unknown_data = Unknown_data(head=head)
-
-            elif line.startswith("Format:"):
-                formats_tuple = tuple(map(str.strip, line[7:].split(",")))
-                match state:
-                    case State.styles:
-                        format_order = tuple(map(Style_fmt_it, formats_tuple))
-                        if len(format_order) != 23:
-                            raise Ass_generate_error("Style Format len != 23")
-
-                        self.styles.fmt_order = format_order
-
-                    case State.events:
-                        try:
-                            format_order = tuple(
-                                map(Event_fmt_it.__getitem__, formats_tuple)
-                            )
-                        except ValueError as e:
-                            raise Ass_generate_error from e
+            try:
+                if line.startswith("[") and line.endswith("]"):
+                    if new_unknown_data is not None:
+                        self.unknown_data.append(new_unknown_data)
+                        new_unknown_data = None
+
+                    match head := line[1:-1]:
+                        case "Script Info":
+                            state = State.script_info
+                        case "V4+ Styles":
+                            state = State.styles
+                        case "Fonts":
+                            state = State.fonts
+                        case "Graphics":
+                            state = State.graphics
+                        case "Events":
+                            state = State.events
+                        case _:
+                            if bool(re.search(r"[a-z]", head)):
+                                state = State.unknown
+                                new_unknown_data = Unknown_data(head=head)
+
+                elif line.startswith("Format:"):
+                    formats_tuple = tuple(map(str.strip, line[7:].split(",")))
+                    match state:
+                        case State.styles:
+                            format_order = tuple(map(Style_fmt_it, formats_tuple))
+                            if len(format_order) != 23:
+                                raise Ass_generate_error("Style Format len != 23")
+
+                            self.styles.fmt_order = format_order
+
+                        case State.events:
+                            try:
+                                format_order = tuple(
+                                    map(Event_fmt_it.__getitem__, formats_tuple)
+                                )
+                            except ValueError as e:
+                                raise Ass_generate_error from e
 
-                        if len(format_order) != 10:
-                            raise Ass_generate_error("Event Format len != 10")
+                            if len(format_order) != 10:
+                                raise Ass_generate_error("Event Format len != 10")
 
-                        if "Marked" in formats_tuple:
-                            log.error(
-                                "The ASS Events Format version too old: {}",
-                                "It used 'Marked' instead of 'Layer'. 'Marked' has been replaced with 'Layer', which will result in irreversible info loss",
-                            )
+                            if "Marked" in formats_tuple:
+                                log.error(
+                                    "The ASS Events Format version too old: {}",
+                                    "It used 'Marked' instead of 'Layer'. 'Marked' has been replaced with 'Layer', which will result in irreversible info loss",
+                                )
 
-                        self.events.fmt_order = format_order
+                            self.events.fmt_order = format_order
 
-            else:
-                match state:
-                    case State.script_info:
-                        self.script_info.data.append(Script_info_data(raw_str=line))
-
-                    case State.styles:
-                        if not line.startswith("Style:"):
-                            log.warning("Skip a Style line (illegal format): {}", line)
-                            continue
-
-                        style_tuple = tuple(map(str.strip, line[6:].split(",")))
-                        if len(style_tuple) != 23:
-                            log.warning(
-                                "Skip a Style line (Style Format len != 23): {}", line
-                            )
-                            continue
+                else:
+                    match state:
+                        case State.script_info:
+                            self.script_info.data.append(Script_info_data(raw_str=line))
+
+                        case State.styles:
+                            if not line.startswith("Style:"):
+                                log.warning(
+                                    "Skip a Style line (illegal format): {}", line
+                                )
+                                continue
+
+                            style_tuple = tuple(map(str.strip, line[6:].split(",")))
+                            if len(style_tuple) != 23:
+                                log.warning(
+                                    "Skip a Style line (Style Format len != 23): {}",
+                                    line,
+                                )
+                                continue
 
-                        self.styles.data.append(self.styles.new_data(style_tuple))
+                            self.styles.data.append(self.styles.new_data(style_tuple))
 
-                    case State.graphics:
-                        if line.startswith("filename:"):
-                            self.attachments.data.append(
-                                Attachment_data(
-                                    type=Attach_type.Graphics,
-                                    name=line[9:].strip(),
-                                    data="",
+                        case State.graphics:
+                            if line.startswith("filename:"):
+                                self.attachments.data.append(
+                                    Attachment_data(
+                                        type=Attach_type.Graphics,
+                                        name=line[9:].strip(),
+                                        data="",
+                                    )
+                                )
+                            else:
+                                if self.attachments.data[-1].data is None:
+                                    log.error("Unknown error", deep=True)
+                                    continue
+                                self.attachments.data[-1].data += line + "\n"
+
+                        case State.fonts:
+                            if line.startswith("fontname:"):
+                                self.attachments.data.append(
+                                    Attachment_data(
+                                        type=Attach_type.Fonts,
+                                        name=line[9:].strip(),
+                                        data="",
+                                    )
+                                )
+                            else:
+                                if self.attachments.data[-1].data is None:
+                                    log.error("Unknown error", deep=True)
+                                    continue
+                                self.attachments.data[-1].data += line + "\n"
+
+                        case State.events:
+                            event_type: Event_type
+                            if line.startswith("Dialogue:"):
+                                event_type = Event_type.Dialogue
+                            elif line.startswith("Comment:"):
+                                event_type = Event_type.Comment
+                            else:
+                                log.warning(
+                                    "Skip a Event line (illegal format): {}", line
                                 )
-                            )
-                        else:
-                            if self.attachments.data[-1].data is None:
-                                log.error("Unknown error", deep=True)
                                 continue
-                            self.attachments.data[-1].data += line + "\n"
-
-                    case State.fonts:
-                        if line.startswith("fontname:"):
-                            self.attachments.data.append(
-                                Attachment_data(
-                                    type=Attach_type.Fonts,
-                                    name=line[9:].strip(),
-                                    data="",
+
+                            event_tuple = tuple(
+                                map(
+                                    str.strip,
+                                    line.split(":", maxsplit=1)[1].split(
+                                        ",", maxsplit=9
+                                    ),
                                 )
                             )
-                        else:
-                            if self.attachments.data[-1].data is None:
-                                log.error("Unknown error", deep=True)
+                            if len(event_tuple) != 10:
+                                log.warning(
+                                    "Skip a Event line (Event Format len != 10): {}",
+                                    line,
+                                )
                                 continue
-                            self.attachments.data[-1].data += line + "\n"
-
-                    case State.events:
-                        event_type: Event_type
-                        if line.startswith("Dialogue:"):
-                            event_type = Event_type.Dialogue
-                        elif line.startswith("Comment:"):
-                            event_type = Event_type.Comment
-                        else:
-                            log.warning("Skip a Event line (illegal format): {}", line)
-                            continue
-
-                        event_tuple = tuple(
-                            map(
-                                str.strip,
-                                line.split(":", maxsplit=1)[1].split(",", maxsplit=9),
-                            )
-                        )
-                        if len(event_tuple) != 10:
-                            log.warning(
-                                "Skip a Event line (Event Format len != 10): {}", line
+
+                            self.events.data.append(
+                                self.events.new_data(event_tuple, event_type)
                             )
-                            continue
 
-                        self.events.data.append(
-                            self.events.new_data(event_tuple, event_type)
-                        )
+                        case State.unknown:
+                            if new_unknown_data is None:
+                                raise Ass_generate_error(
+                                    "Unknown error occurred when read line: {}", line
+                                )
+                            new_unknown_data.data.append(line)
 
-                    case State.unknown:
-                        if new_unknown_data is None:
-                            raise Ass_generate_error(
-                                "Unknown error occurred when read line: {}", line
-                            )
-                        new_unknown_data.data.append(line)
+            except Exception as e:
+                raise Ass_generate_error("Unkown error in line: {}", line) from e
 
         if new_unknown_data is not None:
             self.unknown_data.append(new_unknown_data)
 
     def __str__(
         self,
+        *,
         drop_non_render: bool = False,
         drop_unkow_data: bool = False,
         drop_fonts: bool = False,

{easyrip-4.9.1.dist-info → easyrip-4.11.0.dist-info}/METADATA

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

{easyrip-4.9.1.dist-info → easyrip-4.11.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 easyrip/__init__.py,sha256=PIvSPDgswsIkWL4dsCe87knnxKmtvcrWYzmqAwZix_M,765
 easyrip/__main__.py,sha256=bPVlHqJb3BG-qZOY4JlJdKj7MKeRb_3EfoMbfoNN-gU,4943
 easyrip/easyrip_command.py,sha256=X9_8t9Sxl1-gILpsQ5PueCwozTQgjgL2cImzOZ6pO7w,27837
-easyrip/easyrip_log.py,sha256=i5r3OPGQ55c3_zCN0fmriPXiWxibq-w35FbNT7VfuuM,15610
+easyrip/easyrip_log.py,sha256=R-dM3CWUBFITtG7GSD1zy4X4MhZqxkoiBPjlIpI76cY,15573
 easyrip/easyrip_main.py,sha256=QgIrsonjXNin72nv7WWePTlpj9soGZCBVv1cwFNS4a4,44691
 easyrip/easyrip_prompt.py,sha256=A5S7ybeJSGFkCmwdJ9TCQ_-lde7NWgkbFytZ2KnvkWI,2145
-easyrip/global_val.py,sha256=8kU9EXFlb7UoXTfTdW6l038FqRbwAH1iUaWJRPSuLtg,773
+easyrip/global_val.py,sha256=Z9Y8N7MpqegW-5LDs8bn1dhmqjSSbEB2P6Oeye_sJ-4,774
 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
@@ -18,14 +18,14 @@ easyrip/easyrip_web/http_server.py,sha256=iyulCAFQrJlz86Lrr-Dm3fhOnNCf79Bp6fVHhr
 easyrip/easyrip_web/third_party_api.py,sha256=GhP6LmR1sVMeLLbnj82r-QYjoUdSnyaU9xp0LRnRLsw,4623
 easyrip/ripper/media_info.py,sha256=mQq_vbQ7S9fWpb39HLkoZlAL-pqNfwxewv6X776Nf50,5078
 easyrip/ripper/param.py,sha256=y1n2XaW55TJQ_r858pB4kYZVgT6TRpmS5vv9iMEIESc,11736
-easyrip/ripper/ripper.py,sha256=yrqVlLLe68RZI9BVVMAEJ4AplrwlvBDt8h0m3yLrO9o,50345
+easyrip/ripper/ripper.py,sha256=xTwKpgkqqhh0x6J8DnE5fnXmEN_Q6ZZAdCPky68P-DE,50437
 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/ass.py,sha256=hJhVN7CqehN9xW1W295gmkPnG-somqlxnwXzRidbA2M,28645
 easyrip/ripper/sub_and_font/font.py,sha256=X2dPcPzbwQf3fv_g_mxO-zY7puVAX9Nv-9QHn88q4oA,7745
 easyrip/ripper/sub_and_font/subset.py,sha256=qGH3H26nHnyGFfFwvktEIKncHpm086DqxYjVhNoVDdM,18654
-easyrip-4.9.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-easyrip-4.9.1.dist-info/METADATA,sha256=M2A05LL_xR25O-Gx1AY0O0XproQkXhc2e6bfE-AU2F4,3506
-easyrip-4.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-easyrip-4.9.1.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
-easyrip-4.9.1.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
-easyrip-4.9.1.dist-info/RECORD,,
+easyrip-4.11.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+easyrip-4.11.0.dist-info/METADATA,sha256=-5Cnc5K0zC8oUEFqgcomSavHeKGeejLu-h6-xhysxsA,3507
+easyrip-4.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+easyrip-4.11.0.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
+easyrip-4.11.0.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
+easyrip-4.11.0.dist-info/RECORD,,