matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix libimagentryselect::ui::* for new StoreId interface

Browse source
This commit is contained in:
Matthias Beyer 2016-08-25 17:33:36 +02:00
parent 197940ac33
commit 138e506882
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libimagentryselect/src/ui.rs
View file

@ -31,8 +31,13 @@ pub fn get_id(matches: &ArgMatches) -> Option<Vec<StoreId>> {
.map(|vals| {
vals.into_iter()
.map(String::from)
.map(StoreId::from)
.collect()
.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),
})
.collect()
})
}
@ -46,7 +51,15 @@ pub fn get_or_select_id(matches: &ArgMatches, store_path: &PathBuf) -> Option<Ve
None
},
Ok(p) => Some(vec![StoreId::from(p)]),
Ok(p) => {
match StoreId::new_baseless(p) {
Err(e) => {
trace_error(&e);
None
},
Ok(id) => Some(vec![id]),
}
},
}
})
}