🔥 refactor: cleanup unused pyo3 APIs (#327)

Author: SigureMo

packages/biliass/rust/src/lib.rs

@@ -22,21 +22,16 @@ fn biliass_pyo3(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<python::PyDmSegMobileReply>()?;
     m.add_class::<python::PyDanmakuElem>()?;
     m.add_class::<python::PyComment>()?;
-    m.add_class::<python::PyOptionComment>()?;
     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_convert_timestamp, m)?)?;
     m.add_function(wrap_pyfunction!(python::py_ass_escape, m)?)?;
     m.add_function(wrap_pyfunction!(python::py_convert_color, m)?)?;
     m.add_function(wrap_pyfunction!(python::py_get_zoom_factor, m)?)?;
     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)?)?;
-    m.add_function(wrap_pyfunction!(python::py_mark_comment_row, m)?)?;
     m.add_function(wrap_pyfunction!(python::py_write_head, m)?)?;
-    m.add_function(wrap_pyfunction!(python::py_write_comment, m)?)?;
     m.add_function(wrap_pyfunction!(python::py_write_normal_comment, m)?)?;
     Ok(())
 }

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

@@ -93,45 +93,3 @@ impl PyComment {
         format!("Comment({:?})", self.inner)
     }
 }
-
-#[pyclass(name = "OptionComment", frozen)]
-pub struct PyOptionComment {
-    pub inner: Option<comment::Comment>,
-}
-
-impl PyOptionComment {
-    pub fn new(inner: Option<comment::Comment>) -> Self {
-        PyOptionComment { inner }
-    }
-}
-
-#[pymethods]
-impl PyOptionComment {
-    pub fn is_none(&self) -> bool {
-        self.inner.is_none()
-    }
-
-    pub fn is_some(&self) -> bool {
-        self.inner.is_some()
-    }
-
-    pub fn unwrap(&self) -> PyComment {
-        PyComment::new(self.inner.clone().unwrap())
-    }
-
-    #[staticmethod]
-    pub fn from_comment(comment: &PyComment) -> Self {
-        PyOptionComment {
-            inner: Some(comment.inner.clone()),
-        }
-    }
-
-    #[staticmethod]
-    pub fn none() -> Self {
-        PyOptionComment { inner: None }
-    }
-
-    fn __eq__(&self, other: &PyOptionComment) -> bool {
-        self.inner == other.inner
-    }
-}

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

@@ -3,11 +3,10 @@ mod proto;
 mod reader;
 mod writer;
 
-pub use comment::{PyComment, PyCommentPosition, PyOptionComment};
+pub use comment::{PyComment, PyCommentPosition};
 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_mark_comment_row, py_test_free_rows,
-    py_write_comment, py_write_head, py_write_normal_comment, PyRows,
+    py_get_zoom_factor, py_write_head, py_write_normal_comment, PyRows,
 };

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

@@ -3,8 +3,6 @@ use crate::writer::{self, rows};
 
 use pyo3::prelude::*;
 
-use super::PyOptionComment;
-
 #[pyfunction(name = "convert_timestamp")]
 pub fn py_convert_timestamp(timestamp: f64) -> PyResult<String> {
     Ok(writer::utils::convert_timestamp(timestamp))
@@ -62,63 +60,6 @@ impl PyRows {
         }
         PyRows { inner: rows }
     }
-
-    fn get(&self, row: usize, col: usize) -> PyOptionComment {
-        PyOptionComment::new(self.inner[row][col].clone())
-    }
-
-    fn set(&mut self, row: usize, col: usize, value: PyRef<PyOptionComment>) {
-        self.inner[row][col] = value.inner.clone();
-    }
-}
-
-#[allow(clippy::too_many_arguments)]
-#[pyfunction(name = "test_free_rows")]
-pub fn py_test_free_rows(
-    rows: &python::writer::PyRows,
-    comment: &crate::python::PyComment,
-    row: usize,
-    width: u32,
-    height: u32,
-    bottom_reserved: u32,
-    duration_marquee: f64,
-    duration_still: f64,
-) -> PyResult<usize> {
-    Ok(writer::rows::test_free_rows(
-        &rows.inner,
-        &comment.inner,
-        row,
-        width,
-        height,
-        bottom_reserved,
-        duration_marquee,
-        duration_still,
-    ))
-}
-
-#[pyfunction(name = "find_alternative_row")]
-pub fn py_find_alternative_row(
-    rows: &python::writer::PyRows,
-    comment: &crate::python::PyComment,
-    height: u32,
-    bottom_reserved: u32,
-) -> PyResult<usize> {
-    Ok(writer::rows::find_alternative_row(
-        &rows.inner,
-        &comment.inner,
-        height,
-        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(())
 }
 
 #[pyfunction(name = "write_head")]
@@ -135,32 +76,6 @@ pub fn py_write_head(
     ))
 }
 
-#[allow(clippy::too_many_arguments)]
-#[pyfunction(name = "write_comment")]
-pub fn py_write_comment(
-    comment: &crate::python::PyComment,
-    row: usize,
-    width: u32,
-    height: u32,
-    bottom_reserved: u32,
-    fontsize: f32,
-    duration_marquee: f64,
-    duration_still: f64,
-    styleid: &str,
-) -> PyResult<String> {
-    Ok(writer::ass::write_comment(
-        &comment.inner,
-        row,
-        width,
-        height,
-        bottom_reserved,
-        fontsize,
-        duration_marquee,
-        duration_still,
-        styleid,
-    ))
-}
-
 #[allow(clippy::too_many_arguments)]
 #[pyfunction(name = "write_normal_comment")]
 pub fn py_write_normal_comment(

packages/biliass/src/biliass/_core.pyi

@@ -55,15 +55,6 @@ class Comment:
     height: float
     width: float
 
-class OptionComment:
-    def is_none(self) -> bool: ...
-    def is_some(self) -> bool: ...
-    def unwrap(self) -> Comment: ...
-    @staticmethod
-    def from_comment(comment: Comment) -> OptionComment: ...
-    @staticmethod
-    def none() -> OptionComment: ...
-
 def read_comments_from_xml(text: str, fontsize: float) -> list[Comment]: ...
 def read_comments_from_protobuf(data: bytes, fontsize: float) -> list[Comment]: ...
 def convert_timestamp(timestamp: float) -> float: ...
@@ -73,36 +64,11 @@ def get_zoom_factor(source_size: tuple[int, int], target_size: tuple[int, int])
 def convert_flash_rotation(
     rot_y: float, rot_z: float, x: float, y: float, width: float, height: float
 ) -> tuple[float, float, float, float, float, float, float]: ...
-def test_free_rows(
-    rows: Rows,
-    comment: Comment,
-    row: int,
-    width: int,
-    height: int,
-    bottom_reserved: int,
-    duration_marquee: float,
-    duration_still: float,
-) -> int: ...
 
 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, value: OptionComment) -> None: ...
 
-def find_alternative_row(rows: Rows, comment: Comment, height: int, bottom_reserved: int) -> int: ...
-def mark_comment_row(rows: Rows, comment: Comment, row: int) -> None: ...
 def write_head(width: int, height: int, fontface: str, fontsize: float, alpha: float, styleid: str) -> str: ...
-def write_comment(
-    comment: Comment,
-    row: int,
-    width: int,
-    height: int,
-    bottom_reserved: int,
-    fontsize: float,
-    duration_marquee: float,
-    duration_still: float,
-    styleid: str,
-) -> str: ...
 def write_normal_comment(
     rows: Rows,
     comment: Comment,

packages/biliass/src/biliass/biliass.py

@@ -4,7 +4,6 @@
 
 import json
 import logging
-import math
 import random
 import re
 from typing import TYPE_CHECKING, TypeVar
@@ -20,7 +19,6 @@
     get_zoom_factor,
     read_comments_from_protobuf,
     read_comments_from_xml,
-    write_comment,
     write_head,
     write_normal_comment,
 )
@@ -147,30 +145,6 @@ def get_position(InputPos, isHeight):
     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)
 
-    def write_comment(
-        self,
-        comment: Comment,
-        row: int,
-        width: int,
-        height: int,
-        bottom_reserved: int,
-        fontsize: float,
-        duration_marquee: float,
-        duration_still: float,
-        styleid: str,
-    ):
-        self._text += write_comment(
-            comment,
-            row,
-            width,
-            height,
-            bottom_reserved,
-            fontsize,
-            duration_marquee,
-            duration_still,
-            styleid,
-        )
-
     def write_normal_comment(
         self,
         rows: Rows,