matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add setting to override basepath setting

Browse source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-04-22 12:58:12 +02:00
parent 427eac76fe
commit 9424661393
2 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
bin/core/imag-ref/src/main.rs
View file

@ -86,27 +86,32 @@ fn main() {
} }
fn deref(rt: &Runtime) { fn deref(rt: &Runtime) {
let cmd = rt.cli().subcommand_matches("deref").unwrap(); let cmd = rt.cli().subcommand_matches("deref").unwrap();
let ids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(); let basepath = cmd.value_of("override-basepath");
let cfg = get_ref_config(&rt, "imag-ref").map_err_trace_exit_unwrap(); let ids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap();
let out = rt.stdout(); let cfg = get_ref_config(&rt, "imag-ref").map_err_trace_exit_unwrap();
let out = rt.stdout();
let mut outlock = out.lock(); let mut outlock = out.lock();
ids.into_iter() ids.into_iter()
.for_each(|id| { .for_each(|id| {
match rt.store().get(id.clone()).map_err_trace_exit_unwrap() { match rt.store().get(id.clone()).map_err_trace_exit_unwrap() {
Some(entry) => { Some(entry) => {
entry let r_entry = entry.as_ref_with_hasher::<DefaultHasher>();
.as_ref_with_hasher::<DefaultHasher>()
.get_path(&cfg) if let Some(alternative_basepath) = basepath {
.map_err_trace_exit_unwrap() r_entry.get_path_with_basepath_setting(&cfg, alternative_basepath)
.to_str() } else {
.ok_or_else(|| { r_entry.get_path(&cfg)
error!("Could not transform path into string!"); }
exit(1) .map_err_trace_exit_unwrap()
}) .to_str()
.map(|s| writeln!(outlock, "{}", s)) .ok_or_else(|| {
.ok(); // safe here because we exited already in the error case error!("Could not transform path into string!");
exit(1)
})
.map(|s| writeln!(outlock, "{}", s))
.ok(); // safe here because we exited already in the error case
let _ = rt.report_touched(&id).unwrap_or_exit(); let _ = rt.report_touched(&id).unwrap_or_exit();
}, },

8
bin/core/imag-ref/src/ui.rs
View file

@ -45,6 +45,14 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
.required(false) .required(false)
.multiple(false) .multiple(false)
.help("Ignore store entries which are not refs and do not print error message")) .help("Ignore store entries which are not refs and do not print error message"))
.arg(Arg::with_name("override-basepath")
.long("basepath-setting")
.short("B")
.takes_value(true)
.required(false)
.multiple(false)
.help("Override the basepath key to look up in the configuration"))
) )
.subcommand(SubCommand::with_name("remove") .subcommand(SubCommand::with_name("remove")