♻️ refactor: rustify write_special_comment (#331)

Author: SigureMo

packages/biliass/rust/src/lib.rs

@@ -27,12 +27,12 @@ fn biliass_pyo3(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(python::py_read_comments_from_xml, m)?)?;
     m.add_function(wrap_pyfunction!(python::py_read_comments_from_protobuf, m)?)?;
     m.add_function(wrap_pyfunction!(python::py_parse_special_comment, m)?)?;
-    m.add_function(wrap_pyfunction!(python::py_get_zoom_factor, m)?)?;
     m.add_function(wrap_pyfunction!(python::py_write_head, m)?)?;
     m.add_function(wrap_pyfunction!(python::py_write_normal_comment, m)?)?;
     m.add_function(wrap_pyfunction!(
         python::py_write_comment_with_animation,
         m
     )?)?;
+    m.add_function(wrap_pyfunction!(python::py_write_special_comment, m)?)?;
     Ok(())
 }

packages/biliass/rust/src/python/mod.rs

@@ -9,6 +9,6 @@ pub use reader::{
     py_parse_special_comment, py_read_comments_from_protobuf, py_read_comments_from_xml,
 };
 pub use writer::{
-    py_get_zoom_factor, py_write_comment_with_animation, py_write_head, py_write_normal_comment,
-    PyRows,
+    py_write_comment_with_animation, py_write_head, py_write_normal_comment,
+    py_write_special_comment, PyRows,
 };

packages/biliass/rust/src/python/writer.rs

@@ -3,14 +3,6 @@ use crate::writer::{self, rows};
 
 use pyo3::prelude::*;
 
-#[pyfunction(name = "get_zoom_factor")]
-pub fn py_get_zoom_factor(
-    source_size: (u32, u32),
-    target_size: (u32, u32),
-) -> PyResult<(f32, f32, f32)> {
-    Ok(writer::utils::get_zoom_factor(source_size, target_size))
-}
-
 #[pyclass(name = "Rows")]
 pub struct PyRows {
     pub inner: rows::Rows,
@@ -80,18 +72,18 @@ pub fn py_write_comment_with_animation(
     comment: &crate::python::PyComment,
     width: u32,
     height: u32,
-    rotate_y: f64,
-    rotate_z: f64,
+    rotate_y: i64,
+    rotate_z: i64,
     from_x: f64,
     from_y: f64,
     to_x: f64,
     to_y: f64,
     from_alpha: u8,
     to_alpha: u8,
     text: &str,
-    delay: f64,
+    delay: i64,
     lifetime: f64,
-    duration: f64,
+    duration: i64,
     fontface: &str,
     is_border: bool,
     styleid: &str,
@@ -119,3 +111,18 @@ pub fn py_write_comment_with_animation(
         zoom_factor,
     ))
 }
+
+#[pyfunction(name = "write_special_comment")]
+pub fn py_write_special_comment(
+    comment: &crate::python::PyComment,
+    width: u32,
+    height: u32,
+    styleid: &str,
+) -> PyResult<String> {
+    Ok(writer::ass::write_special_comment(
+        &comment.inner,
+        width,
+        height,
+        styleid,
+    ))
+}

packages/biliass/rust/src/reader/special.rs

@@ -1,10 +1,10 @@
 use crate::error::{BiliassError, DecodeError, ParseError};
 use crate::reader::utils;
 
-// const BILI_PLAYER_SIZE: (u32, u32) = (512, 384); // Bilibili player version 2010
-// const BILI_PLAYER_SIZE: (u32, u32) = (540, 384); // Bilibili player version 2012
-// const BILI_PLAYER_SIZE: (u32, u32) = (672, 438); // Bilibili player version 2014
-const BILI_PLAYER_SIZE: (u32, u32) = (891, 589); // Bilibili player version 2021 (flex)
+// pub const BILI_PLAYER_SIZE: (u32, u32) = (512, 384); // Bilibili player version 2010
+// pub const BILI_PLAYER_SIZE: (u32, u32) = (540, 384); // Bilibili player version 2012
+// pub const BILI_PLAYER_SIZE: (u32, u32) = (672, 438); // Bilibili player version 2014
+pub const BILI_PLAYER_SIZE: (u32, u32) = (891, 589); // Bilibili player version 2021 (flex)
 
 fn get_position(input_pos: f64, is_height: bool, zoom_factor: (f32, f32, f32)) -> f64 {
     let (zoom, size) = if is_height {

packages/biliass/rust/src/writer/ass.rs

@@ -1,4 +1,5 @@
 use crate::comment::{Comment, CommentPosition};
+use crate::reader::special::parse_special_comment;
 use crate::writer::rows;
 use crate::writer::utils;
 
@@ -163,33 +164,39 @@ pub fn write_comment_with_animation(
     comment: &Comment,
     width: u32,
     height: u32,
-    rotate_y: f64,
-    rotate_z: f64,
+    rotate_y: i64,
+    rotate_z: i64,
     from_x: f64,
     from_y: f64,
     to_x: f64,
     to_y: f64,
     from_alpha: u8,
     to_alpha: u8,
     text: &str,
-    delay: f64,
+    delay: i64,
     lifetime: f64,
-    duration: f64,
+    duration: i64,
     fontface: &str,
     is_border: bool,
     styleid: &str,
     zoom_factor: (f32, f32, f32),
 ) -> String {
     let from_rotarg = utils::convert_flash_rotation(
-        rotate_y,
-        rotate_z,
+        rotate_y as f64,
+        rotate_z as f64,
         from_x,
         from_y,
         width as f64,
         height as f64,
     );
-    let to_rotarg =
-        utils::convert_flash_rotation(rotate_y, rotate_z, to_x, to_y, width as f64, height as f64);
+    let to_rotarg = utils::convert_flash_rotation(
+        rotate_y as f64,
+        rotate_z as f64,
+        to_x,
+        to_y,
+        width as f64,
+        height as f64,
+    );
     if vec![
         from_rotarg.0,
         from_rotarg.1,
@@ -279,3 +286,45 @@ pub fn write_comment_with_animation(
     let text = utils::ass_escape(text);
     format!("Dialogue: -1,{start},{end},{styleid},,0,0,0,,{{{styles}}}{text}\n")
 }
+
+pub fn write_special_comment(comment: &Comment, width: u32, height: u32, styleid: &str) -> String {
+    let zoom_factor =
+        utils::get_zoom_factor(crate::reader::special::BILI_PLAYER_SIZE, (width, height));
+    let parsed_res = parse_special_comment(&comment.comment, zoom_factor);
+    if parsed_res.is_err() {
+        // eprintln!("Invalid comment: {}", comment.comment);
+        return "".to_owned();
+    }
+    let (
+        (rotate_y, rotate_z, from_x, from_y, to_x, to_y),
+        from_alpha,
+        to_alpha,
+        text,
+        delay,
+        lifetime,
+        duration,
+        fontface,
+        is_border,
+    ) = parsed_res.unwrap();
+    write_comment_with_animation(
+        comment,
+        width,
+        height,
+        rotate_y,
+        rotate_z,
+        from_x,
+        from_y,
+        to_x,
+        to_y,
+        from_alpha,
+        to_alpha,
+        &text,
+        delay,
+        lifetime,
+        duration,
+        &fontface,
+        is_border,
+        styleid,
+        zoom_factor,
+    )
+}

packages/biliass/src/biliass/_core.pyi

@@ -57,7 +57,6 @@ class Comment:
 
 def read_comments_from_xml(text: str, fontsize: float) -> list[Comment]: ...
 def read_comments_from_protobuf(data: bytes, fontsize: float) -> list[Comment]: ...
-def get_zoom_factor(source_size: tuple[int, int], target_size: tuple[int, int]) -> tuple[float, float, float]: ...
 
 class Rows:
     def __init__(self, num_types: int, capacity: int) -> None: ...
@@ -99,3 +98,4 @@ def write_comment_with_animation(
 def parse_special_comment(
     content: str, zoom_factor: tuple[float, float, float]
 ) -> tuple[tuple[int, int, float, float, float, float], int, int, str, int, float, int, str, bool]: ...
+def write_special_comment(comment: Comment, width: int, height: int, styleid: str) -> str: ...

packages/biliass/src/biliass/biliass.py

@@ -11,13 +11,12 @@
     Comment,
     CommentPosition,
     Rows,
-    get_zoom_factor,
-    parse_special_comment,
     read_comments_from_protobuf,
     read_comments_from_xml,
     write_comment_with_animation,
     write_head,
     write_normal_comment,
+    write_special_comment,
 )
 
 if TYPE_CHECKING:
@@ -38,52 +37,12 @@ def read_comments_bilibili_protobuf(protobuf: bytes | str, fontsize: float) -> l
     return read_comments_from_protobuf(protobuf, fontsize)
 
 
-BILI_PLACYER_SIZE = (891, 589)
-
-
 class AssText:
     def __init__(self):
         self._text = ""
 
-    def write_comment_special(self, comment: Comment, width, height, styleid):
-        zoom_factor = get_zoom_factor(BILI_PLACYER_SIZE, (width, height))
-        try:
-            (
-                (rotate_y, rotate_z, from_x, from_y, to_x, to_y),
-                from_alpha,
-                to_alpha,
-                text,
-                delay,
-                lifetime,
-                duration,
-                fontface,
-                is_border,
-            ) = parse_special_comment(comment.comment, zoom_factor)
-
-            self.write_comment_with_animation(
-                comment,
-                width,
-                height,
-                rotate_y,
-                rotate_z,
-                from_x,
-                from_y,
-                to_x,
-                to_y,
-                from_alpha,
-                to_alpha,
-                text,
-                delay,
-                lifetime,
-                duration,
-                fontface,
-                is_border,
-                styleid,
-                zoom_factor,
-            )
-
-        except ValueError:
-            logging.warning(f"Invalid comment: {comment.comment!r}")
+    def write_special_comment(self, comment: Comment, width, height, styleid) -> None:
+        self._text += write_special_comment(comment, width, height, styleid)
 
     def write_head(self, width: int, height: int, fontface: str, fontsize: float, alpha: float, styleid: str) -> None:
         self._text += write_head(width, height, fontface, fontsize, alpha, styleid)
@@ -209,7 +168,7 @@ def process_comments(
                 reduced,
             )
         elif comment.pos == CommentPosition.Special:
-            ass.write_comment_special(comment, width, height, styleid)
+            ass.write_special_comment(comment, width, height, styleid)
         else:
             logging.warning(f"Invalid comment: {comment.comment!r}")
     if progress_callback: