diff --git a/Cargo.lock b/Cargo.lock index 308ec0a..95ec2ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -44,6 +53,31 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "time", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "core-foundation" version = "0.9.3" @@ -60,6 +94,50 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +[[package]] +name = "cxx" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "encoding_rs" version = "0.8.31" @@ -252,6 +330,30 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + [[package]] name = "idna" version = "0.3.0" @@ -314,6 +416,15 @@ version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +[[package]] +name = "link-cplusplus" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] + [[package]] name = "lock_api" version = "0.4.9" @@ -353,7 +464,7 @@ checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.42.0", ] @@ -375,6 +486,25 @@ dependencies = [ "tempfile", ] +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + [[package]] name = "num_cpus" version = "1.14.0" @@ -578,6 +708,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + [[package]] name = "security-framework" version = "2.7.0" @@ -703,6 +839,26 @@ dependencies = [ "winapi", ] +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -809,6 +965,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" name = "tuemensa" version = "0.1.0" dependencies = [ + "chrono", "reqwest", "serde", "serde_derive", @@ -836,6 +993,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + [[package]] name = "url" version = "2.3.1" @@ -863,6 +1026,12 @@ dependencies = [ "try-lock", ] +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -961,6 +1130,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index 387a096..3b00703 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +chrono = "0.4.23" reqwest = { version = "0.11", features = ["json"] } serde = { version = "1.0.147", features = ["derive"] } serde_derive = "1.0.147" diff --git a/src/main.rs b/src/main.rs index 21513c5..48390a4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,18 +1,21 @@ +use mensa::Mealplan; + mod mensa; //use crate::mensa::*; #[tokio::main] async fn main() -> Result<(), Box> { - let resp = reqwest::get("https://www.my-stuwe.de//wp-json/mealplans/v1/canteens/611?lang=de") - .await? - .json::() - .await?; - println!("{:#?}", resp); + let shedhalle = mensa::Mensa::from(mensa::MensaName::Shedhalle).await?; + if let mensa::Mensa::Shedhalle(resp) = shedhalle { + //println!("{:#?}", resp); + //println!("{}", resp.today()); + for a in resp.today().iter() { + a.print_short_info(); + } + + } Ok(()) } -pub enum Mensa { - Shedhalle(mensa::MensaShedhalle), -} diff --git a/src/mensa.rs b/src/mensa.rs index baf07b6..61ccb34 100644 --- a/src/mensa.rs +++ b/src/mensa.rs @@ -1,14 +1,83 @@ extern crate serde_derive; +use chrono::{DateTime, Local}; + use serde::{Serialize, Deserialize}; + +pub enum MensaName { + Shedhalle, + Morgenstelle +} + +pub trait Mealplan { + fn id(&self) -> &str; + fn today(&self) -> Vec<&Menu>; +} + +pub enum Mensa { + Shedhalle(MensaShedhalle), + Morgenstelle(MensaMorgenstelle) +} + +impl Mensa { + pub async fn from(name: MensaName) -> Result> { + match name { + MensaName::Shedhalle => { + let resp = reqwest::get("https://www.my-stuwe.de//wp-json/mealplans/v1/canteens/611?lang=de") + .await? + .json::() + .await?; + + Ok(Mensa::Shedhalle(resp)) + }, + MensaName::Morgenstelle => { + let resp = reqwest::get("https://www.my-stuwe.de//wp-json/mealplans/v1/canteens/621?lang=de") + .await? + .json::() + .await?; + + Ok(Mensa::Morgenstelle(resp)) + } + } + } +} + + #[derive(Debug, Serialize, Deserialize)] pub struct MensaShedhalle { #[serde(rename = "611")] - the_611: The611, + canteen: Canteen, } +impl MensaShedhalle { + fn print(&self) { + println!("{:#?}", self); + } +} + +impl Mealplan for MensaShedhalle { + fn id(&self) -> &str { + &self.canteen.canteen_id + } + + fn today(&self) -> Vec<&Menu> { + let local = format!("{}", Local::now().format("%Y-%m-%d")); + self.canteen.menus.iter().filter(|&x| x.menu_date == local).collect() + } +} + + + + #[derive(Debug, Serialize, Deserialize)] -pub struct The611 { +pub struct MensaMorgenstelle { + #[serde(rename = "621")] + canteen: Canteen, +} + + +#[derive(Debug, Serialize, Deserialize)] +pub struct Canteen { #[serde(rename = "canteenId")] canteen_id: String, canteen: String, @@ -22,7 +91,7 @@ pub struct Menu { menu_line: String, photo: Photo, #[serde(rename = "studentPrice")] - student_price: StudentPrice, + student_price: String, #[serde(rename = "guestPrice")] guest_price: String, #[serde(rename = "pupilPrice")] @@ -30,14 +99,24 @@ pub struct Menu { #[serde(rename = "menuDate")] menu_date: String, menu: Vec, - meats: Vec, - icons: Vec, + meats: Vec, + icons: Vec, #[serde(rename = "filtersInclude")] filters_include: Vec, allergens: Vec, additives: Vec, } +impl Menu { + pub fn print(&self) { + println!("{:#?}", self); + } + + pub fn print_short_info(&self) { + println!("{}: {}, {}€", self.menu_line, self.menu.join(", "), self.student_price); + } +} + #[derive(Debug, Serialize, Deserialize)] pub struct Photo { thumbnail: String, @@ -61,23 +140,3 @@ pub enum FiltersInclude { Vegan, } -#[derive(Debug, Serialize, Deserialize)] -pub enum StudentPrice { - #[serde(rename = "-")] - Empty, - #[serde(rename = "0,95")] - The095, - #[serde(rename = "1,00")] - The100, - #[serde(rename = "2,65")] - The265, - #[serde(rename = "3,10")] - The310, - #[serde(rename = "3,20")] - The320, - #[serde(rename = "3,40")] - The340, - #[serde(rename = "3,50")] - The350, -} -