matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Refactor error handling

Browse source
This commit is contained in:
Matthias Beyer 2018-02-11 13:49:45 +01:00
parent 074f9826fd
commit 7892782675
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bin/domain/imag-todo/src/main.rs
View file

@ -33,7 +33,7 @@ use std::io::stdin;
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
use libimagrt::setup::generate_runtime_setup; use libimagrt::setup::generate_runtime_setup;
use libimagtodo::taskstore::TaskStore; use libimagtodo::taskstore::TaskStore;
use libimagerror::trace::{MapErrTrace, trace_error, trace_error_exit}; use libimagerror::trace::{MapErrTrace, trace_error};
mod ui; mod ui;
@ -62,10 +62,12 @@ fn tw_hook(rt: &Runtime) {
// implements BufRead which is required for `Store::import_task_from_reader()` // implements BufRead which is required for `Store::import_task_from_reader()`
let stdin = stdin.lock(); let stdin = stdin.lock();
match rt.store().import_task_from_reader(stdin) { let (_, line, uuid ) = rt
Ok((_, line, uuid)) => println!("{}\nTask {} stored in imag", line, uuid), .store()
Err(e) => trace_error_exit(&e, 1), .import_task_from_reader(stdin)
} .map_err_trace_exit_unwrap(1);
println!("{}\nTask {} stored in imag", line, uuid);
} else if subcmd.is_present("delete") { } else if subcmd.is_present("delete") {
// The used hook is "on-modify". This hook gives two json-objects // The used hook is "on-modify". This hook gives two json-objects
// per usage und wants one (the second one) back. // per usage und wants one (the second one) back.
@ -126,8 +128,8 @@ fn list(rt: &Runtime) {
.args(&uuids) .args(&uuids)
.spawn() .spawn()
.unwrap_or_else(|e| { .unwrap_or_else(|e| {
trace_error(&e); error!("Failed to execute `task` on the commandline: {:?}. I'm dying now.", e);
panic!("Failed to execute `task` on the commandline. I'm dying now."); ::std::process::exit(1)
}) })
.wait_with_output() .wait_with_output()
.unwrap_or_else(|e| panic!("failed to unwrap output: {}", e)); .unwrap_or_else(|e| panic!("failed to unwrap output: {}", e));