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

media_element: Simplify parsing of MediaElement.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-11-24 04:48:31 +00:00
parent 6533395ec3
commit 80a2f425e2
1 changed files with 9 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/media_element.rs
View file

@ -20,46 +20,15 @@ generate_element_with_text!(URI, "uri", ns::MEDIA_ELEMENT,
uri: TrimmedPlainText<String> uri: TrimmedPlainText<String>
); );
#[derive(Debug, Clone)] generate_element_with_children!(MediaElement, "media", ns::MEDIA_ELEMENT,
pub struct MediaElement { attributes: [
pub width: Option<usize>, width: Option<usize> = "width" => optional,
pub height: Option<usize>, height: Option<usize> = "height" => optional
pub uris: Vec<URI>, ],
} children: [
uris: Vec<URI> = ("uri", ns::MEDIA_ELEMENT) => URI
impl TryFrom<Element> for MediaElement { ]
type Err = Error; );
fn try_from(elem: Element) -> Result<MediaElement, Error> {
check_self!(elem, "media", ns::MEDIA_ELEMENT);
check_no_unknown_attributes!(elem, "media", ["width", "height"]);
let mut media = MediaElement {
width: get_attr!(elem, "width", optional),
height: get_attr!(elem, "height", optional),
uris: vec!(),
};
for child in elem.children() {
if child.is("uri", ns::MEDIA_ELEMENT) {
media.uris.push(URI::try_from(child.clone())?);
} else {
return Err(Error::ParseError("Unknown child in media element."));
}
}
Ok(media)
}
}
impl From<MediaElement> for Element {
fn from(media: MediaElement) -> Element {
Element::builder("media")
.ns(ns::MEDIA_ELEMENT)
.attr("width", media.width)
.attr("height", media.height)
.append(media.uris)
.build()
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {