tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/cli/command.rs: fix completion - never display argument parameters as option

Browse Source
This commit is contained in:
Dietmar Maurer 2019-03-12 14:53:41 +01:00
parent 496a67846f
commit 1a71509aad
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cli/command.rs
View File

@ -438,7 +438,8 @@ fn record_done_argument(done: &mut HashMap<String, String>, parameters: &ObjectS
fn print_simple_completion( fn print_simple_completion(
cli_cmd: &CliCommand, cli_cmd: &CliCommand,
done: &mut HashMap<String, String>, done: &mut HashMap<String, String>,
arg_param: &[&str], all_arg_param: &[&str], // this is always the full list
arg_param: &[&str], // we remove done arguments
args: &[String], args: &[String],
) { ) {
// fixme: arg_param, fixed_param // fixme: arg_param, fixed_param
@ -448,7 +449,7 @@ fn print_simple_completion(
let prop_name = arg_param[0]; let prop_name = arg_param[0];
if args.len() > 1 { if args.len() > 1 {
record_done_argument(done, &cli_cmd.info.parameters, prop_name, &args[0]); record_done_argument(done, &cli_cmd.info.parameters, prop_name, &args[0]);
print_simple_completion(cli_cmd, done, &arg_param[1..], &args[1..]); print_simple_completion(cli_cmd, done, arg_param, &arg_param[1..], &args[1..]);
return; return;
} else if args.len() == 1 { } else if args.len() == 1 {
record_done_argument(done, &cli_cmd.info.parameters, prop_name, &args[0]); record_done_argument(done, &cli_cmd.info.parameters, prop_name, &args[0]);
@ -485,6 +486,7 @@ fn print_simple_completion(
for (name, (_optional, _schema)) in &cli_cmd.info.parameters.properties { for (name, (_optional, _schema)) in &cli_cmd.info.parameters.properties {
if done.contains_key(*name) { continue; } if done.contains_key(*name) { continue; }
if all_arg_param.contains(name) { continue; }
let option = String::from("--") + name; let option = String::from("--") + name;
if option.starts_with(prefix) { if option.starts_with(prefix) {
println!("{}", option); println!("{}", option);
@ -498,7 +500,7 @@ fn print_help_completion(def: &CommandLineInterface, help_cmd: &CliCommand, args
match def { match def {
CommandLineInterface::Simple(_) => { CommandLineInterface::Simple(_) => {
print_simple_completion(help_cmd, &mut done, &help_cmd.arg_param, args); print_simple_completion(help_cmd, &mut done, &help_cmd.arg_param, &help_cmd.arg_param, args);
return; return;
} }
CommandLineInterface::Nested(map) => { CommandLineInterface::Nested(map) => {
@ -512,7 +514,7 @@ fn print_help_completion(def: &CommandLineInterface, help_cmd: &CliCommand, args
let first = &args[0]; let first = &args[0];
if first.starts_with("-") { if first.starts_with("-") {
print_simple_completion(help_cmd, &mut done, &help_cmd.arg_param, args); print_simple_completion(help_cmd, &mut done, &help_cmd.arg_param, &help_cmd.arg_param, args);
return; return;
} }
@ -538,7 +540,7 @@ fn print_nested_completion(def: &CommandLineInterface, args: &[String]) {
cli_cmd.fixed_param.iter().map(|(key, value)| { cli_cmd.fixed_param.iter().map(|(key, value)| {
record_done_argument(&mut done, &cli_cmd.info.parameters, &key, &value); record_done_argument(&mut done, &cli_cmd.info.parameters, &key, &value);
}); });
print_simple_completion(cli_cmd, &mut done, &cli_cmd.arg_param, args); print_simple_completion(cli_cmd, &mut done, &cli_cmd.arg_param, &cli_cmd.arg_param, args);
return; return;
} }
CommandLineInterface::Nested(map) => { CommandLineInterface::Nested(map) => {