megamanmalte/mensa
1
0
Fork 0
mirror of https://github.com/MalteT/mensa.git synced 2024-10-22 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve meal printing

Browse source
This commit is contained in:
Malte Tammena 2021-10-22 14:55:35 +02:00
parent d1b0dc36fe
commit f4ab56acc3
3 changed files with 96 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/canteen.rs
View file

@ -61,8 +61,9 @@ pub struct Day {
}
impl Meta {
pub fn fetch(_id: CanteenId) -> Result<Self> {
todo!()
pub fn fetch(id: CanteenId) -> Result<Self> {
let url = format!("{}/canteens/{}", ENDPOINT, id);
fetch_json(url, *TTL_CANTEENS)
}
}
@ -113,6 +114,10 @@ impl Canteen {
Ok(&self.meta()?.address)
}
pub fn name(&mut self) -> Result<&String> {
Ok(&self.meta()?.name)
}
pub fn complete_without_meals(&mut self) -> Result<CanteenCompleteWithoutMeals<'_>> {
Ok(CanteenCompleteWithoutMeals {
id: self.id,

61
src/meal/mod.rs
View file

@ -1,4 +1,5 @@
use itertools::Itertools;
use lazy_static::lazy_static;
use serde::{Deserialize, Serialize};
use std::{
@ -22,6 +23,10 @@ pub use self::ser::MealComplete;
pub type MealId = usize;
lazy_static! {
static ref PRE: String = color!(if_plain!(" ┊", " |"); bright_black);
}
#[derive(Debug, Clone, Deserialize)]
#[serde(from = "de::Meal")]
pub struct Meal {
@ -74,14 +79,49 @@ impl Meal {
///
/// This will respect passed cli arguments and the configuration.
pub fn print_for_all_canteens(canteens: &mut [Canteen]) -> Result<()> {
if CONF.args.json {
Self::print_for_all_canteens_json(canteens)
} else {
Self::print_for_all_canteens_no_json(canteens)
}
}
fn print_for_all_canteens_no_json(canteens: &mut [Canteen]) -> Result<()> {
// Load the filter which is used to select which meals to print.
let filter = CONF.get_filter_rule();
// Load the favourites which will be used for marking meals.
let favs = CONF.get_favourites_rule();
// The day for which to print meals
let day = CONF.date();
for canteen in canteens {
let name = canteen.name()?.clone();
match canteen.meals_at_mut(day)? {
Some(meals) => {
println!("\n {}", color!(name; bright_black));
for meal in meals {
let complete = meal.complete()?;
if filter.is_match(&complete) {
let is_fav = favs.is_match(&complete);
println!("{}", *PRE);
complete.print(is_fav);
}
}
}
None => todo!(),
}
}
Ok(())
}
fn print_for_all_canteens_json(canteens: &mut [Canteen]) -> Result<()> {
// Load the filter which is used to select which meals to print.
let filter = CONF.get_filter_rule();
// The day for which to print meals
let day = CONF.date();
// Filter all meals
let meals = canteens.iter_mut().map(|canteen| {
let meals: HashMap<CanteenId, Vec<_>> = canteens
.iter_mut()
.map(|canteen| {
let id = canteen.id();
let meals: Vec<_> = match canteen.meals_at_mut(day)? {
Some(meals) => meals
@ -92,22 +132,9 @@ impl Meal {
None => vec![],
};
Result::Ok((id, meals))
});
if CONF.args.json {
let map: HashMap<CanteenId, Vec<_>> = meals.try_collect()?;
print_json(&map)
} else {
for res in meals {
let (canteen_id, meals) = res?;
println!("{}", canteen_id);
for meal in meals {
let is_fav = favs.is_match(&meal);
println!();
meal.print(is_fav);
}
}
Ok(())
}
})
.try_collect()?;
print_json(&meals)
}
}

65
src/meal/ser.rs
View file

@ -1,25 +1,22 @@
use core::fmt;
use itertools::Itertools;
use lazy_static::lazy_static;
use serde::Serialize;
use unicode_width::UnicodeWidthStr;
use crate::get_sane_terminal_dimensions;
use super::{MealId, Meta};
use super::{MealId, Meta, PRE};
const NAME_PRE: &str = " ╭───╴";
const NAME_PRE_PLAIN: &str = " - ";
const NAME_CONTINUE_PRE: &str = " ┊ ";
const NAME_CONTINUE_PRE_PLAIN: &str = " ";
const OTHER_NOTE_PRE: &str = " ├╴";
const OTHER_NOTE_PRE_PLAIN: &str = " ";
const OTHER_NOTE_CONTINUE_PRE: &str = " ┊ ";
const OTHER_NOTE_CONTINUE_PRE_PLAIN: &str = " ";
const CATEGORY_PRE: &str = " ├─╴";
const CATEGORY_PRE_PLAIN: &str = " ";
const PRICES_PRE: &str = " ╰╴";
const PRICES_PRE_PLAIN: &str = " ";
lazy_static! {
static ref NAME_PRE: &'static str = if_plain!(" ╭───╴", " - ");
static ref NAME_CONTINUE_PRE: &'static str = if_plain!(" ┊ ", " ");
static ref OTHER_NOTE_PRE: &'static str = if_plain!(" ├╴", " ");
static ref OTHER_NOTE_CONTINUE_PRE: &'static str = if_plain!(" ┊ ", " ");
static ref CATEGORY_PRE: &'static str = if_plain!(" ├─╴", " ");
static ref PRICES_PRE: &'static str = if_plain!(" ╰╴", " ");
}
#[derive(Debug, Serialize)]
pub struct MealComplete<'c> {
@ -45,16 +42,20 @@ impl<'c> MealComplete<'c> {
let mut name_parts = textwrap::wrap(&self.meta.name, max_name_width).into_iter();
// There will always be a first part of the splitted string
let first_name_part = name_parts.next().unwrap();
let pre = if_plain!(NAME_PRE, NAME_PRE_PLAIN);
println!(
"{}{}",
hl_if(highlight, pre),
"{}{}{}",
*PRE,
hl_if(highlight, *NAME_PRE),
color!(hl_if(highlight, first_name_part); bold),
);
for name_part in name_parts {
let name_part = hl_if(highlight, name_part);
let pre = if_plain!(NAME_CONTINUE_PRE, NAME_CONTINUE_PRE_PLAIN);
println!("{}{}", hl_if(highlight, pre), color!(name_part; bold),);
println!(
"{}{}{}",
*PRE,
hl_if(highlight, *NAME_CONTINUE_PRE),
color!(name_part; bold),
);
}
}
@ -67,11 +68,11 @@ impl<'c> MealComplete<'c> {
.map(|tag| tag.as_id());
let tag_str_colored =
if_plain!(color!(tag_str.join(" "); bright_black), tag_str.join(", "));
let pre = if_plain!(CATEGORY_PRE, CATEGORY_PRE_PLAIN);
let comma_if_plain = if_plain!("", ",");
println!(
"{}{}{} {}",
hl_if(highlight, pre),
"{}{}{}{} {}",
*PRE,
hl_if(highlight, *CATEGORY_PRE),
color!(self.meta.category; bright_blue),
color!(comma_if_plain; bright_black),
tag_str_colored
@ -79,15 +80,23 @@ impl<'c> MealComplete<'c> {
}
fn print_descriptions(&self, width: usize, highlight: bool) {
let pre = if_plain!(OTHER_NOTE_PRE, OTHER_NOTE_PRE_PLAIN);
let pre_continue = if_plain!(OTHER_NOTE_CONTINUE_PRE, OTHER_NOTE_CONTINUE_PRE_PLAIN);
let max_note_width = width - OTHER_NOTE_PRE.width();
for note in &self.meta.descs {
let mut note_parts = textwrap::wrap(note, max_note_width).into_iter();
// There will always be a first part in the splitted string
println!("{}{}", hl_if(highlight, pre), note_parts.next().unwrap());
println!(
"{}{}{}",
*PRE,
hl_if(highlight, *OTHER_NOTE_PRE),
note_parts.next().unwrap()
);
for part in note_parts {
println!("{}{}", hl_if(highlight, pre_continue), part);
println!(
"{}{}{}",
*PRE,
hl_if(highlight, *OTHER_NOTE_CONTINUE_PRE),
part
);
}
}
}
@ -102,10 +111,10 @@ impl<'c> MealComplete<'c> {
.collect();
secondary.sort_unstable();
let secondary_str = secondary.iter().map(|tag| tag.as_id()).join(" ");
let pre = if_plain!(PRICES_PRE, PRICES_PRE_PLAIN);
println!(
"{}{} {}",
hl_if(highlight, pre),
"{}{}{} {}",
*PRE,
hl_if(highlight, *PRICES_PRE),
prices,
color!(secondary_str; bright_black),
);