♻️ refactor: rustify writer utility find_alternative_row (#320)

Author: SigureMo

packages/biliass/rust/src/lib.rs

@@ -33,5 +33,6 @@ fn biliass_pyo3(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(python::py_convert_flash_rotation, m)?)?;
     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)?)?;
     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_get_zoom_factor, py_test_free_rows, PyRows,
+    py_find_alternative_row, py_get_zoom_factor, py_test_free_rows, PyRows,
 };

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

@@ -95,3 +95,18 @@ pub fn py_test_free_rows(
         duration_still,
     ))
 }
+
+#[pyfunction(name = "find_alternative_row")]
+pub fn py_find_alternative_row(
+    rows: &python::writer::PyRows,
+    comment: &crate::python::PyComment,
+    height: usize,
+    bottom_reserved: usize,
+) -> PyResult<usize> {
+    Ok(writer::rows::find_alternative_row(
+        &rows.inner,
+        &comment.inner,
+        height,
+        bottom_reserved,
+    ))
+}

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

@@ -55,3 +55,25 @@ pub fn test_free_rows(
     }
     res
 }
+
+pub fn find_alternative_row(
+    rows: &Rows,
+    comment: &Comment,
+    height: usize,
+    bottom_reserved: usize,
+) -> usize {
+    let mut res = 0;
+    let comment_pos_id = comment.pos.clone() as usize;
+    for row in 0..(height - bottom_reserved - comment.height.ceil() as usize) {
+        match &rows[comment_pos_id][row] {
+            None => return row,
+            Some(comment) => {
+                let comment_res = &rows[comment_pos_id][res].as_ref().expect("res is None");
+                if comment.timeline < comment_res.timeline {
+                    res = row;
+                }
+            }
+        }
+    }
+    res
+}

packages/biliass/src/biliass/_core.pyi

@@ -88,3 +88,5 @@ class Rows:
     def __init__(self, num_types: int, capacity: int) -> None: ...
     def get(self, row: int, col: int) -> OptionComment: ...
     def set(self, row: int, col: int, OptionComment) -> None: ...
+
+def find_alternative_row(rows: Rows, comment: Comment, height: int, bottom_reserved: int): ...

packages/biliass/src/biliass/biliass.py

@@ -18,6 +18,7 @@
     convert_color,
     convert_flash_rotation,
     convert_timestamp,
+    find_alternative_row,
     get_zoom_factor,
     read_comments_from_protobuf,
     read_comments_from_xml,
@@ -316,17 +317,6 @@ def process_comments(
     return ass.to_string()
 
 
-def find_alternative_row(rows: Rows, comment: Comment, height, bottom_reserved):
-    res = 0
-    comment_pos_id = comment.pos.id
-    for row in range(height - bottom_reserved - math.ceil(comment.height)):
-        if rows.get(comment_pos_id, row).is_none():
-            return row
-        elif rows.get(comment_pos_id, row).unwrap().timeline < rows.get(comment_pos_id, res).unwrap().timeline:
-            res = row
-    return res
-
-
 def mark_comment_row(rows: Rows, comment: Comment, row: int):
     comment_pos_id = comment.pos.id
     try: