Changeset 2241

Timestamp:

05/10/19 18:24:47 (5 years ago)

Author:

nanardon

Message:

Add --fmt option to list

Location:

trunk/LATMOS-Accounts

Files:

• bin/la-query (modified) (1 diff)
• lib/LATMOS/Accounts/Cli.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Cli/Object.pm (modified) (1 diff)

trunk/LATMOS-Accounts/bin/la-query

@@ -128 +128 @@
     $Env->run('query', '-o', $otype, @ARGV);
 } else {
-    $Env->run('ls', $otype, @ARGV);
+    $Env->run('ls', $otype);
 }

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

@@ -49 +49 @@
             },
             code => sub {
-                if ($_[1]) {
-                    print $OUT map { "$_\n" } $_[0]->base->list_objects($_[1]);
-                } else {
+                my $env = shift;
+                warn @_;
+                my @args = $self->getoption(
+                    {
+                        'fmt=s'      => \my $fmt,
+                        'filefmt=s'  => \my $filefmt,
+                    }, @_
+                );
+
+                my $otype = $args[0] or do {
                     print $OUT "Object type missing\n";
+                    return 1;
+                };
+
+                if ($filefmt){
+                    open(my $hfmt, '<', $filefmt) or die "Cannot open $filefmt\n";
+                    $fmt ||= ''; # avoid undef warning
+                    while (<$hfmt>) {
+                        chomp($fmt .= $_);
+                    }
+                    close $hfmt;
+                }
+
+                if ($fmt) {
+                    foreach ($env->base->list_objects($otype)) {
+                        my $obj = $env->base->get_object($otype, $_) or next;
+                        print $OUT $obj->queryformat($fmt);
+                    }
+                    print $OUT "\n";
+                } else {
+                    print $OUT map { "$_\n" } $env->base->list_objects($otype);
                 }
             },

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

@@ -275 +275 @@
         help => 'list current selected objects',
         code => sub {
-            printf $OUT "%s: %s\n", $_[0]->{_otype}, join(', ', map { $_->id }
-            @{$_[0]->{_objects}});
+
+            my $env = shift;
+            my @args = $self->getoption(
+                {
+                    'fmt=s'      => \my $fmt,
+                    'filefmt=s'  => \my $filefmt,
+                }, @_
+            );
+
+            if ($filefmt){
+                open(my $hfmt, '<', $filefmt) or die "Cannot open $filefmt\n";
+                $fmt ||= ''; # avoid undef warning
+                while (<$hfmt>) {
+                    chomp($fmt .= $_);
+                }
+                close $hfmt;
+            }
+
+            if ($fmt) {
+                foreach (@{$env->{_objects}}) {
+                    print $OUT $_->queryformat($fmt);
+                }
+                print $OUT "\n";
+            } else {
+                printf $OUT "%s: %s\n", $env->{_otype}, join(', ', map { $_->id } @{$env->{_objects}});
+            }
         }
     });