♻️ refactor: use rust binding comment struct

Author: SigureMo

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

@@ -11,7 +11,21 @@ pub enum PyCommentPosition {
     Special,
 }
 
-#[pyclass(name = "Comment")]
+#[pymethods]
+impl PyCommentPosition {
+    #[getter]
+    fn id(&self) -> PyResult<u8> {
+        Ok(match self {
+            PyCommentPosition::Scroll => 0,
+            PyCommentPosition::Bottom => 1,
+            PyCommentPosition::Top => 2,
+            PyCommentPosition::Reversed => 3,
+            PyCommentPosition::Special => 4,
+        })
+    }
+}
+
+#[pyclass(name = "Comment", frozen)]
 pub struct PyComment {
     inner: comment::Comment,
 }
@@ -25,57 +39,57 @@ impl PyComment {
 #[pymethods]
 impl PyComment {
     #[getter]
-    fn timeline(&self) -> PyResult<f64> {
-        Ok(self.inner.timeline)
+    fn timeline(&self) -> f64 {
+        self.inner.timeline
     }
 
     #[getter]
-    fn timestamp(&self) -> PyResult<u64> {
-        Ok(self.inner.timestamp)
+    fn timestamp(&self) -> u64 {
+        self.inner.timestamp
     }
 
     #[getter]
-    fn no(&self) -> PyResult<u64> {
-        Ok(self.inner.no)
+    fn no(&self) -> u64 {
+        self.inner.no
     }
 
     #[getter]
-    fn comment(&self) -> PyResult<String> {
-        Ok(self.inner.comment.clone())
+    fn comment(&self) -> &str {
+        &self.inner.comment
     }
 
     #[getter]
-    fn pos(&self) -> PyResult<PyCommentPosition> {
-        Ok(match self.inner.pos {
+    fn pos(&self) -> PyCommentPosition {
+        match self.inner.pos {
             comment::CommentPosition::Scroll => PyCommentPosition::Scroll,
             comment::CommentPosition::Bottom => PyCommentPosition::Bottom,
             comment::CommentPosition::Top => PyCommentPosition::Top,
             comment::CommentPosition::Reversed => PyCommentPosition::Reversed,
             comment::CommentPosition::Special => PyCommentPosition::Special,
-        })
+        }
     }
 
     #[getter]
-    fn color(&self) -> PyResult<u32> {
-        Ok(self.inner.color)
+    fn color(&self) -> u32 {
+        self.inner.color
     }
 
     #[getter]
-    fn size(&self) -> PyResult<f32> {
-        Ok(self.inner.size)
+    fn size(&self) -> f32 {
+        self.inner.size
     }
 
     #[getter]
-    fn height(&self) -> PyResult<f32> {
-        Ok(self.inner.height)
+    fn height(&self) -> f32 {
+        self.inner.height
     }
 
     #[getter]
-    fn width(&self) -> PyResult<f32> {
-        Ok(self.inner.width)
+    fn width(&self) -> f32 {
+        self.inner.width
     }
 
-    fn __repr__(&self) -> PyResult<String> {
-        Ok(format!("Comment({:?})", self.inner))
+    fn __repr__(&self) -> String {
+        format!("Comment({:?})", self.inner)
     }
 }

packages/biliass/src/biliass/_core.pyi

@@ -39,9 +39,11 @@ class CommentPosition:
     Top: ClassVar[CommentPosition]
     Bottom: ClassVar[CommentPosition]
     Reversed: ClassVar[CommentPosition]
-    Normal: ClassVar[CommentPosition]
     Special: ClassVar[CommentPosition]
 
+    @property
+    def id(self) -> int: ...
+
 class Comment:
     timeline: float
     timestamp: int