Chewing_Bever
/
fej
1
0
Fork 0
Code Issues 28 Pull Requests 10 Projects 3 Releases 4 Wiki Activity

Removed unnecessary json return data (closes #12)

master
Jef Roosens 2021-04-04 19:15:47 +02:00
parent 6af5368a87
commit 001b7b324e
Signed by: Jef Roosens
GPG Key ID: B580B976584B5F30
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ivago/controller/pickup_times.rs
View File

@ -51,6 +51,7 @@ impl TryFrom<&str> for BasicDate {
match re.captures(s) { match re.captures(s) {
None => Err(()), None => Err(()),
Some(caps) => Ok(BasicDate { Some(caps) => Ok(BasicDate {
// TODO change this to ? operator if possible
year: caps.get(1).unwrap().as_str().parse().unwrap(), year: caps.get(1).unwrap().as_str().parse().unwrap(),
month: caps.get(2).unwrap().as_str().parse().unwrap(), month: caps.get(2).unwrap().as_str().parse().unwrap(),
day: caps.get(3).unwrap().as_str().parse().unwrap(), day: caps.get(3).unwrap().as_str().parse().unwrap(),
@ -86,12 +87,9 @@ impl Serialize for PickupTime {
where where
S: Serializer, S: Serializer,
{ {
let mut s = serializer.serialize_struct("PickupTime", 4)?; let mut s = serializer.serialize_struct("PickupTime", 2)?;
s.serialize_field("date", &self.date)?; s.serialize_field("date", &self.date)?;
s.serialize_field("label", &self.label)?; s.serialize_field("label", &self.label)?;
s.serialize_field("classes", &self.classes)?;
s.serialize_field("url", &self.url)?;
s.end() s.end()
} }
} }
@ -101,8 +99,6 @@ impl Serialize for PickupTime {
pub struct PickupTime { pub struct PickupTime {
date: BasicDate, date: BasicDate,
label: String, label: String,
classes: Vec<String>,
url: String,
} }
pub fn get_pickup_times( pub fn get_pickup_times(
@ -142,13 +138,6 @@ pub fn get_pickup_times(
// TODO should I check here if the parsing worked? // TODO should I check here if the parsing worked?
date: BasicDate::try_from(map.get("date").unwrap().as_str()).unwrap(), date: BasicDate::try_from(map.get("date").unwrap().as_str()).unwrap(),
label: map.get("label").unwrap().to_string(), label: map.get("label").unwrap().to_string(),
classes: map
.get("classes")
.unwrap()
.split_whitespace()
.map(|x| String::from(x))
.collect(),
url: map.get("url").unwrap().to_string(),
}) })
} }