xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup a1ae45add8 a bit.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2019-09-06 16:03:58 +02:00
commit ff77f6141f
18 changed files with 97 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/jingle_ft.rs
View file

@ -193,65 +193,27 @@ impl TryFrom<Element> for File {
impl From<File> for Element {
fn from(file: File) -> Element {
let mut root = Element::builder("file").ns(ns::JINGLE_FT);
if let Some(date) = file.date {
root = root.append(
Node::Element(
Element::builder("date")
.ns(ns::JINGLE_FT)
.append(date)
.build()
)
);
}
if let Some(media_type) = file.media_type {
root = root.append(
Node::Element(
Element::builder("media-type")
.ns(ns::JINGLE_FT)
.append(media_type)
.build()
)
);
}
if let Some(name) = file.name {
root = root.append(
Node::Element(
Element::builder("name")
.ns(ns::JINGLE_FT)
.append(name)
.build()
)
);
}
for (lang, desc) in file.descs.into_iter() {
root = root.append(
Node::Element(
Element::builder("desc")
.ns(ns::JINGLE_FT)
.attr("xml:lang", lang)
.append(desc.0)
.build()
)
);
}
if let Some(size) = file.size {
root = root.append(
Node::Element(
Element::builder("size")
.ns(ns::JINGLE_FT)
.append(format!("{}", size))
.build()
)
);
}
if let Some(range) = file.range {
root = root.append(range);
}
for hash in file.hashes {
root = root.append(hash);
}
root.build()
Element::builder("file")
.ns(ns::JINGLE_FT)
.append_all(file.date.map(|date|
Element::builder("date")
.append(date)))
.append_all(file.media_type.map(|media_type|
Element::builder("media-type")
.append(media_type)))
.append_all(file.name.map(|name|
Element::builder("name")
.append(name)))
.append_all(file.descs.into_iter().map(|(lang, desc)|
Element::builder("desc")
.attr("xml:lang", lang)
.append(desc.0)))
.append_all(file.size.map(|size|
Element::builder("size")
.append(format!("{}", size))))
.append_all(file.range)
.append_all(file.hashes)
.build()
}
}