Changeset 887

Timestamp:

Jun 26, 2010, 12:03:52 AM (14 years ago)

Author:

joergs

Message:

added function for bash completion and did code cleanup

Location:

dasscm/trunk

Files:

• etc/bash_completion.d/dasscm.sh (deleted)
• usr/bin/dasscm (modified) (10 diffs)

dasscm/trunk/usr/bin/dasscm

@@ -62 +62 @@
     'permissions' => 'permissions',
     'cleanup' => 'cleanup',
-    'complete' => 'complete'
+    'complete' => 'complete',
+    'complete_path' => 'complete_path',
+    'complete_repopath' => 'complete_repopath',
 );
 
@@ -91 +93 @@
     'ls' => {
         'desc' => [],
-        'params' => [ "PATH" ],
+        'params' => [ "REPOPATH" ],
         'function' => \&ls
     },
@@ -107 +109 @@
     'commit' => {
         'desc' => [],
-        'params' => [ "PATH" ],
+        'params' => [ "REPOPATH" ],
         'require' => [ "WRITE" ],
         'function' => \&commit
@@ -151 +153 @@
         'function' => \&complete
     },
+    'complete_path' => {
+        'desc' => [ "internally, used for bash completion" ],
+        'params' => [],
+        'function' => \&complete_path
+    },
+    'complete_repopath' => {
+        'desc' => [ "internally, used for bash completion" ],
+        'params' => [],
+        'function' => \&complete_repopath
+    },
 );
 
@@ -196 +208 @@
     print "\n";
     print "Available subcommands:\n";
-    # print "   help <subcommand>\n";
-    # print "   init\n";
-    # print "   login <username>\n";
-    # print "   up <path>\n";
-    # print "   ls <path>\n";
-    # print "   add <path>\n";
-    # print "   commit <path>\n";
-    # print "   revert <path>\n";
-    # print "   diff <path>\n";
-    # print "   status <path>\n";
-    # print "   check\n";
-    # print "   cleanup\n";
-    # print "   permissions\n";
     foreach my $i (sort keys(%COMMAND_DEFINITIONS)) {
         print "    ", $i, " ", join( " ", get_command_possible_params($i) ), "\n";
@@ -313 +312 @@
         }
     }
+    $DASSCM_REPO = normalize_path($DASSCM_REPO);
     if ($verbose) { print "DASSCM_REPO: " . $DASSCM_REPO . "\n"; }
 
@@ -472 +472 @@
     $path =~ s|/[/]*|/|g;
 
+    # remove self reference path
+    $path =~ s|/./|/|g;
+
     return $path;
 }
@@ -490 +493 @@
     }
 
-    # file must be readable. Only exception is, when file should be reverted
-    if ( $command ne "revert" ) {
+    # file must be readable. 
+    # The only exceptions are, 
+    # - if the file parameter is to be completed or
+    # - if a file should be reverted
+    if ( $command ne "revert" && $command !~ m/^complete/ ) {
         if ( not -r $filename_prod ) {
             fatalerror( $filename_prod . " is not accessable" );
@@ -1519 +1525 @@
 
     my $number_arguments = @_;
-    my $input_command = $_[0] || ""; 
-
-    print "args: $number_arguments\n";
+    my @input = @_;
+
+    
     if ( $number_arguments <= 1 ) {
 
+        # complete dasscm commands
+        my $input = $input[0] || "";
         foreach my $i ( keys %COMMANDS ) {
-            #print "$i: ";
-            #print get_command_requires_write( $i ), " ";
             $_ = $i;
-            if( m/^$input_command/ ) {
+            if( m/^$input/ ) {
                 my $command = get_command_uniform_name($i);
-                print $command, " ";
-                print join( ",", get_command_possible_params($i) ) ;
-                #print " (", get_command_desc( $i ), ") ";
-                print "\n";
+                print $command, "\n";
             }
-            #print "\n";
         }
     } else {
-        my $command = get_command_uniform_name($input_command);
-        my @params = get_command_possible_params($input_command);
-        print "params: ", Dumper(@params);
+
+        # 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); }
         if( defined($params[$number_arguments-2]) && $params[$number_arguments-2] ) {  
             my $param = $params[$number_arguments-2];
-            print "param: $param\n";
-            print Dumper($param);
-        }
-    }
+            if( $param eq "PATH" ) {
+                complete_path( $input[$number_arguments-1] );
+            } elsif ( $param eq "REPOPATH" ) {
+                complete_repopath( $input[$number_arguments-1] );
+            } else {
+                print "param: $param\n";
+                print Dumper($param);
+            }
+        }
+    }
+}
+
+
+
+sub complete_path(@)
+{
+    check_parameter( @_, 1 );
+    check_env();
+
+    (
+        my $basename,
+        my $dirname_prod,
+        my $dirname_repo,
+        my $filename_prod,
+        my $filename_repo
+    ) = get_filenames( $_[0] );
+
+    my $path = $filename_prod . "*";
+
+    my @files = glob( $path );
+
+    # if only one result is available
+    # and this result is a directory,
+    # add another result entry
+    # (otherwise complete will stop here and continue with the next parameter)
+    if( $#files == 0 ) {
+        my $path = $files[0];
+        if( -d $path ) {
+            push( @files, $path . "/" );
+        }
+    }
+
+    if (@files) {
+        print join( "\n", @files );
+        print "\n";
+    }
+}
+
+
+
+sub complete_repopath(@)
+{
+    check_parameter( @_, 1 );
+    check_env();
+
+    (
+        my $basename,
+        my $dirname_prod,
+        my $dirname_repo,
+        my $filename_prod,
+        my $filename_repo
+    ) = get_filenames( $_[0] );
+
+    my $path = $filename_repo . "*";
+
+    my @files = glob( $path );
+
+    # if only one result is available
+    # and this result is a directory,
+    # add another result entry
+    # (otherwise complete will stop here and continue with the next parameter)
+    if( $#files == 0 ) {
+        my $path = $files[0];
+        if( -d $path ) {
+            push( @files, $path . "/" );
+        }
+    }
+    
+    if (@files) {
+        # remove DASSCM_REPO path again
+        print join( "\n", map( { s|^${DASSCM_REPO}|/|; $_} @files ) );
+        print "\n";
+    }
+
 }
 
@@ -1607 +1691 @@
     # so we can test for it later on more simply
     #
-
-    # $_ = $command;
-    # if (m/^help$/i) {
-    #     help(@ARGV);
-    # } elsif (m/^login$/i) {
-    #     $command = "login";
-    #     login(@ARGV);
-    # } elsif (m/^init$/i) {
-    #     $command = "init";
-    #     init(@ARGV);
-    # } elsif (m/^ls$/i) {
-    #     $command = "ls";
-    #     ls(@ARGV);
-    # } elsif ( (m/^update$/i) || (m/^up$/i) ) {
-    #     $command = "update";
-    #     update(@ARGV);
-    # } elsif (m/^add$/i) {
-    #     $command = "add";
-    #     add(@ARGV);
-    # } elsif ( (m/^commit$/i) || (m/^checkin$/i) || (m/^ci$/i) ) {
-    #     $command = "commit";
-    #     commit(@ARGV);
-    # } elsif (m/^revert$/i) {
-    #     $command     = "revert";
-    #     $return_code = revert(@ARGV);
-    # } elsif (m/^blame$/i) {
-    #     $command = "blame";
-    #     blame(@ARGV);
-    # } elsif (m/^diff$/i) {
-    #     $command = "diff";
-    #     diff(@ARGV);
-    # } elsif ( (m/^status$/i) || (m/^st$/i) ) {
-    #     $command     = "status";
-    #     $return_code = status(@ARGV);
-    # } elsif (m/^check$/i) {
-    #     $command     = "check";
-    #     $return_code = check();
-    # } elsif (m/^permissions$/i) {
-    #     $command     = "permissions";
-    #     $return_code = permissions();
-    # } elsif (m/^cleanup$/i) {
-    #     $command = "cleanup";
-    #     cleanup();
-    # } elsif (m/^complete$/i) {
-    #     $command = "complete";
-    #     $return_code = complete(@ARGV);
 
     if( get_command_function( $command ) ) {