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: namespace serialization

Browse Source
This commit is contained in:
Lennart
2024-12-31 18:20:02 +01:00
parent 61e2dab37f
commit 098e374e4d
20 changed files with 215 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,8 +148,8 @@ impl Field {
}
let namespace_match = if self.ns_strict() {
if let Some(ns) = &self.attrs.common.ns {
quote! {quick_xml::name::ResolveResult::Bound(quick_xml::name::Namespace(#ns))}
if self.attrs.common.ns.is_some() {
quote! {quick_xml::name::ResolveResult::Bound(ns)}
} else {
quote! {quick_xml::name::ResolveResult::Unbound}
}
@@ -157,6 +157,16 @@ impl Field {
quote! {_}
};
let namespace_condition = if self.ns_strict() {
self.attrs
.common
.ns
.as_ref()
.map(|ns| quote! { if ns == #ns })
} else {
None
};
let field_name = self.xml_name();
let field_ident = self.field_ident();
let deserializer = self.deserializer_type();
@@ -170,7 +180,7 @@ impl Field {
};
Some(quote! {
(#namespace_match, #field_name) => { #assignment; }
(#namespace_match, #field_name) #namespace_condition => { #assignment; }
})
}
@@ -256,6 +266,10 @@ impl Field {
} else {
quote! { ::rustical_xml::XmlSerialize::serialize }
};
let ns = match &self.attrs.common.ns {
Some(ns) => quote! { Some(#ns) },
None => quote! { None },
};
match (&self.attrs.xml_ty, self.attrs.flatten.is_present()) {
(FieldType::Attr, _) => None,
@@ -269,19 +283,19 @@ impl Field {
}),
(FieldType::Tag, true) => Some(quote! {
for item in self.#field_ident.iter() {
#serializer(item, None, Some(#field_name), writer)?;
#serializer(item, #ns, Some(#field_name), namespaces, writer)?;
}
}),
(FieldType::Tag, false) => Some(quote! {
#serializer(&self.#field_ident, None, Some(#field_name), writer)?;
#serializer(&self.#field_ident, #ns, Some(#field_name), namespaces, writer)?;
}),
(FieldType::Untagged, true) => Some(quote! {
for item in self.#field_ident.iter() {
#serializer(item, None, None, writer)?;
#serializer(item, None, None, namespaces, writer)?;
}
}),
(FieldType::Untagged, false) => Some(quote! {
#serializer(&self.#field_ident, None, None, writer)?;
#serializer(&self.#field_ident, None, None, namespaces, writer)?;
}),
// TODO: Think about what to do here
(FieldType::TagName | FieldType::Namespace, _) => None,