From 30d2e99c77b0ca23ddb1b5d0545cd9c8e54e5bbf Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 12 Dec 2018 12:18:28 +0100 Subject: [PATCH] implement completion functions --- src/bin/pbs.rs | 1 + src/cli/command.rs | 38 ++++++++++++++++++++++++++++++++------ src/config/datastore.rs | 18 ++++++++++++++++++ 3 files changed, 51 insertions(+), 6 deletions(-) diff --git a/src/bin/pbs.rs b/src/bin/pbs.rs index 22ffea52..01547eeb 100644 --- a/src/bin/pbs.rs +++ b/src/bin/pbs.rs @@ -18,6 +18,7 @@ fn datastore_commands() -> CommandLineInterface { .insert("remove", CliCommand::new(datastore::delete()) .arg_param(vec!["name"]) + .completion_cb("name", apitest::config::datastore::complete_datastore_name) .into()); cmd_def.into() diff --git a/src/cli/command.rs b/src/cli/command.rs index 1f81a9aa..011e453c 100644 --- a/src/cli/command.rs +++ b/src/cli/command.rs @@ -84,8 +84,22 @@ fn handle_nested_command(def: &CliCommandMap, mut args: Vec) -> Result<( Ok(()) } -fn print_property_completion(schema: &Schema, arg: &str) { - // fixme: implement completion functions +fn print_property_completion( + schema: &Schema, + name: &str, + completion_functions: &HashMap, + arg: &str) +{ + if let Some(callback) = completion_functions.get(name) { + let list = (callback)(); + for value in list { + if value.starts_with(arg) { + println!("{}", value); + } + } + return; + } + if let Schema::String(StringSchema { format: Some(format), ..} ) = schema { if let ApiStringFormat::Enum(list) = format.as_ref() { for value in list { @@ -133,9 +147,9 @@ fn print_simple_completion( } if let Some((_, schema)) = cli_cmd.info.parameters.properties.get(prop_name) { if args.is_empty() { - print_property_completion(schema, ""); + print_property_completion(schema, prop_name, &cli_cmd.completion_functions, ""); } else { - print_property_completion(schema, &args[0]); + print_property_completion(schema, prop_name, &cli_cmd.completion_functions, &args[0]); } } return; @@ -152,7 +166,7 @@ fn print_simple_completion( if last.starts_with("--") && last.len() > 2 { let prop_name = &last[2..]; if let Some((_, schema)) = cli_cmd.info.parameters.properties.get(prop_name) { - print_property_completion(schema, &prefix); + print_property_completion(schema, prop_name, &cli_cmd.completion_functions, &prefix); } return; } @@ -248,16 +262,23 @@ pub fn run_cli_command(def: &CommandLineInterface) -> Result<(), Error> { } } +pub type CompletionFunction = fn() -> Vec; + pub struct CliCommand { pub info: ApiMethod, pub arg_param: Vec<&'static str>, pub fixed_param: Vec<&'static str>, + pub completion_functions: HashMap, } impl CliCommand { pub fn new(info: ApiMethod) -> Self { - Self { info, arg_param: vec![], fixed_param: vec![] } + Self { + info, arg_param: vec![], + fixed_param: vec![], + completion_functions: HashMap::new(), + } } pub fn arg_param(mut self, names: Vec<&'static str>) -> Self { @@ -269,6 +290,11 @@ impl CliCommand { self.fixed_param = args; self } + + pub fn completion_cb(mut self, param_name: &str, cb: CompletionFunction) -> Self { + self.completion_functions.insert(param_name.into(), cb); + self + } } pub struct CliCommandMap { diff --git a/src/config/datastore.rs b/src/config/datastore.rs index 264f0899..afa44453 100644 --- a/src/config/datastore.rs +++ b/src/config/datastore.rs @@ -76,3 +76,21 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { Ok(()) } + +// shell completion helper +pub fn complete_datastore_name() -> Vec { + + let data = match config() { + Ok(data) => data, + Err(_) => return vec![], + }; + + //let test = data.sections + let mut res = vec![]; + + for (id, _) in data.sections { + res.push(id); + } + + res +}