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

Use simpler date type for entries

Browse source
This commit is contained in:
Joscha 2021-12-04 21:52:23 +01:00
parent de1f4a303f
commit 778576a63c
3 changed files with 88 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/eval/entry.rs
View file

@ -1,8 +1,8 @@
use chrono::NaiveDate;
use crate::files::commands::DoneDate;
use crate::files::Source;
use super::date::Dates;
use super::range::DateRange;
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
@ -21,7 +21,8 @@ pub struct Entry {
pub desc: Vec<String>,
pub source: Source,
pub root: Option<DoneDate>,
pub dates: Option<Dates>,
pub root: Option<NaiveDate>,
}
/// Mode that determines how entries are filtered when they are added to
@ -57,22 +58,22 @@ impl Entries {
fn is_rooted(&self, entry: &Entry) -> bool {
match entry.root {
Some(date) => self.range.contains(date.root()),
Some(date) => self.range.contains(date),
None => false,
}
}
fn is_touching(&self, entry: &Entry) -> bool {
if let Some(date) = entry.root {
if let Some(dates) = entry.dates {
// Inside the range or overlapping it
date.first() <= self.range.until() && self.range.from() <= date.last()
dates.start() <= self.range.until() && self.range.from() <= dates.end()
} else {
false
}
}
fn is_relevant(&self, entry: &Entry) -> bool {
if entry.root.is_none() {
if entry.dates.is_none() {
return true;
}
@ -90,14 +91,14 @@ impl Entries {
// Unfinished tasks before or inside the range
if let EntryKind::Task = entry.kind {
if let Some(date) = entry.root {
if date.first() <= self.range.until() {
if let Some(dates) = entry.dates {
if dates.start() <= self.range.until() {
return true;
}
}
}
return false;
false
}
pub fn add(&mut self, entry: Entry) {