♻️ refactor: rustify writer utility mark_comment_row (#321)

Author: SigureMo

packages/biliass/rust/src/lib.rs

@@ -34,5 +34,6 @@ fn biliass_pyo3(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(python::py_test_free_rows, m)?)?;
     m.add_class::<python::PyRows>()?;
     m.add_function(wrap_pyfunction!(python::py_find_alternative_row, m)?)?;
+    m.add_function(wrap_pyfunction!(python::py_mark_comment_row, m)?)?;
     Ok(())
 }

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

@@ -8,5 +8,5 @@ pub use proto::{PyDanmakuElem, PyDmSegMobileReply};
 pub use reader::{py_read_comments_from_protobuf, py_read_comments_from_xml};
 pub use writer::{
     py_ass_escape, py_convert_color, py_convert_flash_rotation, py_convert_timestamp,
-    py_find_alternative_row, py_get_zoom_factor, py_test_free_rows, PyRows,
+    py_find_alternative_row, py_get_zoom_factor, py_mark_comment_row, py_test_free_rows, PyRows,
 };

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

@@ -110,3 +110,13 @@ pub fn py_find_alternative_row(
         bottom_reserved,
     ))
 }
+
+#[pyfunction(name = "mark_comment_row")]
+pub fn py_mark_comment_row(
+    rows: &mut python::writer::PyRows,
+    comment: &crate::python::PyComment,
+    row: usize,
+) -> PyResult<()> {
+    writer::rows::mark_comment_row(&mut rows.inner, &comment.inner, row);
+    Ok(())
+}

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

@@ -2,6 +2,8 @@ use crate::comment::{Comment, CommentPosition};
 
 pub type Rows = Vec<Vec<Option<Comment>>>;
 
+// TODO(SigureMo): Remove clone in the future
+
 #[allow(clippy::too_many_arguments)]
 pub fn test_free_rows(
     rows: &Rows,
@@ -77,3 +79,13 @@ pub fn find_alternative_row(
     }
     res
 }
+
+pub fn mark_comment_row(rows: &mut Rows, comment: &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());
+    }
+}

packages/biliass/src/biliass/_core.pyi

@@ -90,3 +90,4 @@ class Rows:
     def set(self, row: int, col: int, OptionComment) -> None: ...
 
 def find_alternative_row(rows: Rows, comment: Comment, height: int, bottom_reserved: int): ...
+def mark_comment_row(rows: Rows, comment: Comment, row: int) -> None: ...

packages/biliass/src/biliass/biliass.py

@@ -12,14 +12,14 @@
 from biliass._core import (
     Comment,
     CommentPosition,
-    OptionComment,
     Rows,
     ass_escape,
     convert_color,
     convert_flash_rotation,
     convert_timestamp,
     find_alternative_row,
     get_zoom_factor,
+    mark_comment_row,
     read_comments_from_protobuf,
     read_comments_from_xml,
     test_free_rows,
@@ -317,15 +317,6 @@ def process_comments(
     return ass.to_string()
 
 
-def mark_comment_row(rows: Rows, comment: Comment, row: int):
-    comment_pos_id = comment.pos.id
-    try:
-        for i in range(row, row + math.ceil(comment.height)):
-            rows.set(comment_pos_id, i, OptionComment.from_comment(comment))
-    except IndexError:
-        pass
-
-
 def convert_type2(row, height, bottom_reserved):
     return height - bottom_reserved - row