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

xml: Add janky implementation for namespaces without prefix

Browse Source
This commit is contained in:
Lennart
2025-01-01 14:44:02 +01:00
parent 11fa0f24c7
commit 72688f1761
5 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,7 +248,12 @@ impl NamedStruct {
.ns_prefix
.iter()
.map(|(ns, prefix)| {
let attr_name = [b"xmlns:".as_ref(), &prefix.value()].concat();
let sep = if !prefix.value().is_empty() {
b":".to_vec()
} else {
b"".to_vec()
};
let attr_name = [b"xmlns".as_ref(), &sep, &prefix.value()].concat();
let a = syn::LitByteStr::new(&attr_name, prefix.span());
quote! {
bytes_start.push_attribute((#a.as_ref(), #ns.as_ref()));
@@ -275,7 +280,13 @@ impl NamedStruct {
let prefix = ns
.map(|ns| namespaces.get(&ns))
.unwrap_or(None)
.map(|prefix| [*prefix, b":"].concat());
.map(|prefix| {
if !prefix.is_empty() {
[*prefix, b":"].concat()
} else {
Vec::new()
}
});
let has_prefix = prefix.is_some();
let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
let qname = tagname.as_ref().map(|tagname| ::quick_xml::name::QName(tagname));

8
crates/xml/src/lib.rs
View File

@@ -47,7 +47,13 @@ impl XmlSerialize for () {
let prefix = ns
.map(|ns| namespaces.get(&ns))
.unwrap_or(None)
.map(|prefix| [*prefix, b":"].concat());
.map(|prefix| {
if !prefix.is_empty() {
[*prefix, b":"].concat()
} else {
Vec::new()
}
});
let has_prefix = prefix.is_some();
let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
let qname = tagname.as_ref().map(|tagname| QName(tagname));

8
crates/xml/src/value.rs
View File

@@ -103,7 +103,13 @@ impl<T: Value> XmlSerialize for T {
let prefix = ns
.map(|ns| namespaces.get(&ns))
.unwrap_or(None)
.map(|prefix| [*prefix, b":"].concat());
.map(|prefix| {
if !prefix.is_empty() {
[*prefix, b":"].concat()
} else {
Vec::new()
}
});
let has_prefix = prefix.is_some();
let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
let qname = tagname.as_ref().map(|tagname| QName(tagname));