From f91d8fe72a0fb1837f140e60f0471cd7fde70453 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 28 Aug 2016 13:00:04 +0200 Subject: [PATCH 1/4] Add error types for libimagentryselect --- libimagentryselect/src/error.rs | 13 +++++++++++++ libimagentryselect/src/lib.rs | 1 + 2 files changed, 14 insertions(+) create mode 100644 libimagentryselect/src/error.rs diff --git a/libimagentryselect/src/error.rs b/libimagentryselect/src/error.rs new file mode 100644 index 00000000..767779e6 --- /dev/null +++ b/libimagentryselect/src/error.rs @@ -0,0 +1,13 @@ +generate_error_module!( + generate_error_types!(EntrySelectError, EntrySelectErrorKind, + CLIError => "Error on commandline", + IdMissingError => "Commandline: ID missing", + StoreIdParsingError => "Error while parsing StoreId", + IdSelectingError => "Error while selecting id" + ); +); + +pub use self::error::EntrySelectError; +pub use self::error::EntrySelectErrorKind; +pub use self::error::MapErrInto; + diff --git a/libimagentryselect/src/lib.rs b/libimagentryselect/src/lib.rs index 11cb6f1a..fd6adadd 100644 --- a/libimagentryselect/src/lib.rs +++ b/libimagentryselect/src/lib.rs @@ -17,6 +17,7 @@ extern crate log; extern crate interactor; extern crate libimagstore; +#[macro_use] extern crate libimagerror; pub mod ui; From 32d463a91ddaf0349760fb6a9f5c7d3e6aa170e9 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 28 Aug 2016 13:00:13 +0200 Subject: [PATCH 2/4] Add Result type for libimagentryselect --- libimagentryselect/src/result.rs | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 libimagentryselect/src/result.rs diff --git a/libimagentryselect/src/result.rs b/libimagentryselect/src/result.rs new file mode 100644 index 00000000..db949cf6 --- /dev/null +++ b/libimagentryselect/src/result.rs @@ -0,0 +1,6 @@ +use std::result::Result as RResult; + +use error::EntrySelectError; + +pub type Result = RResult; + From 6e7aa3c4b70b90524e333bcbbc9910a06e77436c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 28 Aug 2016 13:00:23 +0200 Subject: [PATCH 3/4] Add modules: error, result --- libimagentryselect/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libimagentryselect/src/lib.rs b/libimagentryselect/src/lib.rs index fd6adadd..8f5bcbd3 100644 --- a/libimagentryselect/src/lib.rs +++ b/libimagentryselect/src/lib.rs @@ -20,5 +20,7 @@ extern crate libimagstore; #[macro_use] extern crate libimagerror; +pub mod error; +pub mod result; pub mod ui; From 4bd157914efafd10acb275d3f82da1d4f677f177 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 28 Aug 2016 13:04:09 +0200 Subject: [PATCH 4/4] Rewrite functions to return Result<_> --- libimagentryselect/src/ui.rs | 58 +++++++++++++++++------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/libimagentryselect/src/ui.rs b/libimagentryselect/src/ui.rs index a8d2d9df..e3e41b8a 100644 --- a/libimagentryselect/src/ui.rs +++ b/libimagentryselect/src/ui.rs @@ -3,7 +3,11 @@ use std::path::PathBuf; use clap::{Arg, ArgMatches}; use libimagstore::storeid::StoreId; -use libimagerror::trace::trace_error; +use libimagerror::into::IntoError; + +use result::Result; +use error::MapErrInto; +use error::EntrySelectErrorKind as ESEK; pub fn id_argument<'a, 'b>() -> Arg<'a, 'b> { Arg::with_name(id_argument_name()) @@ -26,41 +30,35 @@ pub fn id_argument_long() -> &'static str { "id" } -pub fn get_id(matches: &ArgMatches) -> Option> { - matches.values_of(id_argument_name()) - .map(|vals| { +pub fn get_id(matches: &ArgMatches) -> Result> { + matches + .values_of(id_argument_name()) + .ok_or(ESEK::IdMissingError.into_error()) + .map_err_into(ESEK::CLIError) + .and_then(|vals| { vals.into_iter() - .map(String::from) - .map(PathBuf::from) - .map(|p| StoreId::new_baseless(p)) /* TODO: Do not hide error here */ - .filter_map(|res| match res { - Err(e) => { trace_error(&e); None }, - Ok(o) => Some(o), + .fold(Ok(vec![]), |acc, elem| { + acc.and_then(|mut v| { + let elem = StoreId::new_baseless(PathBuf::from(String::from(elem))); + let elem = try!(elem.map_err_into(ESEK::StoreIdParsingError)); + v.push(elem); + Ok(v) + }) }) - .collect() }) } -pub fn get_or_select_id(matches: &ArgMatches, store_path: &PathBuf) -> Option> { +pub fn get_or_select_id(matches: &ArgMatches, store_path: &PathBuf) -> Result> { use interactor::{pick_file, default_menu_cmd}; - get_id(matches).or_else(|| { - match pick_file(default_menu_cmd, store_path.clone()) { - Err(e) => { - trace_error(&e); - None - }, - - Ok(p) => { - match StoreId::new_baseless(p) { - Err(e) => { - trace_error(&e); - None - }, - Ok(id) => Some(vec![id]), - } - }, - } - }) + match get_id(matches).map_err_into(ESEK::IdSelectingError) { + Ok(v) => Ok(v), + Err(_) => { + let path = store_path.clone(); + let p = try!(pick_file(default_menu_cmd, path).map_err_into(ESEK::IdSelectingError)); + let id = try!(StoreId::new_baseless(p).map_err_into(ESEK::StoreIdParsingError)); + Ok(vec![id]) + }, + } }