From 13e9ee3ffabca59aacb67f3d0a4b5f3333e5bb48 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 5 Dec 2017 20:27:33 +0100 Subject: [PATCH] Add Habit::next_instance_date() --- lib/domain/libimaghabit/src/habit.rs | 45 ++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/lib/domain/libimaghabit/src/habit.rs b/lib/domain/libimaghabit/src/habit.rs index 3da9395c..9a8196a5 100644 --- a/lib/domain/libimaghabit/src/habit.rs +++ b/lib/domain/libimaghabit/src/habit.rs @@ -57,6 +57,9 @@ pub trait HabitTemplate : Sized { /// Get instances for this template fn linked_instances(&self) -> Result; + /// Get the date of the next date when the habit should be done + fn next_instance_date(&self) -> Result; + /// Check whether the instance is a habit by checking its headers for the habit data fn is_habit_template(&self) -> Result; @@ -100,6 +103,48 @@ impl HabitTemplate for Entry { Ok(HabitInstanceStoreIdIterator::new(sidi)) } + /// Get the date of the next date when the habit should be done + fn next_instance_date(&self) -> Result { + use kairos::timetype::TimeType; + use kairos::parser::parse; + use kairos::parser::Parsed; + use kairos::iter::extensions::Every; + + let date_from_s = |r: String| -> Result { + match parse(&r)? { + Parsed::TimeType(tt) => Ok(tt), + Parsed::Iterator(_) => { + Err(format!("'{}' yields an iterator. Cannot use.", r).into()) + }, + } + }; + + let today = TimeType::today(); + let today = today.get_moment().unwrap(); // we know this is safe. + debug!("Today is {:?}", today); + + let basedate = date_from_s(self.habit_basedate()?)?; + debug!("Basedate is {:?}", today); + + let increment = date_from_s(self.habit_recur_spec()?)?; + debug!("Increment is {:?}", today); + + for element in basedate.every(increment)? { + debug!("Calculating: {:?}", element); + let element = element?.calculate()?; + if let Some(ndt) = element.get_moment() { + if ndt > today { + debug!("-> {:?} > {:?}", ndt, today); + return Ok(ndt.date()) + } + } else { + return Err("Iterator seems to return bogus values.".to_owned().into()); + } + } + + unreachable!() // until we have habit-end-date support + } + /// Check whether the instance is a habit by checking its headers for the habit data fn is_habit_template(&self) -> Result { [