matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Refactor, minify edit() impl

This commit is contained in:
Matthias Beyer 2017-08-29 16:50:29 +02:00
parent 356c86fd51
commit 8071c4c721
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
bin/domain/imag-diary/src/edit.rs
View File

@ -32,7 +32,6 @@ use libimagerror::into::IntoError;
use libimagtimeui::datetime::DateTime; use libimagtimeui::datetime::DateTime;
use libimagtimeui::parse::Parse; use libimagtimeui::parse::Parse;
use libimagutil::warn_exit::warn_exit; use libimagutil::warn_exit::warn_exit;
use libimagstore::storeid::IntoStoreId;
use libimagerror::trace::trace_error_exit; use libimagerror::trace::trace_error_exit;
use util::get_diary_name; use util::get_diary_name;
@ -40,40 +39,32 @@ use util::get_diary_name;
pub fn edit(rt: &Runtime) { pub fn edit(rt: &Runtime) {
let diaryname = get_diary_name(rt).unwrap_or_else(|| warn_exit("No diary name", 1)); let diaryname = get_diary_name(rt).unwrap_or_else(|| warn_exit("No diary name", 1));
let datetime : Option<NaiveDateTime> = rt rt.cli()
.cli()
.subcommand_matches("edit") .subcommand_matches("edit")
.unwrap() .unwrap()
.value_of("datetime") .value_of("datetime")
.and_then(DateTime::parse) .and_then(DateTime::parse)
.map(|dt| dt.into()); .map(|dt| dt.into())
.map(|dt: NaiveDateTime| DiaryId::from_datetime(diaryname.clone(), dt))
let to_edit = match datetime { .or_else(|| {
Some(dt) => { rt.store()
let id = match DiaryId::from_datetime(diaryname.clone(), dt).into_storeid() { .get_youngest_entry_id(&diaryname)
Ok(id) => id, .map(|optid| match optid {
Err(e) => trace_error_exit(&e, 1), Ok(id) => id,
}; Err(e) => trace_error_exit(&e, 1),
rt.store().get(id) })
}, })
None => match rt.store().get_youngest_entry_id(&diaryname) { .ok_or_else(|| {
Some(Ok(id)) => match id.into_storeid() { error!("No entries in diary. Aborting");
Ok(sid) => rt.store().get(sid), exit(1)
Err(e) => trace_error_exit(&e, 1), })
}, .and_then(|id| rt.store().get(id))
Some(Err(e)) => trace_error_exit(&e, 1), .map(|opte| match opte {
None => { Some(mut e) => e.edit_content(rt).map_err_into(DEK::IOError),
error!("No entries in diary. Aborting"); None => Err(DEK::EntryNotInDiary.into_error()),
exit(1) })
} .map_err_trace()
} .ok();
};
to_edit.map(|opte| match opte {
Some(mut e) => e.edit_content(rt).map_err_into(DEK::IOError),
None => Err(DEK::EntryNotInDiary.into_error()),
})
.map_err_trace().ok();
} }