⚰️ chore(biliass): reorganize apis (#342)

Author: SigureMo

packages/biliass/rust/src/lib.rs

@@ -20,14 +20,7 @@ impl std::convert::From<BiliassError> for PyErr {
 #[pymodule]
 #[pyo3(name = "_core")]
 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::PyCommentPosition>()?;
     m.add_function(wrap_pyfunction!(python::py_get_danmaku_meta_size, m)?)?;
-    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_xml_to_ass, m)?)?;
     m.add_function(wrap_pyfunction!(python::py_protobuf_to_ass, m)?)?;
     Ok(())

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

@@ -1,11 +1,5 @@
-mod comment;
 mod convert;
 mod proto;
-mod reader;
 
-pub use comment::{PyComment, PyCommentPosition};
 pub use convert::{py_protobuf_to_ass, py_xml_to_ass};
-pub use proto::{py_get_danmaku_meta_size, PyDanmakuElem, PyDmSegMobileReply};
-pub use reader::{
-    py_parse_special_comment, py_read_comments_from_protobuf, py_read_comments_from_xml,
-};
+pub use proto::py_get_danmaku_meta_size;

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

@@ -5,6 +5,4 @@
 from .biliass import (
     Danmaku2ASS as Danmaku2ASS,
     convert_to_ass as convert_to_ass,
-    read_comments_bilibili_protobuf as read_comments_bilibili_protobuf,
-    read_comments_bilibili_xml as read_comments_bilibili_xml,
 )

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

@@ -1,65 +1,3 @@
-from typing import ClassVar
-
-class DanmakuElem:
-    @property
-    def id(self) -> int: ...
-    @property
-    def progress(self) -> int: ...
-    @property
-    def mode(self) -> int: ...
-    @property
-    def fontsize(self) -> int: ...
-    @property
-    def color(self) -> int: ...
-    @property
-    def mid_hash(self) -> str: ...
-    @property
-    def content(self) -> str: ...
-    @property
-    def ctime(self) -> int: ...
-    @property
-    def action(self) -> str: ...
-    @property
-    def pool(self) -> int: ...
-    @property
-    def id_str(self) -> str: ...
-    @property
-    def attr(self) -> int: ...
-    @property
-    def animation(self) -> str: ...
-
-class DmSegMobileReply:
-    @property
-    def elems(self) -> list[DanmakuElem]: ...
-    @staticmethod
-    def decode(data: bytes) -> DmSegMobileReply: ...
-
-class CommentPosition:
-    Scroll: ClassVar[CommentPosition]
-    Top: ClassVar[CommentPosition]
-    Bottom: ClassVar[CommentPosition]
-    Reversed: ClassVar[CommentPosition]
-    Special: ClassVar[CommentPosition]
-
-    @property
-    def id(self) -> int: ...
-
-class Comment:
-    timeline: float
-    timestamp: int
-    no: int
-    comment: str
-    pos: CommentPosition
-    color: int
-    size: float
-    height: float
-    width: float
-
-def read_comments_from_xml(text: str, fontsize: float) -> list[Comment]: ...
-def read_comments_from_protobuf(data: bytes, fontsize: float) -> list[Comment]: ...
-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 xml_to_ass(
     inputs: list[str],
     stage_width: int,

packages/biliass/src/biliass/__init__.py

@@ -1,28 +1,16 @@
 from __future__ import annotations
 
-from collections.abc import Callable
-from typing import TypeVar, cast
+from typing import TYPE_CHECKING, TypeVar, cast
 
 from biliass._core import (
-    Comment,
     protobuf_to_ass,
-    read_comments_from_protobuf,
-    read_comments_from_xml,
     xml_to_ass,
 )
 
-T = TypeVar("T")
-
-
-def read_comments_bilibili_xml(text: str | bytes, fontsize: float) -> list[Comment]:
-    if isinstance(text, bytes):
-        text = text.decode()
-    return read_comments_from_xml(text, fontsize)
+if TYPE_CHECKING:
+    from collections.abc import Callable
 
-
-def read_comments_bilibili_protobuf(protobuf: bytes | str, fontsize: float) -> list[Comment]:
-    assert isinstance(protobuf, bytes), "protobuf supports bytes only"
-    return read_comments_from_protobuf(protobuf, fontsize)
+T = TypeVar("T")
 
 
 def Danmaku2ASS(

packages/biliass/src/biliass/_core.pyi

@@ -4,7 +4,7 @@
 
 import httpx
 import pytest
-from biliass import read_comments_bilibili_protobuf
+from biliass import convert_to_ass
 
 from ..conftest import DEFAULT_HEADERS, TEST_DIR
 
@@ -28,4 +28,4 @@ def gen_protobuf(base_dir: Path):
 def test_protobuf():
     gen_protobuf(TEST_DIR)
     with TEST_DIR.joinpath("test.pb").open("rb") as f:
-        list(read_comments_bilibili_protobuf(f.read(), 10))
+        convert_to_ass(f.read(), 1920, 1080, input_format="protobuf")

packages/biliass/src/biliass/biliass.py

@@ -4,7 +4,7 @@
 
 import httpx
 import pytest
-from biliass import read_comments_bilibili_xml
+from biliass import convert_to_ass
 
 from ..conftest import DEFAULT_HEADERS, TEST_DIR
 
@@ -30,11 +30,11 @@ def gen_xml_v1(base_dir: Path):
 def test_xml_v1_text():
     gen_xml_v1(TEST_DIR)
     with TEST_DIR.joinpath("test_v1.xml").open("r") as f:
-        list(read_comments_bilibili_xml(f.read(), 10))
+        convert_to_ass(f.read(), 1920, 1080)
 
 
 @pytest.mark.biliass
 def test_xml_v1_bytes():
     gen_xml_v1(TEST_DIR)
     with TEST_DIR.joinpath("test_v1.xml").open("rb") as f:
-        list(read_comments_bilibili_xml(f.read(), 10))
+        convert_to_ass(f.read(), 1920, 1080)