cli: refactor comand name helper

[pve-common.git] / src / PVE / CLIHandler.pm

diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm
index efc8a1a2bb4ffe67e0a94ac75504378ce0ba2611..c3829694b77e46bee13acb7a2904da1664425b8a 100644 (file)
--- a/src/PVE/CLIHandler.pm
+++ b/src/PVE/CLIHandler.pm
@@ -14,37 +14,24 @@ my $cmddef;
 my $exename;
 my $cli_handler_class;
 
+my $assert_initialized = sub {
+    my @caller = caller;
+    die "$caller[0]:$caller[2] - not initialized\n"
+       if !($cmddef && $exename && $cli_handler_class);
+};
+
 my $expand_command_name = sub {
     my ($def, $cmd) = @_;
 
     if (!$def->{$cmd}) {
-       my $expanded;
-       for my $k (keys(%$def)) {
-           if ($k =~ m/^$cmd/) {
-               if ($expanded) {
-                   $expanded = undef; # more than one match
-                   last;
-               } else {
-                   $expanded = $k;
-               }
-           }
-       }
-       $cmd = $expanded if $expanded;
+       my @expanded = grep { /^\Q$cmd\E/ } keys %$def;
+       return $expanded[0] if scalar(@expanded) == 1; # enforce exact match
     }
     return $cmd;
 };
 
 my $complete_command_names = sub {
-    my $res = [];
-
-    return if ref($cmddef) ne 'HASH';
-
-    foreach my $cmd (keys %$cmddef) {
-       next if $cmd eq 'help';
-       push @$res, $cmd;
-    }
-
-    return $res;
+    return [ sort keys %$cmddef ];
 };
 
 __PACKAGE__->register_method ({
@@ -73,7 +60,7 @@ __PACKAGE__->register_method ({
     code => sub {
        my ($param) = @_;
 
-       die "not initialized" if !($cmddef && $exename && $cli_handler_class);
+       $assert_initialized->();
 
        my $cmd = $param->{cmd};
 
@@ -114,7 +101,7 @@ __PACKAGE__->register_method ({
 sub print_simple_asciidoc_synopsis {
     my ($class, $name, $arg_param, $uri_param) = @_;
 
-    die "not initialized" if !$cli_handler_class;
+    $assert_initialized->();
 
     my $pwcallback = $cli_handler_class->can('read_password');
     my $stringfilemap = $cli_handler_class->can('string_param_file_mapping');
@@ -129,7 +116,7 @@ sub print_simple_asciidoc_synopsis {
 
 sub print_asciidoc_synopsis {
 
-    die "not initialized" if !($cmddef && $exename && $cli_handler_class);
+    $assert_initialized->();
 
     my $pwcallback = $cli_handler_class->can('read_password');
     my $stringfilemap = $cli_handler_class->can('string_param_file_mapping');
@@ -157,7 +144,7 @@ sub print_asciidoc_synopsis {
 
 sub print_usage_verbose {
 
-    die "not initialized" if !($cmddef && $exename && $cli_handler_class);
+    $assert_initialized->();
 
     my $pwcallback = $cli_handler_class->can('read_password');
     my $stringfilemap = $cli_handler_class->can('string_param_file_mapping');
@@ -179,7 +166,7 @@ sub sorted_commands {
 sub print_usage_short {
     my ($fd, $msg) = @_;
 
-    die "not initialized" if !($cmddef && $exename && $cli_handler_class);
+    $assert_initialized->();
 
     my $pwcallback = $cli_handler_class->can('read_password');
     my $stringfilemap = $cli_handler_class->can('string_param_file_mapping');
@@ -198,7 +185,7 @@ sub print_usage_short {
 }
 
 my $print_bash_completion = sub {
-    my ($cmddef, $simple_cmd, $bash_command, $cur, $prev) = @_;
+    my ($simple_cmd, $bash_command, $cur, $prev) = @_;
 
     my $debug = 0;
 
@@ -351,12 +338,11 @@ sub generate_asciidoc_synopsis {
 
     no strict 'refs';
     my $def = ${"${class}::cmddef"};
+    $cmddef = $def;
 
     if (ref($def) eq 'ARRAY') {
        print_simple_asciidoc_synopsis(@$def);
     } else {
-       $cmddef = $def;
-
        $cmddef->{help} = [ __PACKAGE__, 'help', ['cmd'] ];
 
        print_asciidoc_synopsis();
@@ -371,16 +357,14 @@ sub setup_environment {
 }
 
 my $handle_cmd  = sub {
-    my ($def, $cmdname, $cmd, $args, $pwcallback, $preparefunc, $stringfilemap) = @_;
-
-    $cmddef = $def;
-    $exename = $cmdname;
+    my ($args, $pwcallback, $preparefunc, $stringfilemap) = @_;
 
     $cmddef->{help} = [ __PACKAGE__, 'help', ['cmd'] ];
 
     # call verifyapi before setup_environment(), because we do not want to
     # execute any real code in this case
 
+    my $cmd = shift @$args;
     if (!$cmd) {
        print_usage_short (\*STDERR, "no command specified");
        exit (-1);
@@ -392,7 +376,7 @@ my $handle_cmd  = sub {
     $cli_handler_class->setup_environment();
 
     if ($cmd eq 'bashcomplete') {
-       &$print_bash_completion($cmddef, 0, @$args);
+       &$print_bash_completion(undef, @$args);
        return;
     }
 
@@ -414,9 +398,9 @@ my $handle_cmd  = sub {
 };
 
 my $handle_simple_cmd = sub {
-    my ($def, $args, $pwcallback, $preparefunc, $stringfilemap) = @_;
+    my ($args, $pwcallback, $preparefunc, $stringfilemap) = @_;
 
-    my ($class, $name, $arg_param, $uri_param, $outsub) = @{$def};
+    my ($class, $name, $arg_param, $uri_param, $outsub) = @{$cmddef};
     die "no class specified" if !$class;
 
     if (scalar(@$args) >= 1) {
@@ -436,7 +420,7 @@ my $handle_simple_cmd = sub {
     if (scalar(@$args) >= 1) {
        if ($args->[0] eq 'bashcomplete') {
            shift @$args;
-           &$print_bash_completion({ $name => $def }, $name, @$args);
+           &$print_bash_completion($name, @$args);
            return;
        }
     }
@@ -472,14 +456,12 @@ sub run_cli_handler {
     initlog($exename);
 
     no strict 'refs';
-    my $def = ${"${class}::cmddef"};
+    $cmddef = ${"${class}::cmddef"};
 
-    if (ref($def) eq 'ARRAY') {
-       &$handle_simple_cmd($def, \@ARGV, $pwcallback, $preparefunc, $stringfilemap);
+    if (ref($cmddef) eq 'ARRAY') {
+       &$handle_simple_cmd(\@ARGV, $pwcallback, $preparefunc, $stringfilemap);
     } else {
-       $cmddef = $def;
-       my $cmd = shift @ARGV;
-       &$handle_cmd($cmddef, $exename, $cmd, \@ARGV, $pwcallback, $preparefunc, $stringfilemap);
+       &$handle_cmd(\@ARGV, $pwcallback, $preparefunc, $stringfilemap);
     }
 
     exit 0;