matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Refactor imag-diary

Browse source
This commit is contained in:
Matthias Beyer 2018-02-08 15:20:38 +01:00
parent 5e6eb1d249
commit 10e7a82a45
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bin/domain/imag-diary/src/create.rs
View file

@ -58,7 +58,7 @@ fn create_entry<'a>(diary: &'a Store, diaryname: &str, rt: &Runtime) -> FileLock
let create = rt.cli().subcommand_matches("create").unwrap(); let create = rt.cli().subcommand_matches("create").unwrap();
let create_timed = create.value_of("timed") create.value_of("timed")
.map(|t| parse_timed_string(t, diaryname).map_err_trace_exit_unwrap(1)) .map(|t| parse_timed_string(t, diaryname).map_err_trace_exit_unwrap(1))
.map(Some) .map(Some)
.unwrap_or_else(|| { .unwrap_or_else(|| {
@ -70,24 +70,20 @@ fn create_entry<'a>(diary: &'a Store, diaryname: &str, rt: &Runtime) -> FileLock
None None
} }
} }
}); })
.map(|timed| {
let entry = match create_timed {
Some(timed) => {
let id = create_id_from_clispec(&create, &diaryname, timed); let id = create_id_from_clispec(&create, &diaryname, timed);
diary.retrieve(id).chain_err(|| DEK::StoreReadError) diary.retrieve(id).chain_err(|| DEK::StoreReadError)
}, })
.unwrap_or_else(|| {
None => {
debug!("Creating non-timed entry"); debug!("Creating non-timed entry");
diary.new_entry_today(diaryname) diary.new_entry_today(diaryname)
} })
}; .map(|e| {
let e = entry.map_err_trace_exit_unwrap(1);
debug!("Created: {}", e.get_location()); debug!("Created: {}", e.get_location());
e e
})
.map_err_trace_exit_unwrap(1)
} }