6ef8dbefa3
This is a large change and as such, it needs good motivation. Let me remind you of the ultimate goal: we want a derive macro which allows us to FromXml/IntoXml, and that derive macro should be usable from `xmpp_parsers` and other crates. For that, any code generated by the derive macro mustn't depend on any code in the `xmpp_parsers` crate, because you cannot name the crate you are in portably (`xmpp_parsers::..` wouldn't resolve within `xmpp_parsers`, and `crate::..` would point at other crates if the macro was used in other crates). We also want to interoperate with code already implementing `TryFrom<Element>` and `Into<Element>` on structs. This ultimately requires that we have an error type which is shared by the two implementations and that error type must be declared in the `xso` crate to be usable by the macros. Thus, we port the error type over to use the type declared in `xso`. This changes the structure of the error type greatly; I do not think that `xso` should have to know about all the different types we are parsing there and they don't deserve special treatment. Wrapping them in a `Box<dyn ..>` seems more appropriate.
119 lines
4 KiB
Rust
119 lines
4 KiB
Rust
// Copyright (c) 2019 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
|
||
//
|
||
// This Source Code Form is subject to the terms of the Mozilla Public
|
||
// 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/.
|
||
|
||
use crate::date::DateTime;
|
||
use crate::iq::{IqGetPayload, IqResultPayload};
|
||
use crate::ns;
|
||
use crate::Element;
|
||
use chrono::FixedOffset;
|
||
use std::str::FromStr;
|
||
use xso::error::{Error, FromElementError};
|
||
|
||
generate_empty_element!(
|
||
/// An entity time query.
|
||
TimeQuery,
|
||
"time",
|
||
TIME
|
||
);
|
||
|
||
impl IqGetPayload for TimeQuery {}
|
||
|
||
/// An entity time result, containing an unique DateTime.
|
||
#[derive(Debug, Clone)]
|
||
pub struct TimeResult(pub DateTime);
|
||
|
||
impl IqResultPayload for TimeResult {}
|
||
|
||
impl TryFrom<Element> for TimeResult {
|
||
type Error = FromElementError;
|
||
|
||
fn try_from(elem: Element) -> Result<TimeResult, FromElementError> {
|
||
check_self!(elem, "time", TIME);
|
||
check_no_attributes!(elem, "time");
|
||
|
||
let mut tzo = None;
|
||
let mut utc = None;
|
||
|
||
for child in elem.children() {
|
||
if child.is("tzo", ns::TIME) {
|
||
if tzo.is_some() {
|
||
return Err(Error::Other("More than one tzo element in time.").into());
|
||
}
|
||
check_no_children!(child, "tzo");
|
||
check_no_attributes!(child, "tzo");
|
||
// TODO: Add a FromStr implementation to FixedOffset to avoid this hack.
|
||
let fake_date = format!("{}{}", "2019-04-22T11:38:00", child.text());
|
||
let date_time = DateTime::from_str(&fake_date).map_err(Error::text_parse_error)?;
|
||
tzo = Some(date_time.timezone());
|
||
} else if child.is("utc", ns::TIME) {
|
||
if utc.is_some() {
|
||
return Err(Error::Other("More than one utc element in time.").into());
|
||
}
|
||
check_no_children!(child, "utc");
|
||
check_no_attributes!(child, "utc");
|
||
let date_time =
|
||
DateTime::from_str(&child.text()).map_err(Error::text_parse_error)?;
|
||
match FixedOffset::east_opt(0) {
|
||
Some(tz) if date_time.timezone() == tz => (),
|
||
_ => return Err(Error::Other("Non-UTC timezone for utc element.").into()),
|
||
}
|
||
utc = Some(date_time);
|
||
} else {
|
||
return Err(Error::Other("Unknown child in time element.").into());
|
||
}
|
||
}
|
||
|
||
let tzo = tzo.ok_or(Error::Other("Missing tzo child in time element."))?;
|
||
let utc = utc.ok_or(Error::Other("Missing utc child in time element."))?;
|
||
let date = utc.with_timezone(tzo);
|
||
|
||
Ok(TimeResult(date))
|
||
}
|
||
}
|
||
|
||
impl From<TimeResult> for Element {
|
||
fn from(time: TimeResult) -> Element {
|
||
Element::builder("time", ns::TIME)
|
||
.append(Element::builder("tzo", ns::TIME).append(format!("{}", time.0.timezone())))
|
||
.append(
|
||
Element::builder("utc", ns::TIME).append(
|
||
time.0
|
||
.with_timezone(FixedOffset::east_opt(0).unwrap())
|
||
.format("%FT%TZ"),
|
||
),
|
||
)
|
||
.build()
|
||
}
|
||
}
|
||
|
||
#[cfg(test)]
|
||
mod tests {
|
||
use super::*;
|
||
|
||
// DateTime’s size doesn’t depend on the architecture.
|
||
#[test]
|
||
fn test_size() {
|
||
assert_size!(TimeQuery, 0);
|
||
assert_size!(TimeResult, 16);
|
||
}
|
||
|
||
#[test]
|
||
fn parse_response() {
|
||
let elem: Element =
|
||
"<time xmlns='urn:xmpp:time'><tzo>-06:00</tzo><utc>2006-12-19T17:58:35Z</utc></time>"
|
||
.parse()
|
||
.unwrap();
|
||
let elem1 = elem.clone();
|
||
let time = TimeResult::try_from(elem).unwrap();
|
||
assert_eq!(time.0.timezone(), FixedOffset::west_opt(6 * 3600).unwrap());
|
||
assert_eq!(
|
||
time.0,
|
||
DateTime::from_str("2006-12-19T12:58:35-05:00").unwrap()
|
||
);
|
||
let elem2 = Element::from(time);
|
||
assert_eq!(elem1, elem2);
|
||
}
|
||
}
|