Changeset 375 for server/trunk/web/lib

Timestamp:

06/02/11 18:26:10 (13 years ago)

Author:

nanardon

Message:

• remove media not existing in dump when loading a distrib

Location:

server/trunk/web/lib/Sophie/Controller

Files:

• Admin.pm (modified) (6 diffs)
• Distrib.pm (modified) (1 diff)

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

@@ -67 +67 @@
 
     my $d = $c->model('Base')->resultset('Distribution')
-        ->search(name => $distribspec->{distribution})
-        ->search_related('Release', version => $distribspec->{release})
-        ->search_related('Arch', arch => $distribspec->{arch})->next;
+        ->search({ name => $distribspec->{distribution} })
+        ->search_related('Release', { version => $distribspec->{release} })
+        ->search_related('Arch',    { arch => $distribspec->{arch} })->next;
     if ($d) {
         my $new = my $rs = $c->model('Base')->resultset('Medias')
@@ -94 +94 @@
             label => $medianame,
             d_arch => $c->model('Base')->resultset('Distribution')
-                ->search(name => $distribspec->{distribution})
-                ->search_related('Release', version => $distribspec->{release})
-                ->search_related('Arch', arch =>
-                    $distribspec->{arch})->next->d_arch_key,
+                ->search({ name => $distribspec->{distribution} })
+                ->search_related('Release',
+                    { version => $distribspec->{release}} )
+                ->search_related('Arch',
+                    { arch => $distribspec->{arch} })->next->d_arch_key,
         }
     );
@@ -173 +174 @@
 
     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;
+        ->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')
@@ -349 +350 @@
 
     my $rsdist = $c->model('Base')->resultset('Distribution')
-        ->search(name => $distribution->{distribution})
-        ->search_related('Release', version => $distribution->{release})
-        ->search_related('Arch', arch => $distribution->{arch})
+        ->search({ name => $distribution->{distribution} })
+        ->search_related('Release', { version => $distribution->{release} })
+        ->search_related('Arch',    { arch => $distribution->{arch} })
         ->search_related('Medias');
 
@@ -366 +367 @@
 
     my $ref = thaw($dump);
-
-    warn keys %{$ref->{path}};
 
     $c->forward('clean_distrib', [ $ref->{distrib} ]);
@@ -377 +376 @@
         ]);
 
+    # cleaning media not existing anymore
+    foreach my $media (@{ $c->forward('/distrib/list', [ $ref->{distrib} ]) || []}) {
+        if (!grep { $media eq $_->{label} } (@{ $ref->{media} || []})) {
+            $c->forward('remove_media', [ $ref->{distrib}, $media ]);
+        }
+    }
     foreach my $media (@{ $ref->{media} || []}) {
         $c->forward('add_media', [ $ref->{distrib}, $media ]);

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

@@ -57 +57 @@
             $rs->search(undef, { order_by => ['version'] })->all ];
     }
-    $rs = $rs->search(version => $release)->search_related('Arch');
+    $rs = $rs->search({ version => $release })->search_related('Arch');
     if (!$arch) {
         return $c->stash->{xmlrpc} = [ map { $_->arch } 
             $rs->search(undef, { order_by => ['arch'] })->all ];
     }
-    $rs = $rs->search(arch => $arch)->search_related('Medias');
+    $rs = $rs->search({ arch => $arch })->search_related('Medias');
     return $c->stash->{xmlrpc} = [ map { $_->label }
         $rs->search(undef, { order_by => ['label'] })->all ];