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

xml: Work on struct serialization

Browse Source
This commit is contained in:
Lennart
2024-12-27 12:40:11 +01:00
parent 5ffc5037db
commit f77333e55d
7 changed files with 102 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,11 +258,10 @@ impl Field {
writer.write_event(Event::Text(BytesText::new(&self.#field_ident)))?;
}),
FieldType::Tag => Some(quote! {
self.#field_ident.serialize(Some(#field_name), writer)?;
self.#field_ident.serialize(None, Some(#field_name), writer)?;
}),
FieldType::Untagged => Some(quote! {
// TODO: untag!
self.#field_ident.serialize(None, writer)?;
self.#field_ident.serialize(None, None, writer)?;
}),
// TODO: Think about what to do here
FieldType::TagName | FieldType::Namespace => None,

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

@@ -1,5 +1,5 @@
use crate::attrs::StructAttrs;
use crate::Field;
use crate::attrs::{FieldType, StructAttrs};
use crate::{field, Field};
use core::panic;
use darling::FromDeriveInput;
use quote::quote;
@@ -181,11 +181,34 @@ impl NamedStruct {
let ident = &self.ident;
let tag_writers = self.fields.iter().map(Field::tag_writer);
// TODO: Implement attributes
let untagged_attributes = self
.fields
.iter()
.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()); }
});
let attributes = self
.fields
.iter()
.filter(|field| field.attrs.xml_ty == FieldType::Attr)
.map(|field| {
let field_name = field.xml_name();
quote! {
::quick_xml::events::attributes::Attribute {
key: ::quick_xml::name::QName(#field_name),
value: b"hello".into()
}
}
});
quote! {
impl #impl_generics ::rustical_xml::XmlSerialize for #ident #type_generics #where_clause {
fn serialize<W: ::std::io::Write>(
&self,
ns: Option<&[u8]>,
tag: Option<&[u8]>,
writer: &mut ::quick_xml::Writer<W>
) -> ::std::io::Result<()> {
@@ -194,7 +217,10 @@ impl NamedStruct {
let tag_str = tag.map(String::from_utf8_lossy);
if let Some(tag) = &tag_str {
writer.write_event(Event::Start(BytesStart::new(tag.to_owned())))?;
let mut bytes_start = BytesStart::new(tag.to_owned());
bytes_start.extend_attributes(self.attributes());
#(#untagged_attributes);*
writer.write_event(Event::Start(bytes_start))?;
}
#(#tag_writers);*
if let Some(tag) = &tag_str {
@@ -202,6 +228,10 @@ impl NamedStruct {
}
Ok(())
}
fn attributes<'a>(&self) -> Vec<::quick_xml::events::attributes::Attribute<'a>> {
vec![ #(#attributes),* ]
}
}
}
}