nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 10:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustical_xml: Use darling for proc-macro parsing

Browse Source
This commit is contained in:
Lennart
2024-11-27 17:47:55 +01:00
parent a9ef680c30
commit 57268f202d
11 changed files with 227 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/xml/tests/de_enum.rs
View File

@@ -4,6 +4,7 @@ use xml_derive::XmlDeserialize;
#[test]
fn test_struct_untagged_enum() {
#[derive(Debug, XmlDeserialize, PartialEq)]
#[xml(root = b"propfind")]
struct Propfind {
prop: Prop,
}
@@ -20,12 +21,6 @@ fn test_struct_untagged_enum() {
B,
}
impl XmlRoot for Propfind {
fn root_tag() -> &'static [u8] {
b"propfind"
}
}
let doc = Propfind::parse_str(
r#"
<propfind>

20
crates/xml/tests/de_struct.rs
View File

@@ -62,8 +62,9 @@ fn test_struct_document() {
#[test]
fn test_struct_rename_field() {
#[derive(Debug, XmlDeserialize, PartialEq)]
#[xml(root = b"document")]
struct Document {
#[xml(rename = "ok-wow")]
#[xml(rename = b"ok-wow")]
child: Child,
}
@@ -73,12 +74,6 @@ fn test_struct_rename_field() {
text: String,
}
impl XmlRoot for Document {
fn root_tag() -> &'static [u8] {
b"document"
}
}
let doc = Document::parse_str(r#"<document><ok-wow>Hello!</ok-wow></document>"#).unwrap();
assert_eq!(
doc,
@@ -93,17 +88,12 @@ fn test_struct_rename_field() {
#[test]
fn test_struct_optional_field() {
#[derive(Debug, XmlDeserialize, PartialEq)]
#[xml(root = b"document")]
struct Document {
#[xml(default = "Default::default")]
child: Option<Child>,
}
impl XmlRoot for Document {
fn root_tag() -> &'static [u8] {
b"document"
}
}
#[derive(Debug, XmlDeserialize, PartialEq, Default)]
struct Child;
@@ -119,7 +109,7 @@ fn test_struct_vec() {
#[derive(Debug, XmlDeserialize, PartialEq)]
#[xml(root = b"document")]
struct Document {
#[xml(rename = "child", flatten)]
#[xml(rename = b"child", flatten)]
children: Vec<Child>,
}
@@ -147,7 +137,7 @@ fn test_struct_set() {
#[derive(Debug, XmlDeserialize, PartialEq)]
#[xml(root = b"document")]
struct Document {
#[xml(rename = "child", flatten)]
#[xml(rename = b"child", flatten)]
children: HashSet<Child>,
}

123
crates/xml/tests/propfind.rs
View File

@@ -1,123 +0,0 @@
use quick_xml::events::{BytesStart, Event};
use rustical_xml::{Unit, XmlDeserialize, XmlError, XmlRoot};
#[derive(Debug, XmlDeserialize)]
#[xml(rename_all = "kebab-case")]
pub enum Prop {
#[xml(rename = "displayname")]
Displayname(String),
#[xml(ns = "DAV:Push", rename = "transports")]
Transports,
}
#[derive(Debug)]
pub struct PropfindElement<T: XmlDeserialize> {
// child with name propfind and namespace DAV:
pub prop: Vec<T>,
pub test: Option<Prop>,
}
impl<T: XmlDeserialize> XmlDeserialize for PropfindElement<T> {
fn deserialize<R: std::io::BufRead>(
reader: &mut quick_xml::NsReader<R>,
start: &BytesStart,
empty: bool,
) -> Result<Self, XmlError> {
// init values for the struct attributes
let mut attr_prop: Option<Vec<T>> = None;
let mut attr_test: Option<Prop> = None;
if !empty {
let mut buf = Vec::new();
loop {
match reader.read_event_into(&mut buf)? {
Event::End(e) if e.name() == start.name() => {
break;
}
Event::Eof => return Err(XmlError::Eof),
Event::Start(start) => {
let (_ns, name) = reader.resolve_element(start.name());
match name.as_ref() {
b"prop" => {
if attr_prop.is_none() {
attr_prop = Some(Vec::<T>::deserialize(reader, &start, false)?);
}
}
b"test" => {
if attr_test.is_none() {
attr_test = Some(Prop::deserialize(reader, &start, false)?);
}
}
_ => {
return Err(XmlError::InvalidTag(
String::from_utf8_lossy(name.as_ref()).to_string(),
"prop".to_string(),
));
}
}
}
Event::Empty(start) => {
let (_ns, name) = reader.resolve_element(start.name());
match name.as_ref() {
b"prop" => {
if attr_prop.is_none() {
attr_prop = Some(Vec::<T>::deserialize(reader, &start, true)?);
}
}
b"test" => {
if attr_test.is_none() {
attr_test = Some(Prop::deserialize(reader, &start, true)?);
}
}
_ => {
return Err(XmlError::InvalidTag(
String::from_utf8_lossy(name.as_ref()).to_string(),
"prop".to_string(),
));
}
}
}
a => {
dbg!(a);
}
};
}
}
let attr_prop = attr_prop.ok_or(XmlError::MissingField("prop"))?;
Ok(Self {
prop: attr_prop,
test: None,
})
}
}
impl<T: XmlDeserialize> XmlRoot for PropfindElement<T> {
fn root_tag() -> &'static [u8] {
b"propfind"
}
}
#[test]
fn test_propfind() {
let propfind: PropfindElement<Prop> = PropfindElement::parse_str(
r#"
<propfind xmlns="DAV:" xmlns:P="DAV:Push">
<P:prop>
<displayname>Hello!</displayname>
<transports xmlns="DAV:Push" />
<transports xmlns="DAV:Push"></transports>
</P:prop>
<test>
<displayname>Okay wow!</displayname>
</test>
</propfind>
"#,
)
.unwrap();
dbg!(propfind);
}
fn asd() {
let a: Option<String> = None;
}