Changeset 2217 for trunk/LATMOS-Accounts/lib/LATMOS

Timestamp:

02/22/19 02:06:48 (5 years ago)

Author:

nanardon

Message:

Allow to function on top env (/func)

File:

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

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

@@ -269 +269 @@
 sub print { shift->Context->print(@_) }
 
+sub Top {
+    my ( $self ) = @_;
+
+    if ($self->Parent) {
+        return $self->Parent->Top;
+    } else {
+        return $self;
+    }
+}
+
 =head2 cli
 
@@ -380 +390 @@
     my ($self, $lastw, $name, @args) = @_;
     if (!$name) {
-        if ($lastw =~ m!^\.\./?(.*)$!) {
+        if ($lastw =~ m!^(\.\./*)(.*)$!) {
             if ($self->Parent) {
-                return map { "../$_" } $self->Parent->complete($1, $name, @args);
+                return map { "$1/$_" } $self->Parent->complete($2, $name, @args);
             } else {
                 return ();
             }
+        } elsif ($lastw =~ m!(^/+)(.*)$!) {
+            return map { "$1$_" } $self->Top->complete($2, $name, @args);
         } else {
             return grep { /^\Q$lastw\E/ } sort
                 (keys %{ $self->{funcs} || {}});
         }
-    } elsif ($name =~ m!^../(.*)$!) {
+    } elsif ($name =~ m!^\.\./(.*)$!) {
         if ($self->Parent) {
             return $self->Parent->complete($lastw, $1, @args);
@@ -396 +408 @@
             return ();
         }
+    } elsif ($name =~ m!^/+(.*)$!) {
+        return $self->Top->complete($lastw, $1, @args);
     } elsif ($self->{funcs}{$name}{alias}) {
         $self->complete($lastw, @{$self->{funcs}{$name}{alias}}, @args);
@@ -415 +429 @@
     return if (!$name);
 
-    if ($name =~ m!^../(.*)$!) {
+    if ($name =~ m!^\.\./+(.*)$!) {
         if ($self->Parent) {
             $self->Parent->run($1, @args);
@@ -421 +435 @@
             $self->print("No parent envirronment to call function\n");
         }
+    } elsif ($name =~ m!^/+(.*)$!) {
+        $self->Top->run($1, @args);
     } elsif (grep { m/^(-h|--help)$/ } @args) {
         $self->Help($name);