Changeset 895

Timestamp:

Jun 26, 2010, 3:11:21 PM (14 years ago)

Author:

joergs

Message:

completion options handling for sub-commands

File:

• dasscm/trunk/usr/bin/dasscm (modified) (2 diffs)

dasscm/trunk/usr/bin/dasscm

@@ -112 +112 @@
     'commit' => {
         'desc'     => [],
+        ## TODO: only modified files
         'params'   => ["PATH_REPO"],
         'options'  => [ 'verbose', 'message=s' ],
@@ -1582 +1583 @@
             map { m/^$input/ && print $_, "\n" } ( keys %COMMANDS );
         } else {
-
             # complete dasscm parameter
             my $command = get_command_uniform_name( $input[0] );
-            my @params  = get_command_possible_params( $input[0] );
-            if ($verbose) { print "params: ", Dumper(@params); }
-
-            # arg 1:    dasscm
-            # arg 2:    command
-            # arg 3-x:  parameter, therefore parameter_number = $number_arguments - 2
-            my $parameter_number = $number_arguments - 2;
-            if ( defined( $params[$parameter_number] )
-                && $params[$parameter_number] )
-            {
-                my $param = $params[$parameter_number];
-                if ($verbose) { print "param used: ", $param, "\n"; }
-                if ( $param eq "PATH_PROD" ) {
-                    complete_path( $input[ $number_arguments - 1 ] );
-                } elsif ( $param eq "PATH_REPO" ) {
-                    complete_repopath( $input[ $number_arguments - 1 ] );
+            if( $command ) {
+                # remove command
+                shift @input;
+
+                # check and remove options
+                my @options = get_command_possible_options( $command );
+                if( ( not @options ) || ( GetOptionsFromArray( \@input, \%options_complete, @options ) ) ) {
+
+                    my @params  = get_command_possible_params( $command );
+                    if ($verbose) { print "params: ", Dumper(@params); }
+
+                    my $number_arguments = @input;
+
+                    #print "input: ", join( ",", @input ), " (", $number_arguments, ")\n";
+
+                    if( $number_arguments > 0 ) {
+                        my $parameter_number = $number_arguments - 1;
+                        if ( defined( $params[$parameter_number] )
+                            && $params[$parameter_number] )
+                        {
+                            my $param = $params[$parameter_number];
+                            if ($verbose) { print "param used: ", $param, "\n"; }
+                            if ( $param eq "PATH_PROD" ) {
+                                complete_path( $input[ $number_arguments - 1 ] );
+                            } elsif ( $param eq "PATH_REPO" ) {
+                                complete_repopath( $input[ $number_arguments - 1 ] );
+                            }
+                        }
+                    }
                 }
             }