♻️ refactor: rustify writer utility convert_color

Author: SigureMo

packages/biliass/rust/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
-name = "docstring_parser"
+name = "biliass_core"
 crate-type = ["cdylib"]
 
 [dependencies]

packages/biliass/rust/src/lib.rs

@@ -27,5 +27,6 @@ fn biliass_pyo3(m: &Bound<'_, PyModule>) -> PyResult<()> {
     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)?)?;
     Ok(())
 }

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

@@ -6,4 +6,4 @@ mod writer;
 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_timestamp};
+pub use writer::{py_ass_escape, py_convert_color, py_convert_timestamp};

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

@@ -11,3 +11,9 @@ pub fn py_convert_timestamp(timestamp: f64) -> PyResult<String> {
 pub fn py_ass_escape(text: &str) -> PyResult<String> {
     Ok(writer::utils::ass_escape(text))
 }
+
+#[pyfunction(name = "convert_color")]
+#[pyo3(signature = (rgb, width = 1280, height = 576))]
+pub fn py_convert_color(rgb: u32, width: u32, height: u32) -> PyResult<String> {
+    Ok(writer::utils::convert_color(rgb, Some(width), Some(height)))
+}

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

@@ -39,3 +39,47 @@ pub fn ass_escape(text: &str) -> String {
         .collect::<Vec<_>>()
         .join("\\N")
 }
+
+pub fn convert_color(rgb: u32, width: Option<u32>, height: Option<u32>) -> String {
+    let width = width.unwrap_or(1280);
+    let height = height.unwrap_or(576);
+    if rgb == 0x000000 {
+        return "000000".to_owned();
+    } else if rgb == 0xFFFFFF {
+        return "FFFFFF".to_owned();
+    }
+    let r = (rgb >> 16) & 0xFF;
+    let g = (rgb >> 8) & 0xFF;
+    let b = rgb & 0xFF;
+    if width < 1280 && height < 576 {
+        format!("{:02X}{:02X}{:02X}", b, g, r)
+    } else {
+        let clip_byte = |x: f64| -> u8 {
+            if x > 255.0 {
+                255
+            } else if x < 0.0 {
+                0
+            } else {
+                x.round() as u8
+            }
+        };
+        format!(
+            "{:02X}{:02X}{:02X}",
+            clip_byte(
+                r as f64 * 0.009_563_840_880_806_56
+                    + g as f64 * 0.032_172_545_402_037_29
+                    + b as f64 * 0.958_263_613_717_156_1
+            ),
+            clip_byte(
+                r as f64 * -0.104_939_331_420_753_9
+                    + g as f64 * 1.172_314_781_918_551_5
+                    + b as f64 * -0.067_375_450_497_797_57
+            ),
+            clip_byte(
+                r as f64 * 0.913_489_123_739_876_5
+                    + g as f64 * 0.078_585_363_725_325_1
+                    + b as f64 * 0.007_925_512_534_798_42
+            ),
+        )
+    }
+}

packages/biliass/src/biliass/_core.pyi

@@ -59,3 +59,4 @@ 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: ...
 def ass_escape(text: str) -> str: ...
+def convert_color(rgb: int, width: int = ..., height: int = ...): ...

packages/biliass/src/biliass/biliass.py

@@ -13,6 +13,7 @@
     Comment,
     CommentPosition,
     ass_escape,
+    convert_color,
     convert_timestamp,
     read_comments_from_protobuf,
     read_comments_from_xml,
@@ -467,45 +468,6 @@ def mark_comment_row(rows: list[Comment | None], comment: Comment, row: int):
         pass
 
 
-def ass_escape_py(s):
-    def replace_leading_space(s):
-        sstrip = s.strip(" ")
-        slen = len(s)
-        if slen == len(sstrip):
-            return s
-        else:
-            llen = slen - len(s.lstrip(" "))
-            rlen = slen - len(s.rstrip(" "))
-            return "".join(("\u2007" * llen, sstrip, "\u2007" * rlen))
-
-    return "\\N".join(
-        replace_leading_space(i) or " "
-        for i in str(s).replace("\\", "\\\\").replace("{", "\\{").replace("}", "\\}").split("\n")
-    )
-
-
-def convert_color(RGB, width=1280, height=576):
-    if RGB == 0x000000:
-        return "000000"
-    elif RGB == 0xFFFFFF:
-        return "FFFFFF"
-    R = (RGB >> 16) & 0xFF
-    G = (RGB >> 8) & 0xFF
-    B = RGB & 0xFF
-    if width < 1280 and height < 576:
-        return f"{B:02X}{G:02X}{R:02X}"
-    else:  # VobSub always uses BT.601 colorspace, convert to BT.709
-
-        def clip_byte(x):
-            return 255 if x > 255 else 0 if x < 0 else round(x)
-
-        return "{:02X}{:02X}{:02X}".format(  # noqa: UP032
-            clip_byte(R * 0.00956384088080656 + G * 0.03217254540203729 + B * 0.95826361371715607),
-            clip_byte(R * -0.10493933142075390 + G * 1.17231478191855154 + B * -0.06737545049779757),
-            clip_byte(R * 0.91348912373987645 + G * 0.07858536372532510 + B * 0.00792551253479842),
-        )
-
-
 def convert_type2(row, height, bottom_reserved):
     return height - bottom_reserved - row