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

xml serialize: Support flatten and Option<T>

Browse Source
This commit is contained in:
Lennart
2024-12-27 15:34:22 +01:00
parent c787a6e8f3
commit 9242557741
7 changed files with 82 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
crates/xml/derive/src/field.rs
View File

@@ -252,19 +252,34 @@ impl Field {
let field_ident = self.field_ident();
let field_name = self.xml_name();
match self.attrs.xml_ty {
FieldType::Attr => None,
FieldType::Text => Some(quote! {
match (&self.attrs.xml_ty, self.attrs.flatten.is_present()) {
(FieldType::Attr, _) => None,
(FieldType::Text, true) => Some(quote! {
for item in self.#field_ident.iter() {
writer.write_event(Event::Text(BytesText::new(item)))?;
}
}),
(FieldType::Text, false) => Some(quote! {
writer.write_event(Event::Text(BytesText::new(&self.#field_ident)))?;
}),
FieldType::Tag => Some(quote! {
(FieldType::Tag, true) => Some(quote! {
for item in self.#field_ident.iter() {
::rustical_xml::XmlSerialize::serialize(item, None, Some(#field_name), writer)?;
}
}),
(FieldType::Tag, false) => Some(quote! {
::rustical_xml::XmlSerialize::serialize(&self.#field_ident, None, Some(#field_name), writer)?;
}),
FieldType::Untagged => Some(quote! {
(FieldType::Untagged, true) => Some(quote! {
for item in self.#field_ident.iter() {
::rustical_xml::XmlSerialize::serialize(item, None, None, writer)?;
}
}),
(FieldType::Untagged, false) => Some(quote! {
::rustical_xml::XmlSerialize::serialize(&self.#field_ident, None, None, writer)?;
}),
// TODO: Think about what to do here
FieldType::TagName | FieldType::Namespace => None,
(FieldType::TagName | FieldType::Namespace, _) => None,
}
}
}

4
crates/xml/derive/src/xml_enum.rs
View File

@@ -121,8 +121,8 @@ impl Enum {
Ok(())
}
fn attributes<'a>(&self) -> Vec<::quick_xml::events::attributes::Attribute<'a>> {
vec![]
fn attributes<'a>(&self) -> Option<Vec<::quick_xml::events::attributes::Attribute<'a>>> {
None
}
}
}

16
crates/xml/derive/src/xml_struct.rs
View File

@@ -187,7 +187,11 @@ impl NamedStruct {
.filter(|field| field.attrs.xml_ty == FieldType::Untagged)
.map(|field| {
let field_ident = field.field_ident();
quote! { bytes_start.extend_attributes(self.#field_ident.attributes()); }
quote! {
if let Some(attrs) = self.#field_ident.attributes() {
bytes_start.extend_attributes(attrs);
}
}
});
let attributes = self
@@ -219,8 +223,10 @@ impl NamedStruct {
if let Some(tag) = &tag_str {
let mut bytes_start = BytesStart::new(tag.to_owned());
bytes_start.extend_attributes(self.attributes());
#(#untagged_attributes);*
if let Some(attrs) = self.attributes() {
bytes_start.extend_attributes(attrs);
}
// #(#untagged_attributes);*
writer.write_event(Event::Start(bytes_start))?;
}
#(#tag_writers);*
@@ -230,8 +236,8 @@ impl NamedStruct {
Ok(())
}
fn attributes<'a>(&self) -> Vec<::quick_xml::events::attributes::Attribute<'a>> {
vec![ #(#attributes),* ]
fn attributes<'a>(&self) -> Option<Vec<::quick_xml::events::attributes::Attribute<'a>>> {
Some(vec![ #(#attributes),* ])
}
}
}