matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Adapt for new API of Habit::next_instance_date()

Browse source 
With cd8f0beae8
the interface of `HabitTemplate::next_instance_date()` changed to return
a `Result<Option<_>>` rather than a `Result<_>` because the
next_instance_date could be a None if the Habit was closed already.

This patch adapts imag-habit for this new interface.
This commit is contained in:
Matthias Beyer 2017-12-22 12:26:29 +01:00
parent 501f67dcf2
commit df16d0737e
1 changed files with 51 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
bin/domain/imag-habit/src/main.rs
View file

@ -203,24 +203,6 @@ fn today(rt: &Runtime, future: bool) {
use libimaghabit::error::ResultExt; use libimaghabit::error::ResultExt;
use libimaghabit::error::HabitErrorKind as HEK; use libimaghabit::error::HabitErrorKind as HEK;
fn lister_fn(h: &FileLockEntry) -> Vec<String> {
debug!("Listing: {:?}", h);
let name = h.habit_name().map_err_trace_exit_unwrap(1);
let basedate = h.habit_basedate().map_err_trace_exit_unwrap(1);
let recur = h.habit_recur_spec().map_err_trace_exit_unwrap(1);
let due = h.next_instance_date().map_err_trace_exit_unwrap(1);
let due = libimaghabit::util::date_to_string(&due);
let comm = h.habit_comment().map_err_trace_exit_unwrap(1);
let v = vec![name, basedate, recur, due, comm];
debug!(" -> {:?}", v);
v
}
fn lister_header() -> Vec<String> {
["Name", "Basedate", "Recurr", "Next Due", "Comment"].iter().map(|x| String::from(*x)).collect()
}
let future = { let future = {
if !future { if !future {
rt.cli().subcommand_matches("today").unwrap().is_present("today-show-future") rt.cli().subcommand_matches("today").unwrap().is_present("today-show-future")
@ -248,11 +230,13 @@ fn today(rt: &Runtime, future: bool) {
}) })
.filter(|h| { .filter(|h| {
let due = h.next_instance_date().map_err_trace_exit_unwrap(1); let due = h.next_instance_date().map_err_trace_exit_unwrap(1);
due == today || (future && due > today) // today or in future // today or in future
due.map(|d| d == today || (future && d > today)).unwrap_or(false)
}) })
.collect(); .collect();
relevant.sort_by_key(|h| h.next_instance_date().map_err_trace_exit_unwrap(1)); // unwrap is safe because we filtered above
relevant.sort_by_key(|h| h.next_instance_date().map_err_trace_exit_unwrap(1).unwrap());
relevant relevant
}; };
@ -260,7 +244,7 @@ fn today(rt: &Runtime, future: bool) {
.iter() .iter()
.filter(|h| { .filter(|h| {
let due = h.next_instance_date().map_err_trace_exit_unwrap(1); let due = h.next_instance_date().map_err_trace_exit_unwrap(1);
due == today // relevant today due.map(|d| d == today).unwrap_or(false) // relevant today
}) })
.count() == 0; .count() == 0;
@ -284,9 +268,31 @@ fn today(rt: &Runtime, future: bool) {
let date = element.next_instance_date().map_err_trace_exit_unwrap(1); let date = element.next_instance_date().map_err_trace_exit_unwrap(1);
let name = element.habit_name().map_err_trace_exit_unwrap(1); let name = element.habit_name().map_err_trace_exit_unwrap(1);
if let Some(date) = date { // if there is a date
info!(" * {date}: {name}", date = date, name = name); info!(" * {date}: {name}", date = date, name = name);
} }
}
} else { } else {
fn lister_fn(h: &FileLockEntry) -> Vec<String> {
debug!("Listing: {:?}", h);
let name = h.habit_name().map_err_trace_exit_unwrap(1);
let basedate = h.habit_basedate().map_err_trace_exit_unwrap(1);
let recur = h.habit_recur_spec().map_err_trace_exit_unwrap(1);
let due = h.next_instance_date().map_err_trace_exit_unwrap(1)
.map(date_to_string_helper)
.unwrap_or_else(|| String::from("<finished>"));
let comm = h.habit_comment().map_err_trace_exit_unwrap(1);
let v = vec![name, basedate, recur, due, comm];
debug!(" -> {:?}", v);
v
}
fn lister_header() -> Vec<String> {
["Name", "Basedate", "Recurr", "Next Due", "Comment"]
.iter().map(|x| String::from(*x)).collect()
}
TableLister::new(lister_fn) TableLister::new(lister_fn)
.with_header(lister_header()) .with_header(lister_header())
.with_idx(true) .with_idx(true)
@ -303,8 +309,9 @@ fn list(rt: &Runtime) {
let basedate = h.habit_basedate().map_err_trace_exit_unwrap(1); let basedate = h.habit_basedate().map_err_trace_exit_unwrap(1);
let recur = h.habit_recur_spec().map_err_trace_exit_unwrap(1); let recur = h.habit_recur_spec().map_err_trace_exit_unwrap(1);
let comm = h.habit_comment().map_err_trace_exit_unwrap(1); let comm = h.habit_comment().map_err_trace_exit_unwrap(1);
let due = h.next_instance_date().map_err_trace_exit_unwrap(1); let due = h.next_instance_date().map_err_trace_exit_unwrap(1)
let due = libimaghabit::util::date_to_string(&due); .map(date_to_string_helper)
.unwrap_or_else(|| String::from("<finished>"));
let v = vec![name, basedate, recur, comm, due]; let v = vec![name, basedate, recur, comm, due];
debug!(" -> {:?}", v); debug!(" -> {:?}", v);
@ -414,28 +421,35 @@ fn done(rt: &Runtime) {
.filter_map(|id| get_from_store(rt.store(), id)) .filter_map(|id| get_from_store(rt.store(), id))
.filter(|h| { .filter(|h| {
let due = h.next_instance_date().map_err_trace_exit_unwrap(1); let due = h.next_instance_date().map_err_trace_exit_unwrap(1);
(due == today || due < today) || scmd.is_present("allow-future") due.map(|d| (d == today || d < today) || scmd.is_present("allow-future"))
.unwrap_or(false)
}) })
.filter(|h| { .filter(|h| {
names.contains(&h.habit_name().map_err_trace_exit_unwrap(1)) names.contains(&h.habit_name().map_err_trace_exit_unwrap(1))
}) })
.collect(); .collect();
relevant.sort_by_key(|h| h.next_instance_date().map_err_trace_exit_unwrap(1)); // unwrap is safe because we filtered above
relevant.sort_by_key(|h| h.next_instance_date().map_err_trace_exit_unwrap(1).unwrap());
relevant relevant
}; };
for r in relevant.iter() { for r in relevant.iter() {
let next_instance_name = r.habit_name().map_err_trace_exit_unwrap(1); let next_instance_name = r.habit_name().map_err_trace_exit_unwrap(1);
let next_instance_date = r.next_instance_date().map_err_trace_exit_unwrap(1); let next_instance_date = r.next_instance_date().map_err_trace_exit_unwrap(1);
if let Some(next) = next_instance_date {
debug!("Creating new instance on {:?}", next_instance_date); debug!("Creating new instance on {:?}", next);
r.create_instance_with_date(rt.store(), &next_instance_date) r.create_instance_with_date(rt.store(), &next)
.map_err_trace_exit_unwrap(1); .map_err_trace_exit_unwrap(1);
info!("Done on {date}: {name}", info!("Done on {date}: {name}",
date = libimaghabit::util::date_to_string(&next_instance_date), date = libimaghabit::util::date_to_string(&next),
name = next_instance_name); name = next_instance_name);
} else {
info!("Ignoring: {}, because there is no due date (the habit is finised)",
next_instance_name);
}
} }
info!("Done."); info!("Done.");
} }
@ -454,3 +468,8 @@ fn get_from_store<'a>(store: &'a Store, id: StoreId) -> Option<FileLockEntry<'a>
}, },
} }
} }
fn date_to_string_helper(d: chrono::NaiveDate) -> String {
libimaghabit::util::date_to_string(&d)
}