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

iq: Stop parsing the payload automatically.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-19 00:04:42 +01:00
parent 4407183010
commit 65469db1e3
1 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/iq.rs
View file

@ -55,17 +55,11 @@ impl<'a> TryFrom<&'a Element> for IqPayload {
} }
} }
#[derive(Debug, Clone)]
pub enum IqPayloadType {
XML(Element),
Parsed(IqPayload),
}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum IqType { pub enum IqType {
Get(IqPayloadType), Get(Element),
Set(IqPayloadType), Set(Element),
Result(Option<IqPayloadType>), Result(Option<Element>),
Error(StanzaError), Error(StanzaError),
} }
@ -122,11 +116,7 @@ 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 {
payload = match IqPayload::try_from(elem) { payload = Some(elem);
Ok(payload) => Some(IqPayloadType::Parsed(payload)),
// TODO: fix the API to avoid having to swallow the error here.
Err(_) => Some(IqPayloadType::XML(elem.clone())),
}
} }
} }
@ -188,13 +178,10 @@ impl<'a> Into<Element> for &'a Iq {
.attr("type", self.payload.clone()) .attr("type", self.payload.clone())
.build(); .build();
let elem = match self.payload.clone() { let elem = match self.payload.clone() {
IqType::Get(IqPayloadType::XML(elem)) IqType::Get(elem)
| IqType::Set(IqPayloadType::XML(elem)) | IqType::Set(elem)
| IqType::Result(Some(IqPayloadType::XML(elem))) => elem, | IqType::Result(Some(elem)) => elem,
IqType::Error(error) => (&error).into(), IqType::Error(error) => (&error).into(),
IqType::Get(IqPayloadType::Parsed(payload))
| IqType::Set(IqPayloadType::Parsed(payload))
| IqType::Result(Some(IqPayloadType::Parsed(payload))) => (&payload).into(),
IqType::Result(None) => return stanza, IqType::Result(None) => return stanza,
}; };
stanza.append_child(elem); stanza.append_child(elem);
@ -229,7 +216,7 @@ mod tests {
assert_eq!(iq.to, None); assert_eq!(iq.to, None);
assert_eq!(iq.id, None); assert_eq!(iq.id, None);
assert!(match iq.payload { assert!(match iq.payload {
IqType::Get(IqPayloadType::XML(element)) => element == query, IqType::Get(element) => element == query,
_ => false _ => false
}); });
} }
@ -245,7 +232,7 @@ mod tests {
assert_eq!(iq.to, None); assert_eq!(iq.to, None);
assert_eq!(iq.id, None); assert_eq!(iq.id, None);
assert!(match iq.payload { assert!(match iq.payload {
IqType::Set(IqPayloadType::XML(element)) => element == vcard, IqType::Set(element) => element == vcard,
_ => false _ => false
}); });
} }
@ -274,7 +261,7 @@ mod tests {
assert_eq!(iq.to, None); assert_eq!(iq.to, None);
assert_eq!(iq.id, None); assert_eq!(iq.id, None);
assert!(match iq.payload { assert!(match iq.payload {
IqType::Result(Some(IqPayloadType::XML(element))) => element == query, IqType::Result(Some(element)) => element == query,
_ => false, _ => false,
}); });
} }
@ -331,8 +318,12 @@ mod tests {
fn test_disco() { fn test_disco() {
let elem: Element = "<iq xmlns='jabber:client' type='get'><query xmlns='http://jabber.org/protocol/disco#info'/></iq>".parse().unwrap(); let elem: Element = "<iq xmlns='jabber:client' type='get'><query xmlns='http://jabber.org/protocol/disco#info'/></iq>".parse().unwrap();
let iq = Iq::try_from(&elem).unwrap(); let iq = Iq::try_from(&elem).unwrap();
assert!(match iq.payload { let payload = match iq.payload {
IqType::Get(IqPayloadType::Parsed(IqPayload::Disco(Disco { .. }))) => true, IqType::Get(ref payload) => IqPayload::try_from(payload).unwrap(),
_ => panic!(),
};
assert!(match payload {
IqPayload::Disco(Disco { .. }) => true,
_ => false, _ => false,
}); });
} }