clerie/nurausstieg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: clerie:b2c24df08a7329aca1c4ae13b2cc0683de063224
Branches Tags
clerie:main
..
compare: clerie:26ea045216b2887ebe11fee53b5db1f4a6391f6b
Branches Tags
clerie:main

No commits in common. "b2c24df08a7329aca1c4ae13b2cc0683de063224" and "26ea045216b2887ebe11fee53b5db1f4a6391f6b" have entirely different histories.
b2c24df08a ... 26ea045216

1 changed files with 1 additions and 25 deletions
Show Stats Expand all files Collapse all files

26
src/main.rs
View File

@ -2,7 +2,6 @@ use axum::{
extract::{ extract::{
State, State,
Path, Path,
Query,
}, },
http::StatusCode, http::StatusCode,
response::Html, response::Html,
@ -60,10 +59,6 @@ struct AppState {
stations: HashMap<String, Station>, stations: HashMap<String, Station>,
} }
#[derive(Deserialize)]
struct RoutingQuery {
all: Option<String>,
}
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {
@ -180,8 +175,7 @@ async fn route_station_overview(
async fn route_station_to_dest_station( async fn route_station_to_dest_station(
State(state): State<AppState>, State(state): State<AppState>,
Path((station_id, dest_station_id)): Path<(String, String)>, Path((station_id, dest_station_id)): Path<(String, String)>
query: Query<RoutingQuery>,
) -> Result<Html<String>, (StatusCode, String)> { ) -> Result<Html<String>, (StatusCode, String)> {
if !state.stations.contains_key(&station_id) { if !state.stations.contains_key(&station_id) {
return Err((StatusCode::NOT_FOUND, String::from("Unknown departing station"))); return Err((StatusCode::NOT_FOUND, String::from("Unknown departing station")));
@ -204,7 +198,6 @@ async fn route_station_to_dest_station(
let client = reqwest::Client::new(); let client = reqwest::Client::new();
let stationdata_req = client.get(format!("https://bahn.expert/api/iris/v2/abfahrten/{}?lookahead=150&lookbehind=10", station_properties.code)) let stationdata_req = client.get(format!("https://bahn.expert/api/iris/v2/abfahrten/{}?lookahead=150&lookbehind=10", station_properties.code))
.header(reqwest::header::USER_AGENT, "https://nurausstieg.clerie.de - abuse: nurausstieg@clerie.de")
.send().await .send().await
.map_err(|_err| (StatusCode::INTERNAL_SERVER_ERROR, String::from("Station Data cannot be fetched")))?; .map_err(|_err| (StatusCode::INTERNAL_SERVER_ERROR, String::from("Station Data cannot be fetched")))?;
@ -222,26 +215,9 @@ async fn route_station_to_dest_station(
out.push_str("<html><body>\n"); out.push_str("<html><body>\n");
out.push_str(&format!("<h1>Abfahren für {} nach {}</h1>\n", station_properties.name, dest_station_properties.name)); out.push_str(&format!("<h1>Abfahren für {} nach {}</h1>\n", station_properties.name, dest_station_properties.name));
let display_all_departures = match query.all {
Some(_) => true,
None => false,
};
if display_all_departures {
out.push_str("<a href=\"?\">Don't show all departures</a>\n");
}
else {
out.push_str("<a href=\"?all=1\">Show all departures</a>\n");
}
out.push_str("<ul>\n"); out.push_str("<ul>\n");
for departure in stationdata.departures { for departure in stationdata.departures {
if !display_all_departures && !vec![String::from("ICE"), String::from("IC"), String::from("EC")].contains(&departure.train.r#type) {
continue;
}
let departure_info = match departure.departure { let departure_info = match departure.departure {
Some(d) => d, Some(d) => d,
None => continue, None => continue,