👽️ deps: bump quick-xml to 0.38.0 and unescape manually

Author: SigureMo

packages/biliass/rust/Cargo.lock

@@ -13,7 +13,7 @@ pyo3 = { version = "0.25.0", features = ["abi3-py310"] }
 bytes = "1.10.0"
 prost = "0.14.0"
 thiserror = "2.0.11"
-quick-xml = "0.37.2"
+quick-xml = "0.38.0"
 cached = "0.55.0"
 serde = "1.0.218"
 serde_json = "1.0.139"

packages/biliass/rust/Cargo.toml

@@ -30,15 +30,43 @@ fn parse_raw_p(reader: &mut Reader<&[u8]>, element: &BytesStart) -> Result<Strin
 }
 
 fn parse_comment_content(reader: &mut Reader<&[u8]>) -> Result<String, ParseError> {
-    let mut content = None;
+    let mut contents = Vec::new();
     let mut buf = Vec::new();
 
-    if let Ok(Event::Text(e)) = reader.read_event_into(&mut buf) {
-        content = Some(e.unescape().unwrap().into_owned());
+    loop {
+        match reader.read_event_into(&mut buf) {
+            Ok(Event::Text(e)) => {
+                contents.push(Some(e.decode().unwrap().into_owned()));
+            }
+            Ok(Event::GeneralRef(e)) => {
+                let entity_str = std::str::from_utf8(e.as_ref())
+                    .map_err(|e| ParseError::Xml(format!("Error decoding entity: {e}")))?;
+                let resolved_entity = quick_xml::escape::resolve_predefined_entity(entity_str)
+                    .ok_or_else(|| {
+                        ParseError::Xml(format!("Error resolving entity: {entity_str}"))
+                    })?;
+                contents.push(Some(resolved_entity.to_string()));
+            }
+            Ok(Event::End(_) | Event::Eof) => {
+                break;
+            }
+            Ok(_) => {
+                // Ignore other events
+                continue;
+            }
+            Err(e) => {
+                return Err(ParseError::Xml(format!(
+                    "Error reading comment content: {e}"
+                )));
+            }
+        }
     }
     buf.clear();
 
-    content.ok_or(ParseError::Xml("No content found in comment".to_string()))
+    if contents.is_empty() {
+        return Err(ParseError::Xml("No content found in comment".to_string()));
+    }
+    Ok(contents.into_iter().flatten().collect::<String>())
 }
 
 fn parse_comment_item(
@@ -201,7 +229,7 @@ where
                             "No version specified".to_string(),
                         )));
                     }
-                    if let Ok(comment_option) = parse_comment(
+                    match parse_comment(
                         &mut reader,
                         e,
                         version.clone().unwrap(),
@@ -210,11 +238,18 @@ where
                         count,
                         block_options,
                     ) {
-                        if let Some(comment) = comment_option {
-                            comments.push(comment);
+                        Ok(comment_option) => {
+                            if let Some(comment) = comment_option {
+                                comments.push(comment);
+                            }
+                        }
+                        Err(e) => {
+                            eprintln!(
+                                "Error parsing comment at {:?}, {}",
+                                reader.buffer_position(),
+                                e
+                            );
                         }
-                    } else {
-                        eprintln!("Error parsing comment at {:?}", reader.buffer_position());
                     }
                     count += 1;
                 }