Changeset 2386

Timestamp:

06/05/20 12:16:04 (4 years ago)

Author:

nanardon

Message:

Allow to use file as input in la-cli

File:

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

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

@@ -35 +35 @@
 =cut
 
+sub _create_from_handle {
+    my ($self, $fh, $otype, $objname) = @_;
+
+    my $labase = $self->base;
+
+    my %attr = LATMOS::Accounts::Utils::parse_obj_file($fh);
+    if ($objname && (my $obj = $labase->get_object($otype, $objname))) {
+         warn "Object $otype $objname already exists, aborting\n";
+         return;
+    } else {
+        if ($objname) {
+            my $res = $labase->create_c_object($otype, $objname, %attr);
+            if($res) {
+                print "Changes applied\n";
+                $labase->commit;
+                return 1;
+            }
+            return 0;
+        } else {
+            my $ochelper = $labase->ochelper($otype);
+
+            my $info = {
+                contents => { %attr },
+            };
+            if ($attr{name}) {
+                $info->{name}{content} = $attr{name};
+            }
+
+            $ochelper->Automate($info) or do {
+                warn "Cannot create object:" . LATMOS::Accounts::Log::lastmessage() . "\n";
+                return;
+            };
+            return 1;
+        } 
+    }
+}
+
 sub BUILD {
     my ( $self ) = @_;
@@ -63 +100 @@
 
                 if ($filefmt){
-                    open(my $hfmt, '<', $filefmt) or die "Cannot open $filefmt\n";
+                    open(my $hfmt, '<', $filefmt) or do {
+                       warn "Cannot open $filefmt\n";
+                       return;
+                    };
                     $fmt ||= ''; # avoid undef warning
                     while (<$hfmt>) {
@@ -168 +208 @@
     $self->add_func('create', {
             code => sub {
-                my ($self, $otype) = @_;
-                my $helper = $self->base->ochelper($otype);
-                my $info = undef;
-                while (1) {
-                    my $status;
-                    ($status, $info) = $helper->step($info);
-
-                    if ($status ne 'NEEDINFO') {
-                        if ($status eq 'CREATED') {
-                            print $OUT "Object created\n";
-                            $self->commit;
-                        } else {
-                            print $OUT "Nothing done\n";
-                            $self->rollback;
-                        }
+                my $self = shift;
+                my ($otype, $objname) = $self->getoption(
+                    {
+                        'i'   => \my $interactive,
+                        'f=s' => \my $inputfile,
+                        'ro'  => \my $with_ro,
+                        'e'   => \my $empty_file,
+                    }, @_
+                );
+
+                if ( $interactive ) {
+                    my $helper = $self->base->ochelper($otype);
+                    my $info = undef;
+                    while (1) {
+                        my $status;
+                        ($status, $info) = $helper->step($info);
+
+                        if ($status ne 'NEEDINFO') {
+                            if ($status eq 'CREATED') {
+                                print $OUT "Object created\n";
+                                $self->commit;
+                            } else {
+                                print $OUT "Nothing done\n";
+                                $self->rollback;
+                            }
+                            return;
+                        }
+
+                        if ($info->{name}{ask}) {
+                            my $line = $self->Context->Term->readline("Name of the object ?");
+                            $info->{name}{content} = $line;
+                        }
+                        foreach my $attr (@{$info->{ask} || []}) {
+                            $self->Context->Term->Attribs->{completion_function} = sub {
+                                $info->{contents}{$attr}
+                            };
+                            my $line = $self->Context->Term->readline(sprintf('  %s %s? ',
+                                    $attr,
+                                    $info->{contents}{$attr}
+                                    ? '(' . $info->{contents}{$attr} . ') '
+                                    : ''
+                                ));
+                            $info->{contents}{$attr} = $line if($line);
+                        }
+                    }
+                } elsif ($inputfile) {
+                    my $handle;
+                    open($handle, '<', $inputfile) or do {
+                        warn "Cannot open input file $@\n";
                         return;
-                    }
-
-                    if ($info->{name}{ask}) {
-                        my $line = $self->Context->Term->readline("Name of the object ?");
-                        $info->{name}{content} = $line;
-                    }
-                    foreach my $attr (@{$info->{ask} || []}) {
-                        $self->Context->Term->Attribs->{completion_function} = sub {
-                            $info->{contents}{$attr}
-                        };
-                        my $line = $self->Context->Term->readline(sprintf('  %s %s? ',
-                                $attr,
-                                $info->{contents}{$attr}
-                                ? '(' . $info->{contents}{$attr} . ') '
-                                : ''
-                            ));
-                        $info->{contents}{$attr} = $line if($line);
-                    }
+                    };
+                    my $res = $self->_create_from_handle($handle, $otype, $objname);
+                    close($handle);
+                    $self->commit if($res);
+                    return($res);
+                } else {
+                    return LATMOS::Accounts::Utils::dump_read_temp_file(
+                        sub {
+                            my ($fh) = @_;
+                            $labase->text_empty_dump($fh, $otype,
+                                {
+                                    only_rw => !$with_ro,
+                                }
+                            ) unless($empty_file);
+                        },
+                        sub {
+                            my ($fh) = @_;
+                            if (my $res = $self->_create_from_handle($fh, $otype, $objname)) {
+                                 $self->commit;
+                                 return $res;
+                             } else {
+                                 return;
+                             }
+                        }
+                    );
+                }
+            },
+            completion => sub {
+                my ($self, $carg, @args) = @_;
+                my @options = ();
+                push( @options, qw(-i -f)  ) unless ( grep { $_ =~ /^-[fi]$/ } @args );
+                push( @options, qw(-e --ro)) unless ( grep { $_ eq '-f' } @args );
+
+                if (($args[-1] || '') eq '-f') {
+                    my $attribs = $self->Context->Term->Attribs;
+                    return $self->Context->Term->completion_matches($carg, $attribs->{'filename_completion_function'});
+                } else {
+                    return (@options, $self->base->list_supported_objects);
                 }
             },