diff options
| -rw-r--r-- | src/api.rs | 10 | ||||
| -rw-r--r-- | src/lib.rs | 4 | ||||
| -rw-r--r-- | src/main.rs | 7 | ||||
| -rw-r--r-- | src/station.rs | 32 |
4 files changed, 49 insertions, 4 deletions
@@ -17,6 +17,7 @@ */ use reqwest; +use crate::station::{Station, StationContainer}; const API_BASE: &'static str = "https://oslobysykkel.no/api/v1"; @@ -40,9 +41,12 @@ impl Api { Api { client } } - pub fn stations(&self) -> String { - self.client.get(&url_for("stations")) + pub fn stations(&self) -> Vec<Station> { + let response_json = self.client.get(&url_for("stations")) .send().unwrap() - .text().unwrap() + .text().unwrap(); + + let v: StationContainer = serde_json::from_str(&response_json).unwrap(); + v.stations } } @@ -17,4 +17,8 @@ */ mod api; +mod station; + +// Re export the important parts of the API pub use api::Api; +pub use station::Station; diff --git a/src/main.rs b/src/main.rs index 3e378d1..733af84 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,5 +22,10 @@ use oslobike; fn main() { let api_key = dotenv::var("OSLOBIKE_APIKEY").expect("No API key defined!"); let api = oslobike::Api::new(api_key); - println!("{}", api.stations()); + for station in api.stations() { + println!("{:>4} {}: {}", + station.id, + station.title, + station.number_of_locks); + } } diff --git a/src/station.rs b/src/station.rs new file mode 100644 index 0000000..1d52fb4 --- /dev/null +++ b/src/station.rs @@ -0,0 +1,32 @@ +/* + oslobike - find free bikes in Oslo. + Copyright (C) 2019 Harald Eilertsen <haraldei@anduin.net> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. +*/ + +use serde_derive::Deserialize; + +#[derive(Debug, Deserialize)] +pub struct Station { + pub id: usize, + pub title: String, + pub subtitle: String, + pub number_of_locks: usize, +} + +#[derive(Debug, Deserialize)] +pub(crate) struct StationContainer { + pub stations: Vec<Station> +} |