C3MA/LED-BOARD
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Parse destination and difference

Browse Source
This commit is contained in:
Ollo 2023-09-16 00:24:53 +02:00
parent e70e0ef068
commit 60139da2bf
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/bin/src/main.rs
View File

@ -242,10 +242,14 @@ fn send_package(ipaddress: String,
if strabaRes.failure == false { if strabaRes.failure == false {
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On); let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
let outbound = &format!("{}: {}", "Rheinau", strabaRes.rheinau); let outbound = &format!("{}: {}min", strabaRes.outbound_station, (strabaRes.outbound_diff / 60));
Text::new(outbound, Point::new(0, 15), text_style) Text::new(outbound, Point::new(0, 15), text_style)
.draw(&mut display) .draw(&mut display)
.unwrap(); .unwrap();
let inbound = &format!("{}: {}min", strabaRes.inbound_station, (strabaRes.inbound_diff / 60));
Text::new(inbound, Point::new(0, 30), text_style)
.draw(&mut display)
.unwrap();
} }
package[1..PACKAGE_LENGTH].copy_from_slice(&display.image); package[1..PACKAGE_LENGTH].copy_from_slice(&display.image);
@ -288,8 +292,8 @@ fn main() {
// Test Webcrawler for public transportataion // Test Webcrawler for public transportataion
let strabaRes = straba::fetch_data(); let strabaRes = straba::fetch_data();
println!("Rheinau: {:?}", strabaRes.rheinau); println!("{:?} {:?}s", strabaRes.outbound_station, strabaRes.outbound_diff);
println!("Schönau: {:?}", strabaRes.schoenau); println!("{:?} {:?}s", strabaRes.inbound_station , strabaRes.inbound_diff);
loop { loop {
let delay = time::Duration::from_millis(10000); let delay = time::Duration::from_millis(10000);

30
client/bin/src/straba.rs
View File

@ -74,16 +74,20 @@ pub struct IsoStringDateTime {
// Return value // Return value
pub struct NextDeparture { pub struct NextDeparture {
pub rheinau: String, pub outbound_station: String,
pub schoenau: String, pub outbound_diff: i64,
pub inbound_station: String,
pub inbound_diff: i64,
pub failure: bool, pub failure: bool,
} }
pub fn fetch_data() -> NextDeparture { pub fn fetch_data() -> NextDeparture {
let mut returnValue = NextDeparture { let mut returnValue = NextDeparture {
failure : false, failure : false,
rheinau : String::from(""), outbound_station : String::from(""),
schoenau : String::from(""), outbound_diff : -10000,
inbound_station : String::from(""),
inbound_diff : -10000,
}; };
let st_now = SystemTime::now(); let st_now = SystemTime::now();
@ -128,13 +132,21 @@ pub fn fetch_data() -> NextDeparture {
for stop in el.stops { for stop in el.stops {
if stop.realtimeDeparture.isoString.is_some() { if stop.realtimeDeparture.isoString.is_some() {
let txt_departure = stop.realtimeDeparture.isoString.unwrap(); let txt_departure = stop.realtimeDeparture.isoString.unwrap();
let next_departure = DateTime::parse_from_rfc3339(&txt_departure); let next_departure = DateTime::parse_from_rfc3339(&txt_departure).unwrap();
let diff = next_departure.timestamp() - (seconds as i64);
println!("To {:} {:}", stop.destinationLabel, txt_departure); println!("To {:} {:}", stop.destinationLabel, txt_departure);
if returnValue.rheinau == "" { if returnValue.outbound_station == "" {
if stop.destinationLabel.contains("Rheinau") { if stop.destinationLabel.contains("Rheinau") {
returnValue.rheinau = txt_departure; returnValue.outbound_station = stop.destinationLabel;
} else if returnValue.schoenau == "" { returnValue.outbound_diff = diff;
returnValue.schoenau = txt_departure; } else if stop.destinationLabel.contains("Hochschule") ||
stop.destinationLabel.contains("Hauptbahnhof") ||
stop.destinationLabel.contains("nau") { // Schönau
if returnValue.inbound_station == "" {
returnValue.inbound_station = stop.destinationLabel;
returnValue.inbound_diff = diff;
}
} }
} }
} else { } else {