matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Replace matching with command chaining

Browse source
This commit is contained in:
Matthias Beyer 2018-01-04 20:26:01 +01:00
parent 7d1d41884c
commit a9135a80fb
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/etc/libimaginteraction/src/ui.rs
View file

@ -70,14 +70,13 @@ pub fn get_id(matches: &ArgMatches) -> Result<Vec<StoreId>> {
pub fn get_or_select_id(matches: &ArgMatches, store_path: &PathBuf) -> Result<Vec<StoreId>> {
use interactor::{pick_file, default_menu_cmd};
match get_id(matches).chain_err(|| IEK::IdSelectingError) {
Ok(v) => Ok(v),
Err(_) => {
get_id(matches)
.chain_err(|| IEK::IdSelectingError)
.or_else(|_| {
let path = store_path.clone();
let p = pick_file(default_menu_cmd, path).chain_err(|| IEK::IdSelectingError)?;
let id = StoreId::new_baseless(p).chain_err(|| IEK::StoreIdParsingError)?;
let p = pick_file(default_menu_cmd, path).chain_err(|| IEK::IdSelectingError)?;
let id = StoreId::new_baseless(p).chain_err(|| IEK::StoreIdParsingError)?;
Ok(vec![id])
},
}
})
}