Changeset 2203 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Cli.pm

Timestamp:

02/19/19 19:43:08 (5 years ago)

Author:

nanardon

Message:

Add a begin command

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Cli.pm (modified) (13 diffs)

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

@@ -32 +32 @@
 my $OUT = $term->OUT || \*STDOUT;
 
-my $trans_mode = 0;
+our $trans_mode = 0;
+my $trans_start = 0;
 
 =head1 FUNCTIONS
@@ -46 +47 @@
 sub globalenv {
     my ($labase) = @_;
-    my $env = LATMOS::Accounts::Cli->new({ prompt => sub { $_[0]->base->label . " cli > " }, },
+    my $env = LATMOS::Accounts::Cli->new({ prompt => sub { $_[0]->base->label . " cli" }, },
         $labase);
     $env->add_func('unexported', {
@@ -251 +252 @@
         {
             prompt => sub {
-                sprintf("%s %s/%s > ",
+                sprintf("%s %s/%s",
                     $_[0]->base->label,
                     $_[0]->{_otype},
@@ -722 +723 @@
         );
         $env->add_func(
+            'begin', {
+                help => 'Start transaction',
+                code => sub {
+                    $trans_start = 1;
+                },
+            }
+        );
+        $env->add_func(
             'commit', {
                 help => 'commit pending change',
@@ -871 +880 @@
 sub prompt {
     my ($self) = @_;
-    if (!$self->{prompt}) {
-        return "LA cli > ";
-    } else {
-        $self->{prompt}->($self);
-    }
+    my $pr = $self->{prompt}
+        ? $self->{prompt}->($self)
+        : "LA cli";
+    return sprintf(
+        "%s%s%s ",
+        $pr,
+        $trans_start ? '-' : '=',
+        $trans_mode  ? '#' : '>',
+    );
 }
 
@@ -896 +909 @@
 
 =cut
-
-# TODO: hide this
 
 sub getoption {
@@ -906 +917 @@
 
     return @ARGV;
-}
-
-# TODO: useless ?
-
-sub _parse_arg {
-    my ($self, $name, @args) = @_;
-    return @args;
 }
 
@@ -929 +933 @@
         $self->complete($lastw, @{$self->{funcs}{$name}{alias}}, @args);
     } elsif ($self->{funcs}{$name}{completion}) {
-        my @pargs = $self->_parse_arg($name, @args);
-        return map { my $t = $_; $t =~ s/\s/\\ /g; $t } grep { $_ && /^\Q$lastw\E/ } $self->{funcs}{$name}{completion}->($self, $lastw, @pargs);
+        return map { my $t = $_; $t =~ s/\s/\\ /g; $t } grep { $_ && /^\Q$lastw\E/ } $self->{funcs}{$name}{completion}->($self, $lastw, @args);
     } else {
         return ();
@@ -950 +953 @@
         $self->run(@{$self->{funcs}{$name}{alias}}, @args);
     } elsif ($self->{funcs}{$name}{code}) {
-        my @pargs = $self->_parse_arg($name, @args);
         $self->{funcs}{$name}{code}->($self, @args);
     } else {
@@ -965 +967 @@
 sub commit {
     my ($self) = @_;
-    if ($trans_mode) {
+    if ($trans_mode || $trans_start) {
+        $trans_start = 1;
     } else {
         $self->_commit;
@@ -974 +977 @@
     my ($self) = @_;
     $self->base->commit;
+    $trans_start = 0;
 }
 
@@ -987 +991 @@
         print $OUT "All pending changes get rollback\n";
     }
-    $self->_rollback;
+    if (!$trans_start) {
+        $self->_rollback;
+    }
 }
 
@@ -993 +999 @@
     my ($self) = @_;
     $self->base->rollback;
+    $trans_start = 0;
 }