Changeset 11 for client

Timestamp:

11/21/10 13:17:09 (14 years ago)

Author:

nanardon

Message:

• improve admin part

File:

• client/trunk/lib/Sophie/Cli.pm (modified) (7 diffs)

client/trunk/lib/Sophie/Cli.pm

@@ -28 +28 @@
             prompt => sub {
                 sprintf('%s - %s - %s > ',
-                    $_[0]->{dist},
-                    $_[0]->{vers},
-                    $_[0]->{arch},
-                );
-            },
-            dist => $dist,
-            vers => $vers,
-            arch => $arch,
+                    $_[0]->{dist}{distribution},
+                    $_[0]->{dist}{release},
+                    $_[0]->{dist}{arch},
+                );
+            },
+            dist => {
+                distribution => $dist,
+                release => $vers,
+                arch => $arch,
+            },
         },
         $base,
@@ -44 +46 @@
                 my ($self) = @_;
 
-                my $res = $self->xmlreq('distrib.struct', $self->{dist},
-                    $self->{vers},
-                    $self->{arch});
+                my $res = $self->xmlreq('distrib.struct',
+                    $self->{dist},
+                );
                 print $OUT join ('', map { "$_->{label}\n" } @{ $res->value });
             }
@@ -55 +57 @@
             code => sub {
                 my ($self, $media, $path) = @_;
-                my $res = $self->xmlreq('admin.media_path', $self->{dist},
-                    $self->{vers},
-                    $self->{arch},
+                my $res = $self->xmlreq('admin.media_path',
+                    $self->{dist},
                     $media,
                     $path,
@@ -67 +68 @@
                     return (<$start*>)
                 } else {
-                my $res = $self->xmlreq('distrib.struct', $self->{dist},
-                    $self->{vers},
-                    $self->{arch});
+                my $res = $self->xmlreq('distrib.struct',
+                    $self->{dist},
+                );
                 return map { $_->{label} } @{ $res->value };
                 }
@@ -75 +76 @@
         }
     );
+    $env->add_func('listpath', {
+            code => sub {
+                my ($self, $media) = @_;
+                my $res = $self->xmlreq('admin.list_path',
+                    $self->{dist},
+                    $media,
+                );
+                print $OUT join ('', map { "$_\n" } @{ $res->value });
+            },
+            completion => sub {
+                my ($self, $start) = @_;
+                my $res = $self->xmlreq('distrib.struct',
+                    $self->{dist},
+                );
+                return map { $_->{label} } @{ $res->value };
+            },
+        }
+    );
     $env->add_func('addmedia', {
             code => sub {
                 my ($self, $media, $group) = @_;
-                my $res = $self->xmlreq('admin.add_media', $self->{dist},
-                    $self->{vers},
-                    $self->{arch},
-                    $media,
-                    $group,
+                my $res = $self->xmlreq('admin.add_media',$self->{dist},
+                    { dist_label => $media,
+                      group_label => $group },
                 );
                 print $OUT join ('', map { "$_->{label}\n" } @{ $res->value });
@@ -88 +105 @@
             completion => sub {
                 my ($self) = @_;
-                my $res = $self->xmlreq('distrib.struct', $self->{dist},
-                    $self->{vers},
-                    $self->{arch});
+                my $res = $self->xmlreq('distrib.struct',
+                    $self->{dist},
+                );
                 return map { $_->{label} } @{ $res->value };
             },
@@ -108 +125 @@
             code => sub {
                 my ($self, $dist, $ver, $arch) = @_;
+                if (!($dist && $ver && $arch)) {
+                    print $OUT "missing argument\n";
+                    return;
+                }
                 denv($self->base, $dist, $ver, $arch)->cli();
             },