Garmelon/today
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify entries and entry dates

Browse source
This commit is contained in:
Joscha 2021-12-05 17:06:15 +01:00
parent 63f5c6fba9
commit 85d2c4bf89
4 changed files with 125 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/eval/command/birthday.rs
View file

@ -4,7 +4,7 @@ use crate::eval::date::Dates;
use crate::files::commands::BirthdaySpec;
use super::super::command::CommandState;
use super::super::{Entry, EntryKind};
use super::super::EntryKind;
impl<'a> CommandState<'a> {
pub fn eval_birthday_spec(&mut self, spec: &BirthdaySpec) {
@ -12,39 +12,26 @@ impl<'a> CommandState<'a> {
// but I don't think that kind of optimization will be necessary any
// time soon.
for year in self.range.years() {
let mut title = self.title();
if spec.year_known {
let age = if spec.year_known {
let age = year - spec.date.year();
if age < 0 {
continue;
}
title.push_str(&format!(" ({})", age));
}
Some(age)
} else {
None
};
let kind = EntryKind::Birthday(age);
if let Some(date) = spec.date.with_year(year) {
self.add(Entry {
kind: EntryKind::Birthday,
title,
desc: self.desc(),
source: self.source(),
root: Some(date),
dates: Some(Dates::new(date, date)),
});
self.add(EntryKind::Birthday(age), Some(Dates::new(date, date)));
} else {
assert_eq!(spec.date.month(), 2);
assert_eq!(spec.date.day(), 29);
let first = NaiveDate::from_ymd(year, 2, 28);
let second = NaiveDate::from_ymd(year, 3, 1);
self.add(Entry {
kind: EntryKind::Birthday,
title,
desc: self.desc(),
source: self.source(),
root: Some(first), // This doesn't matter too much
dates: Some(Dates::new(first, second)),
});
self.add(kind, Some(Dates::new(first, second)));
}
}
}