TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

slightly optimize command completer

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-08 02:59:58 +00:00
parent 8e3be6feb0
commit 8296e0ed67
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/admin/handler.rs
View file

@ -132,11 +132,13 @@ fn parse_admin_command(command_line: &str) -> Result<AdminCommand, String> {
} }
fn complete_admin_command(mut cmd: clap::Command, line: &str) -> String { fn complete_admin_command(mut cmd: clap::Command, line: &str) -> String {
let mut ret = Vec::<String>::new();
let argv = parse_command_line(line); let argv = parse_command_line(line);
let mut ret = Vec::<String>::with_capacity(argv.len().saturating_add(1));
'token: for token in argv.into_iter().skip(1) { 'token: for token in argv.into_iter().skip(1) {
let mut choice = Vec::new();
let cmd_ = cmd.clone(); let cmd_ = cmd.clone();
let mut choice = Vec::new();
for sub in cmd_.get_subcommands() { for sub in cmd_.get_subcommands() {
let name = sub.get_name(); let name = sub.get_name();
if *name == token { if *name == token {
@ -144,20 +146,20 @@ fn complete_admin_command(mut cmd: clap::Command, line: &str) -> String {
ret.push(token); ret.push(token);
cmd.clone_from(sub); cmd.clone_from(sub);
continue 'token; continue 'token;
} } else if name.starts_with(&token) {
if name.starts_with(&token) {
// partial match; add to choices // partial match; add to choices
choice.push(name); choice.push(name);
} }
} }
if choice.is_empty() { if choice.len() == 1 {
// One choice. Add extra space because it's complete
let choice = *choice.first().expect("only choice");
ret.push(choice.to_owned());
ret.push(String::new());
} else if choice.is_empty() {
// Nothing found, return original string // Nothing found, return original string
ret.push(token); ret.push(token);
} else if choice.len() == 1 {
// One choice. Add extra space because it's complete
ret.push((*choice.first().expect("only choice")).to_owned());
ret.push(String::new());
} else { } else {
// Find the common prefix // Find the common prefix
ret.push(common_prefix(&choice).into()); ret.push(common_prefix(&choice).into());
@ -168,9 +170,8 @@ fn complete_admin_command(mut cmd: clap::Command, line: &str) -> String {
} }
// Return from no completion. Needs a space though. // Return from no completion. Needs a space though.
let mut ret = ret.join(" "); ret.push(String::new());
ret.push(' '); ret.join(" ")
ret
} }
// Parse chat messages from the admin room into an AdminCommand object // Parse chat messages from the admin room into an AdminCommand object