Changeset 159

Timestamp:

06/02/04 02:46:15 (4 years ago)

Author:

svn

Message:

Refactored HELP extraction into a subroutine.

Files:

• manage/trunk/CLI/CLI.pm (modified) (3 diffs)

manage/trunk/CLI/CLI.pm

@@ -121 +121 @@
-                $help .= $format->format($cmd{HELPHEADER}) . "\n" if $cmd{HELPHEADER};
-
+        my $process_help = sub {
+                my $help = shift;
+                my $commands = shift;
+                my $command = shift;
+                my $type = ref($help);
+
+                        if ($type eq 'ARRAY') {
+                                $commands->{$help->[0]} = $help->[1];
+                        } elsif ($type eq 'CODE') {
+                                %$commands = (%$commands, $help->());
+                        } elsif (!$type) {
+                                $commands->{$command} = $help;
+                        }
+                };
+
-                for my $key (keys %cmd) {
-                        next if $key =~ /^[A-Z]+$/;
-
-                        if (ref($cmd{$key}) eq 'HASH' and $cmd{$key}->{HELP}) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                        } else {
-                                $commands{$key} = '';
@@ -149 +151 @@
-                if ($cmd{ACTION}) {
-                        if (ref($cmd{ACTION}) eq 'HASH' and $cmd{ACTION}->{HELP}) {
-
-
-
-
-
-
-
+
-                        } elsif ($cmd{ACTIONHELP}) {
-                                $commands{'<eol>'} = $cmd{ACTIONHELP};
-                        } elsif ($cmd{HELP}) {
-
-
-
-
-
-
-
+
-                        } else {
-                                $commands{'<eol>'} = "\e[31m\e[1m(need ACTIONHELP, ACTION->HELP or HELP entry)\e[0m";
@@ -225 +215 @@
-                        if (defined($token)) {
-                        my @candidates = grep(/^(?:\d+\)(?:\$))?$token/, keys(%cmd));
+
-                                $unique = 1 if @candidates == 1 and $candidates[0] eq $key;
-                        }