Change create() to check config and commandline whether entry should be created timed or not
This commit is contained in:
parent
dbf529e427
commit
dc78c0e448
1 changed files with 33 additions and 20 deletions
|
@ -17,8 +17,6 @@
|
||||||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
//
|
//
|
||||||
|
|
||||||
use std::process::exit;
|
|
||||||
|
|
||||||
use clap::ArgMatches;
|
use clap::ArgMatches;
|
||||||
|
|
||||||
use libimagdiary::diary::Diary;
|
use libimagdiary::diary::Diary;
|
||||||
|
@ -28,11 +26,14 @@ use libimagdiary::error::ResultExt;
|
||||||
use libimagentryedit::edit::Edit;
|
use libimagentryedit::edit::Edit;
|
||||||
use libimagrt::runtime::Runtime;
|
use libimagrt::runtime::Runtime;
|
||||||
use libimagerror::trace::trace_error_exit;
|
use libimagerror::trace::trace_error_exit;
|
||||||
|
use libimagerror::trace::MapErrTrace;
|
||||||
use libimagutil::warn_exit::warn_exit;
|
use libimagutil::warn_exit::warn_exit;
|
||||||
use libimagstore::store::FileLockEntry;
|
use libimagstore::store::FileLockEntry;
|
||||||
use libimagstore::store::Store;
|
use libimagstore::store::Store;
|
||||||
|
|
||||||
use util::get_diary_name;
|
use util::get_diary_name;
|
||||||
|
use util::get_diary_timed_config;
|
||||||
|
use util::Timed;
|
||||||
|
|
||||||
pub fn create(rt: &Runtime) {
|
pub fn create(rt: &Runtime) {
|
||||||
let diaryname = get_diary_name(rt)
|
let diaryname = get_diary_name(rt)
|
||||||
|
@ -57,13 +58,33 @@ pub fn create(rt: &Runtime) {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn create_entry<'a>(diary: &'a Store, diaryname: &str, rt: &Runtime) -> FileLockEntry<'a> {
|
fn create_entry<'a>(diary: &'a Store, diaryname: &str, rt: &Runtime) -> FileLockEntry<'a> {
|
||||||
|
use util::parse_timed_string;
|
||||||
|
|
||||||
let create = rt.cli().subcommand_matches("create").unwrap();
|
let create = rt.cli().subcommand_matches("create").unwrap();
|
||||||
let entry = if !create.is_present("timed") {
|
|
||||||
|
let create_timed = create.value_of("timed")
|
||||||
|
.map(|t| parse_timed_string(t, diaryname).map_err_trace_exit(1).unwrap())
|
||||||
|
.map(Some)
|
||||||
|
.unwrap_or_else(|| match get_diary_timed_config(rt, diaryname) {
|
||||||
|
Err(e) => trace_error_exit(&e, 1),
|
||||||
|
Ok(Some(t)) => Some(t),
|
||||||
|
Ok(None) => {
|
||||||
|
warn!("Missing config: 'diary.diaries.{}.timed'", diaryname);
|
||||||
|
warn!("Assuming 'false'");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let entry = match create_timed {
|
||||||
|
Some(timed) => {
|
||||||
|
let id = create_id_from_clispec(&create, &diaryname, timed);
|
||||||
|
diary.retrieve(id).chain_err(|| DEK::StoreReadError)
|
||||||
|
},
|
||||||
|
|
||||||
|
None => {
|
||||||
debug!("Creating non-timed entry");
|
debug!("Creating non-timed entry");
|
||||||
diary.new_entry_today(diaryname)
|
diary.new_entry_today(diaryname)
|
||||||
} else {
|
}
|
||||||
let id = create_id_from_clispec(&create, &diaryname);
|
|
||||||
diary.retrieve(id).chain_err(|| DEK::StoreReadError)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
match entry {
|
match entry {
|
||||||
|
@ -76,7 +97,7 @@ fn create_entry<'a>(diary: &'a Store, diaryname: &str, rt: &Runtime) -> FileLock
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
fn create_id_from_clispec(create: &ArgMatches, diaryname: &str) -> DiaryId {
|
fn create_id_from_clispec(create: &ArgMatches, diaryname: &str, timed_type: Timed) -> DiaryId {
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|
||||||
let get_hourly_id = |create: &ArgMatches| -> DiaryId {
|
let get_hourly_id = |create: &ArgMatches| -> DiaryId {
|
||||||
|
@ -94,13 +115,13 @@ fn create_id_from_clispec(create: &ArgMatches, diaryname: &str) -> DiaryId {
|
||||||
time.with_hour(hr)
|
time.with_hour(hr)
|
||||||
};
|
};
|
||||||
|
|
||||||
match create.value_of("timed") {
|
match timed_type {
|
||||||
Some("h") | Some("hourly") => {
|
Timed::Hourly => {
|
||||||
debug!("Creating hourly-timed entry");
|
debug!("Creating hourly-timed entry");
|
||||||
get_hourly_id(create)
|
get_hourly_id(create)
|
||||||
},
|
},
|
||||||
|
|
||||||
Some("m") | Some("minutely") => {
|
Timed::Minutely => {
|
||||||
let time = get_hourly_id(create);
|
let time = get_hourly_id(create);
|
||||||
let min = create
|
let min = create
|
||||||
.value_of("minute")
|
.value_of("minute")
|
||||||
|
@ -114,14 +135,6 @@ fn create_id_from_clispec(create: &ArgMatches, diaryname: &str) -> DiaryId {
|
||||||
|
|
||||||
time.with_minute(min)
|
time.with_minute(min)
|
||||||
},
|
},
|
||||||
|
|
||||||
Some(_) => {
|
|
||||||
warn!("Timed creation failed: Unknown spec '{}'",
|
|
||||||
create.value_of("timed").unwrap());
|
|
||||||
exit(1);
|
|
||||||
},
|
|
||||||
|
|
||||||
None => warn_exit("Unexpected error, cannot continue", 1)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue