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

Evaluate REMINDs

Browse source
This commit is contained in:
Joscha 2021-12-21 00:14:14 +01:00
parent fe22c66c5c
commit 66da16f4e3
6 changed files with 115 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/eval/command/date.rs
View file

@ -84,7 +84,7 @@ impl DateSpec {
.map(|date| date.succ())
.unwrap_or(self.start);
let range = s
.range
.range_with_remind()
.expand_by(&self.end_delta)
.move_by(&self.start_delta)
.with_from(range_from)?;
@ -93,7 +93,7 @@ impl DateSpec {
Command::Note(_) => {
let start = self.start;
let range = s
.range
.range_with_remind()
.expand_by(&self.end_delta)
.move_by(&self.start_delta);
(start, false, range)
@ -142,13 +142,13 @@ impl<'a> CommandState<'a> {
}
while start <= range.until() {
let dates = spec.dates(index, start)?;
self.add(self.kind(), Some(dates));
self.add(self.entry_with_remind(self.kind(), Some(dates))?);
start = DateSpec::step(index, start, repeat)?;
}
}
} else {
let dates = spec.dates(index, spec.start)?;
self.add(self.kind(), Some(dates));
self.add(self.entry_with_remind(self.kind(), Some(dates))?);
}
Ok(())
}