Changeset 41 for server

Timestamp:

11/27/10 20:15:04 (14 years ago)

Author:

nanardon

Message:

• improve admin part

Location:

server/trunk/web/lib/Sophie

Files:

• Base/Result/Medias.pm (modified) (1 diff)
• Controller/Admin.pm (modified) (2 diffs)
• Controller/Distrib.pm (modified) (1 diff)
• Controller/Root.pm (modified) (1 diff)
• Model/Base.pm (modified) (1 diff)

server/trunk/web/lib/Sophie/Base/Result/Medias.pm

@@ -7 +7 @@
 __PACKAGE__->table('d_media');
 __PACKAGE__->add_columns(
-    qw/d_media_key label comment group_label d_arch dist_label/
+    qw/d_media_key label comment group_label d_arch/
 );
 __PACKAGE__->set_primary_key('d_media_key');
 __PACKAGE__->belongs_to(Arch => 'Sophie::Base::Result::Arch', 'd_arch');
 __PACKAGE__->has_many(MediasPaths => 'Sophie::Base::Result::MediasPaths', 'd_media');
+__PACKAGE__->add_unique_constraint('label' => [ 'label', 'd_arch' ]);
 
 1;

server/trunk/web/lib/Sophie/Controller/Admin.pm

@@ -60 +60 @@
         ->search_related('Arch', arch => $distribspec->{arch})->next;
     if ($d) {
-        my $new = my $rs = $c->model('Base')->resultset('Medias')->new({
+        my $new = my $rs = $c->model('Base')->resultset('Medias')
+            ->update_or_create({
                 %{ $mediaspec },
                 Arch => $d,
-            });
-        if ($new->insert) {
+            },
+            { key => 'label' }
+        );
+        if ($new) {
             $c->stash->{xmlrpc} = 'OK';
             $c->model('Base')->storage->dbh->commit;
@@ -132 +135 @@
 }
 
+sub media_remove_path :XMLRPC {
+    my ( $self, $c, $distribution, $version, $arch, $label, $path ) = @_;
+
+    if (ref $distribution) {
+        ($distribution, $version, $arch, $label, $path) = 
+        (
+            $distribution->{distribution},
+            $distribution->{release},
+            $distribution->{arch},
+            $version,
+            $arch,
+        );
+    }
+
+    $path =~ s/\/*$//;
+    $path =~ s/\/+/\//g;
+
+    my $med = $c->model('Base')->resultset('Distribution')
+        ->search(name => $distribution)
+        ->search_related('Release', version => $version)
+        ->search_related('Arch', arch => $arch)
+        ->search_related('Medias', label => $label)->next or return;
+
+    my $rspath = $c->model('Base')->resultset('Paths')
+        ->find({ path => $path }) or do {
+            return;
+    };
+    my $new = $c->model('Base')->resultset('MediasPaths')->new({
+            Medias => $med,
+            Paths =>  $rspath,
+        });
+    $new->delete;
+
+    $c->model('Base')->storage->dbh->commit;
+}
+
+sub ls_local : XMLRPC {
+    my ($self, $c, $path) = @_;
+
+    $c->stash->{xmlrpc} = [ <$path*> ];
+}
 
 =head1 AUTHOR

server/trunk/web/lib/Sophie/Controller/Distrib.pm

@@ -69 +69 @@
         ->search_related('Release', { version => $release })
         ->search_related('Arch', { arch => $arch })
-        ->search_related('Medias');
-    @{$c->stash->{xmlrpc}} = map { 
+        ->search_related('Medias')->search({}, { order_by => 'label' });
+    $c->stash->{xmlrpc} = [ map { 
         { 
-            dist_label => $_->dist_label,
             label => $_->label,
             group_label => $_->group_label,
             key => $_->d_media_key,
         } 
-    } $rs->all;
+    } $rs->all ];
 }
 

server/trunk/web/lib/Sophie/Controller/Root.pm

@@ -88 +88 @@
     }
     $c->stash->{data} = $c->stash->{xmlrpc};
-    $c->model('Base')->storage->dbh->rollback;
+    $c->model('Base')->storage->dbh->commit;
 }
 

server/trunk/web/lib/Sophie/Model/Base.pm

@@ -9 +9 @@
         dsn => 'toto',
     },    
-    
 );