Update formatting

This commit is contained in:
2024-04-21 22:21:24 +02:00
parent a945e288c4
commit 36fdf4d806
3 changed files with 99 additions and 63 deletions

View File

@@ -1,11 +1,11 @@
use mensa::Mealplan;
use comfy_table::*;
use comfy_table::presets::UTF8_FULL;
use chrono::{Datelike, Local};
use comfy_table::modifiers::UTF8_ROUND_CORNERS;
use chrono::{Local, Datelike};
use comfy_table::presets::UTF8_FULL;
use comfy_table::*;
use mensa::Mealplan;
mod mensa;
mod cli;
mod mensa;
//use crate::mensa::*;
@@ -53,7 +53,12 @@ fn exec_arg_helper(args: &cli::Args, m: &dyn mensa::Mealplan) {
println!("Datum: {}", dt.date_naive());
}
println!("{}", m.name());
table_short(menus.iter().map(|&x| x.get_short_info()).collect::<Vec<(&str, String, &str)>>());
table_short(
menus
.iter()
.map(|&x| x.get_short_info())
.collect::<Vec<(&str, String, &str)>>(),
);
}
}
@@ -78,4 +83,3 @@ fn table_short(data: Vec<(&str, String, &str)>) {
println!("{table}");
}

View File

@@ -1,12 +1,11 @@
extern crate serde_derive;
use chrono::{Local, Datelike};
use serde::{Serialize, Deserialize};
use chrono::{Datelike, Local};
use serde::{Deserialize, Serialize};
pub enum MensaName {
Shedhalle,
Morgenstelle
Morgenstelle,
}
pub trait Mealplan {
@@ -18,22 +17,26 @@ pub trait Mealplan {
pub enum Mensa {
Shedhalle(MensaShedhalle),
Morgenstelle(MensaMorgenstelle)
Morgenstelle(MensaMorgenstelle),
}
impl Mensa {
pub async fn from(name: MensaName) -> Result<Mensa, Box<dyn std::error::Error>> {
match name {
MensaName::Shedhalle => {
let resp = reqwest::get("https://www.my-stuwe.de//wp-json/mealplans/v1/canteens/611?lang=de")
let resp = reqwest::get(
"https://www.my-stuwe.de//wp-json/mealplans/v1/canteens/611?lang=de",
)
.await?
.json::<MensaShedhalle>()
.await?;
Ok(Mensa::Shedhalle(resp))
},
}
MensaName::Morgenstelle => {
let resp = reqwest::get("https://www.my-stuwe.de//wp-json/mealplans/v1/canteens/621?lang=de")
let resp = reqwest::get(
"https://www.my-stuwe.de//wp-json/mealplans/v1/canteens/621?lang=de",
)
.await?
.json::<MensaMorgenstelle>()
.await?;
@@ -44,8 +47,6 @@ impl Mensa {
}
}
fn get_nth_date(days: u8) -> Option<chrono::DateTime<Local>> {
if days > 7 {
return None;
@@ -55,13 +56,12 @@ fn get_nth_date(days: u8) -> Option<chrono::DateTime<Local>> {
return match dt.weekday() {
chrono::Weekday::Sat => dt.checked_add_days(chrono::Days::new(2)),
chrono::Weekday::Sun => dt.checked_add_days(chrono::Days::new(1)),
_ => Some(dt)
_ => Some(dt),
};
}
None
}
#[derive(Debug, Serialize, Deserialize)]
pub struct MensaShedhalle {
#[serde(rename = "611")]
@@ -85,7 +85,11 @@ impl Mealplan for MensaShedhalle {
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()
self.canteen
.menus
.iter()
.filter(|&x| x.menu_date == local)
.collect()
}
fn nth(&self, days: u8, vegetarian: bool) -> Option<Vec<&Menu>> {
@@ -93,19 +97,28 @@ impl Mealplan for MensaShedhalle {
Some(dt) => {
let local = format!("{}", dt.format("%Y-%m-%d"));
if vegetarian {
Some(self.canteen.menus.iter().filter(|&x| x.menu_date == local && x.menu_line.contains("veg")).collect())
Some(
self.canteen
.menus
.iter()
.filter(|&x| x.menu_date == local && x.menu_line.contains("veg"))
.collect(),
)
} else {
Some(self.canteen.menus.iter().filter(|&x| x.menu_date == local).collect())
Some(
self.canteen
.menus
.iter()
.filter(|&x| x.menu_date == local)
.collect(),
)
}
},
_ => None
}
_ => None,
}
}
}
#[derive(Debug, Serialize, Deserialize)]
pub struct MensaMorgenstelle {
#[serde(rename = "621")]
@@ -123,7 +136,11 @@ impl Mealplan for MensaMorgenstelle {
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()
self.canteen
.menus
.iter()
.filter(|&x| x.menu_date == local)
.collect()
}
fn nth(&self, days: u8, vegetarian: bool) -> Option<Vec<&Menu>> {
@@ -131,17 +148,28 @@ impl Mealplan for MensaMorgenstelle {
Some(dt) => {
let local = format!("{}", dt.format("%Y-%m-%d"));
if vegetarian {
Some(self.canteen.menus.iter().filter(|&x| x.menu_date == local && x.menu_line.contains("veg")).collect())
Some(
self.canteen
.menus
.iter()
.filter(|&x| x.menu_date == local && x.menu_line.contains("veg"))
.collect(),
)
} else {
Some(self.canteen.menus.iter().filter(|&x| x.menu_date == local).collect())
Some(
self.canteen
.menus
.iter()
.filter(|&x| x.menu_date == local)
.collect(),
)
}
},
_ => None
}
_ => None,
}
}
}
#[derive(Debug, Serialize, Deserialize)]
pub struct Canteen {
#[serde(rename = "canteenId")]
@@ -179,7 +207,12 @@ impl Menu {
}
pub fn print_short_info(&self) {
println!("{}: {}, {}", self.menu_line, self.menu.join(", "), self.student_price);
println!(
"{}: {}, {}",
self.menu_line,
self.menu.join(", "),
self.student_price
);
}
pub fn print_very_short_info(&self) {
@@ -215,4 +248,3 @@ pub enum FiltersInclude {
#[serde(rename = "vegan")]
Vegan,
}