matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Remove calls to trace_error_exit

Browse source
This commit is contained in:
Matthias Beyer 2018-02-11 19:31:53 +01:00
parent a43232230b
commit 1f4c0cafe4
1 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
bin/core/imag-tag/src/main.rs
View file

@ -46,7 +46,8 @@ use libimagrt::runtime::Runtime;
use libimagrt::setup::generate_runtime_setup; use libimagrt::setup::generate_runtime_setup;
use libimagentrytag::tagable::Tagable; use libimagentrytag::tagable::Tagable;
use libimagentrytag::tag::Tag; use libimagentrytag::tag::Tag;
use libimagerror::trace::{trace_error, trace_error_exit}; use libimagerror::trace::trace_error;
use libimagerror::trace::MapErrTrace;
use libimagstore::storeid::StoreId; use libimagstore::storeid::StoreId;
use libimagutil::warn_exit::warn_exit; use libimagutil::warn_exit::warn_exit;
@ -86,12 +87,7 @@ fn main() {
} }
fn alter(rt: &Runtime, id: PathBuf, add: Option<Vec<Tag>>, rem: Option<Vec<Tag>>) { fn alter(rt: &Runtime, id: PathBuf, add: Option<Vec<Tag>>, rem: Option<Vec<Tag>>) {
let path = { let path = StoreId::new(Some(rt.store().path().clone()), id).map_err_trace_exit_unwrap(1);
match StoreId::new(Some(rt.store().path().clone()), id) {
Err(e) => trace_error_exit(&e, 1),
Ok(s) => s,
}
};
debug!("path = {:?}", path); debug!("path = {:?}", path);
match rt.store().get(path) { match rt.store().get(path) {
@ -138,20 +134,12 @@ fn alter(rt: &Runtime, id: PathBuf, add: Option<Vec<Tag>>, rem: Option<Vec<Tag>>
} }
fn list(id: PathBuf, rt: &Runtime) { fn list(id: PathBuf, rt: &Runtime) {
let path = match StoreId::new(Some(rt.store().path().clone()), id) { let path = StoreId::new(Some(rt.store().path().clone()), id).map_err_trace_exit_unwrap(1);
Err(e) => trace_error_exit(&e, 1),
Ok(s) => s,
};
debug!("path = {:?}", path); debug!("path = {:?}", path);
let entry = match rt.store().get(path.clone()) { let entry = match rt.store().get(path.clone()).map_err_trace_exit_unwrap(1) {
Ok(Some(e)) => e, Some(e) => e,
Ok(None) => warn_exit("No entry found.", 1), None => warn_exit("No entry found.", 1),
Err(e) => {
warn!("Could not get entry '{:?}'", path);
trace_error_exit(&e, 1);
},
}; };
let scmd = rt.cli().subcommand_matches("list").unwrap(); // safe, we checked in main() let scmd = rt.cli().subcommand_matches("list").unwrap(); // safe, we checked in main()
@ -166,11 +154,7 @@ fn list(id: PathBuf, rt: &Runtime) {
comm_out = true; comm_out = true;
} }
let tags = entry.get_tags(); let tags = entry.get_tags().map_err_trace_exit_unwrap(1);
if tags.is_err() {
trace_error_exit(&tags.unwrap_err(), 1);
}
let tags = tags.unwrap();
if json_out { if json_out {
unimplemented!() unimplemented!()