⚡️ perf: avoid many clone for comment (#337)

Author: SigureMo

packages/biliass/rust/src/lib.rs

@@ -24,17 +24,9 @@ fn biliass_pyo3(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<python::PyDanmakuElem>()?;
     m.add_class::<python::PyComment>()?;
     m.add_class::<python::PyCommentPosition>()?;
-    m.add_class::<python::PyRows>()?;
     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_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)?)?;
     m.add_function(wrap_pyfunction!(python::py_xml_to_ass, m)?)?;
     m.add_function(wrap_pyfunction!(python::py_protobuf_to_ass, m)?)?;
     Ok(())

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

@@ -2,15 +2,10 @@ mod comment;
 mod convert;
 mod proto;
 mod reader;
-mod writer;
 
 pub use comment::{PyComment, PyCommentPosition};
 pub use convert::{py_protobuf_to_ass, py_xml_to_ass};
 pub use proto::{PyDanmakuElem, PyDmSegMobileReply};
 pub use reader::{
     py_parse_special_comment, py_read_comments_from_protobuf, py_read_comments_from_xml,
 };
-pub use writer::{
-    py_write_comment_with_animation, py_write_head, py_write_normal_comment,
-    py_write_special_comment, PyRows,
-};

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

@@ -99,9 +99,9 @@ pub fn write_comment(
 }
 
 #[allow(clippy::too_many_arguments)]
-pub fn write_normal_comment(
-    rows: &mut rows::Rows,
-    comment: &Comment,
+pub fn write_normal_comment<'a>(
+    rows: &mut rows::Rows<'a>,
+    comment: &'a Comment,
     width: u32,
     height: u32,
     bottom_reserved: u32,

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

@@ -1,10 +1,8 @@
 use crate::comment::{Comment, CommentPosition};
 
-pub type Rows = Vec<Vec<Option<Comment>>>;
+pub type Rows<'a> = Vec<Vec<Option<&'a Comment>>>;
 
-// TODO(SigureMo): Remove clone in the future
-
-pub fn init_rows(num_types: usize, capacity: usize) -> Rows {
+pub fn init_rows<'a>(num_types: usize, capacity: usize) -> Rows<'a> {
     let mut rows: Rows = Vec::new();
     for _ in 0..num_types {
         let mut type_rows = Vec::with_capacity(capacity);
@@ -35,8 +33,8 @@ pub fn test_free_rows(
         let mut current_row = row;
         while current_row < rowmax && (res as f32) < comment.height {
             if target_row != rows[comment_pos_id][current_row] {
-                target_row = rows[comment_pos_id][current_row].clone();
-                if let Some(target_row) = target_row.clone() {
+                target_row = rows[comment_pos_id][current_row];
+                if let Some(target_row) = target_row {
                     if target_row.timeline + duration_still > comment.timeline {
                         break;
                     }
@@ -51,8 +49,8 @@ pub fn test_free_rows(
         let mut current_row = row;
         while current_row < rowmax && (res as f32) < comment.height {
             if target_row != rows[comment_pos_id][current_row] {
-                target_row = rows[comment_pos_id][current_row].clone();
-                if let Some(target_row) = target_row.clone() {
+                target_row = rows[comment_pos_id][current_row];
+                if let Some(target_row) = target_row {
                     if target_row.timeline > threshold_time
                         || target_row.timeline
                             + target_row.width as f64 * duration_marquee
@@ -92,12 +90,12 @@ pub fn find_alternative_row(
     res
 }
 
-pub fn mark_comment_row(rows: &mut Rows, comment: &Comment, row: usize) {
+pub fn mark_comment_row<'a>(rows: &mut Rows<'a>, comment: &'a Comment, row: usize) {
     let comment_pos_id = comment.pos.clone() as usize;
     for i in row..(row + comment.height.ceil() as usize) {
         if i >= rows[comment_pos_id].len() {
             break;
         }
-        rows[comment_pos_id][i] = Some(comment.clone());
+        rows[comment_pos_id][i] = Some(comment);
     }
 }

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

@@ -1,4 +1,3 @@
-from collections.abc import Callable
 from typing import ClassVar
 
 class DanmakuElem:
@@ -58,48 +57,9 @@ class Comment:
 
 def read_comments_from_xml(text: str, fontsize: float) -> list[Comment]: ...
 def read_comments_from_protobuf(data: bytes, fontsize: float) -> list[Comment]: ...
-
-class Rows:
-    def __init__(self, num_types: int, capacity: int) -> None: ...
-
-def write_head(width: int, height: int, fontface: str, fontsize: float, alpha: float, styleid: str) -> str: ...
-def write_normal_comment(
-    rows: Rows,
-    comment: Comment,
-    width: int,
-    height: int,
-    bottom_reserved: int,
-    fontsize: float,
-    duration_marquee: float,
-    duration_still: float,
-    styleid: str,
-    reduced: bool,
-) -> str: ...
-def write_comment_with_animation(
-    comment: Comment,
-    width: int,
-    height: int,
-    rotate_y: float,
-    rotate_z: float,
-    from_x: float,
-    from_y: float,
-    to_x: float,
-    to_y: float,
-    from_alpha: int,
-    to_alpha: int,
-    text: str,
-    delay: float,
-    lifetime: float,
-    duration: float,
-    fontface: str,
-    is_border: bool,
-    styleid: str,
-    zoom_factor: tuple[float, float, float],
-) -> str: ...
 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: ...
 def xml_to_ass(
     inputs: list[str],
     stage_width: int,