pep/xmpp-rs-mirror
1
0
Fork 0
mirror of https://gitlab.com/xmpp-rs/xmpp-rs.git synced 2024-07-12 22:21:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

jingle_ft: Switch to Into/TryFrom.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-06 20:30:52 +01:00
parent 4f11a067d8
commit a3a90e4eda
1 changed files with 140 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/jingle_ft.rs
View file

@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
use std::convert::TryFrom;
use hashes; use hashes;
use hashes::{Hash, parse_hash}; use hashes::{Hash, parse_hash};
@ -85,11 +87,14 @@ impl IntoElements for Received {
} }
} }
pub fn parse_jingle_ft(root: &Element) -> Result<Description, Error> { impl<'a> TryFrom<&'a Element> for Description {
if !root.is("description", ns::JINGLE_FT) { type Error = Error;
fn try_from(elem: &'a Element) -> Result<Description, Error> {
if !elem.is("description", ns::JINGLE_FT) {
return Err(Error::ParseError("This is not a JingleFT description element.")); return Err(Error::ParseError("This is not a JingleFT description element."));
} }
if root.children().collect::<Vec<_>>().len() != 1 { if elem.children().collect::<Vec<_>>().len() != 1 {
return Err(Error::ParseError("JingleFT description element must have exactly one child.")); return Err(Error::ParseError("JingleFT description element must have exactly one child."));
} }
@ -100,7 +105,7 @@ pub fn parse_jingle_ft(root: &Element) -> Result<Description, Error> {
let mut size = None; let mut size = None;
let mut range = None; let mut range = None;
let mut hashes = vec!(); let mut hashes = vec!();
for description_payload in root.children() { for description_payload in elem.children() {
if !description_payload.is("file", ns::JINGLE_FT) { if !description_payload.is("file", ns::JINGLE_FT) {
return Err(Error::ParseError("Unknown element in JingleFT description.")); return Err(Error::ParseError("Unknown element in JingleFT description."));
} }
@ -170,65 +175,70 @@ pub fn parse_jingle_ft(root: &Element) -> Result<Description, Error> {
hashes: hashes, hashes: hashes,
}, },
}) })
}
} }
pub fn serialise_file(file: &File) -> Element { impl<'a> Into<Element> for &'a File {
fn into(self) -> Element {
let mut root = Element::builder("file") let mut root = Element::builder("file")
.ns(ns::JINGLE_FT) .ns(ns::JINGLE_FT)
.build(); .build();
if let Some(ref date) = file.date { if let Some(ref date) = self.date {
root.append_child(Element::builder("date") root.append_child(Element::builder("date")
.ns(ns::JINGLE_FT) .ns(ns::JINGLE_FT)
.append(date.clone()) .append(date.clone())
.build()); .build());
} }
if let Some(ref media_type) = file.media_type { if let Some(ref media_type) = self.media_type {
root.append_child(Element::builder("media-type") root.append_child(Element::builder("media-type")
.ns(ns::JINGLE_FT) .ns(ns::JINGLE_FT)
.append(media_type.clone()) .append(media_type.clone())
.build()); .build());
} }
if let Some(ref name) = file.name { if let Some(ref name) = self.name {
root.append_child(Element::builder("name") root.append_child(Element::builder("name")
.ns(ns::JINGLE_FT) .ns(ns::JINGLE_FT)
.append(name.clone()) .append(name.clone())
.build()); .build());
} }
if let Some(ref desc) = file.desc { if let Some(ref desc) = self.desc {
root.append_child(Element::builder("desc") root.append_child(Element::builder("desc")
.ns(ns::JINGLE_FT) .ns(ns::JINGLE_FT)
.append(desc.clone()) .append(desc.clone())
.build()); .build());
} }
if let Some(ref size) = file.size { if let Some(ref size) = self.size {
root.append_child(Element::builder("size") root.append_child(Element::builder("size")
.ns(ns::JINGLE_FT) .ns(ns::JINGLE_FT)
.append(format!("{}", size)) .append(format!("{}", size))
.build()); .build());
} }
if let Some(ref range) = file.range { if let Some(ref range) = self.range {
root.append_child(Element::builder("range") root.append_child(Element::builder("range")
.ns(ns::JINGLE_FT) .ns(ns::JINGLE_FT)
.append(range.clone()) .append(range.clone())
.build()); .build());
} }
for hash in file.hashes.clone() { for hash in self.hashes.clone() {
root.append_child(hashes::serialise(&hash)); root.append_child(hashes::serialise(&hash));
} }
root root
}
} }
pub fn serialise(desc: &Description) -> Element { impl<'a> Into<Element> for &'a Description {
fn into(self) -> Element {
let file: Element = (&self.file).into();
Element::builder("description") Element::builder("description")
.ns(ns::JINGLE_FT) .ns(ns::JINGLE_FT)
.append(serialise_file(&desc.file)) .append(file)
.build() .build()
}
} }
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use minidom::Element; use super::*;
use jingle_ft;
#[test] #[test]
fn test_description() { fn test_description() {
@ -245,7 +255,7 @@ mod tests {
</description> </description>
"#.parse().unwrap(); "#.parse().unwrap();
let desc = jingle_ft::parse_jingle_ft(&elem).unwrap(); let desc = Description::try_from(&elem).unwrap();
assert_eq!(desc.file.media_type, Some(String::from("text/plain"))); assert_eq!(desc.file.media_type, Some(String::from("text/plain")));
assert_eq!(desc.file.name, Some(String::from("test.txt"))); assert_eq!(desc.file.name, Some(String::from("test.txt")));
assert_eq!(desc.file.desc, None); assert_eq!(desc.file.desc, None);
@ -267,7 +277,7 @@ mod tests {
</description> </description>
"#.parse().unwrap(); "#.parse().unwrap();
let desc = jingle_ft::parse_jingle_ft(&elem).unwrap(); let desc = Description::try_from(&elem).unwrap();
assert_eq!(desc.file.media_type, None); assert_eq!(desc.file.media_type, None);
assert_eq!(desc.file.name, None); assert_eq!(desc.file.name, None);
assert_eq!(desc.file.desc, None); assert_eq!(desc.file.desc, None);