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

iq: Move IqPayload parsing into its own Into implementation.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-18 23:50:08 +01:00
parent 0ad6893d52
commit 4407183010
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/iq.rs
View file

@ -31,6 +31,30 @@ pub enum IqPayload {
Ping(Ping), Ping(Ping),
} }
impl<'a> TryFrom<&'a Element> for IqPayload {
type Error = Error;
fn try_from(elem: &'a Element) -> Result<IqPayload, Error> {
Ok(match (elem.name().as_ref(), elem.ns().unwrap().as_ref()) {
// XEP-0030
("query", ns::DISCO_INFO) => IqPayload::Disco(Disco::try_from(elem)?),
// XEP-0047
("open", ns::IBB)
| ("data", ns::IBB)
| ("close", ns::IBB) => IqPayload::IBB(IBB::try_from(elem)?),
// XEP-0166
("jingle", ns::JINGLE) => IqPayload::Jingle(Jingle::try_from(elem)?),
// XEP-0199
("ping", ns::PING) => IqPayload::Ping(Ping::try_from(elem)?),
_ => return Err(Error::ParseError("Unknown iq payload."))
})
}
}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum IqPayloadType { pub enum IqPayloadType {
XML(Element), XML(Element),
@ -98,22 +122,11 @@ impl<'a> TryFrom<&'a Element> for Iq {
return Err(Error::ParseError("Wrong number of children in iq element.")); return Err(Error::ParseError("Wrong number of children in iq element."));
} }
} else { } else {
let parsed_payload = if let Ok(disco) = Disco::try_from(elem) { payload = match IqPayload::try_from(elem) {
Some(IqPayload::Disco(disco)) Ok(payload) => Some(IqPayloadType::Parsed(payload)),
} else if let Ok(ibb) = IBB::try_from(elem) { // TODO: fix the API to avoid having to swallow the error here.
Some(IqPayload::IBB(ibb)) Err(_) => Some(IqPayloadType::XML(elem.clone())),
} else if let Ok(jingle) = Jingle::try_from(elem) { }
Some(IqPayload::Jingle(jingle))
} else if let Ok(ping) = Ping::try_from(elem) {
Some(IqPayload::Ping(ping))
} else {
None
};
payload = match parsed_payload {
Some(payload) => Some(IqPayloadType::Parsed(payload)),
None => Some(IqPayloadType::XML(elem.clone())),
};
} }
} }