Changeset 2399

Timestamp:

06/13/20 18:55:42 (4 years ago)

Author:

nanardon

Message:

la-cli: add | and > feature (act like in shell)

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Cli

Files:

• Base.pm (modified) (4 diffs)
• Context.pm (modified) (3 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Cli/Base.pm

@@ -482 +482 @@
 sub term         { $_[0]->Context->Term }
 sub Interractive { $_[0]->Context->Interactive }
-sub print        { shift->Context->print(@_) }
+sub print        { shift->Context->print (@_) }
+sub printf       { shift->Context->printf(@_) }
 
 sub Top {
@@ -494 +495 @@
 }
 
+sub _parse_cmd_line {
+    my ( $self, $cmdLine ) = @_;
+
+    my ($op, $shellLine, $internalLine);
+
+    if ($cmdLine =~ /^(.*?)(?<![\\|])([\|\>])\s*([^\|].*)?$/) {
+        $internalLine = $1;
+        $op = $2;
+        $shellLine = $3;
+    } else {
+        $internalLine = $cmdLine;
+    }
+
+    return ( $op, $shellLine, shellwords($internalLine) );
+
+}
+
 =head2 cli
 
@@ -507 +525 @@
     while (1) {
         $term->Attribs->{completion_function} = sub {
-            $self->complete($_[0], shellwords(substr($_[1], 0, $_[2])));
+            my ($Op, $Shell, @args) = $self->_parse_cmd_line(substr($_[1], 0, $_[2]));
+            $Op ||= '';
+            my $attribs = $self->Context->Term->Attribs;
+            if ($Op eq '>') {
+                $term->completion_matches($Shell, $attribs->{'filename_completion_function'});
+            } elsif ($Op eq '|') {
+                $term->completion_matches($Shell, $attribs->{'filename_completion_function'});
+            } else  {
+                $self->complete($_[0], @args);
+            }
         };
         defined (my $line = $term->readline($self->prompt)) or do {
@@ -515 +542 @@
         $_[0]->Context->{_line} = $line;
         $term->addhistory($line) if ($line =~ /\S/);
-        my $res = $self->run(shellwords($line));
+        my ($Op, $Shell, @args) = $self->_parse_cmd_line($line);
+        my $Handle;
+        if ($Op) {
+            open($Handle, "$Op $Shell") or next;
+            $self->Context->TempOut($Handle);
+        }
+        my $res = $self->run(@args);
+        if ($Handle) {
+            $self->Context->TempOut(undef);
+            close($Handle);
+        }
         $self->rollback if (!$self->Context->TransMode);
         if ($res && $res eq 'EXIT') { $self->print("\n"); return }

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Cli/Context.pm

@@ -37 +37 @@
 has La => ( is => 'ro' );
 has Out => ( is => 'ro' );
+has TempOut => ( is => 'rw' );
 has Interractive => ( is => 'rw', isa => 'Bool', default => 1 );
 
@@ -69 +70 @@
 sub print {
     my ( $self, @args ) = @_;
-    my $out = $self->Out;
+    my $out = $self->TempOut || $self->Out;
 
     print $out @args;
@@ -80 +81 @@
 sub printf {
     my ( $self, $str, @args ) = @_;
-    my $out = $self->Out;
+    my $out = $self->TempOut || $self->Out;
 
     printf $out $str, @args;