pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

media_element: Parse URI separately from MediaElement.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-10-31 22:01:52 +00:00
parent fb27b6225c
commit 4875f15201
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/media_element.rs
View file

@ -18,6 +18,24 @@ pub struct URI {
pub uri: String, pub uri: String,
} }
impl TryFrom<Element> for URI {
type Err = Error;
fn try_from(elem: Element) -> Result<URI, Error> {
check_self!(elem, "uri", ns::MEDIA_ELEMENT);
check_no_unknown_attributes!(elem, "uri", ["type"]);
check_no_children!(elem, "uri");
let uri = elem.text().trim().to_owned();
if uri == "" {
return Err(Error::ParseError("URI missing in uri."));
}
Ok(URI {
type_: get_attr!(elem, "type", required),
uri: uri,
})
}
}
impl From<URI> for Element { impl From<URI> for Element {
fn from(uri: URI) -> Element { fn from(uri: URI) -> Element {
Element::builder("uri") Element::builder("uri")
@ -48,14 +66,9 @@ impl TryFrom<Element> for MediaElement {
height: get_attr!(elem, "height", optional), height: get_attr!(elem, "height", optional),
uris: vec!(), uris: vec!(),
}; };
for uri in elem.children() { for child in elem.children() {
if uri.is("uri", ns::MEDIA_ELEMENT) { if child.is("uri", ns::MEDIA_ELEMENT) {
let type_ = get_attr!(uri, "type", required); media.uris.push(URI::try_from(child.clone())?);
let text = uri.text().trim().to_owned();
if text == "" {
return Err(Error::ParseError("URI missing in uri."));
}
media.uris.push(URI { type_: type_, uri: text });
} else { } else {
return Err(Error::ParseError("Unknown child in media element.")); return Err(Error::ParseError("Unknown child in media element."));
} }