Changeset 53

Timestamp:

11/30/10 02:02:14 (14 years ago)

Author:

nanardon

Message:

• factorize code
• add some view in distrib/

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Distrib.pm (modified) (9 diffs)
• lib/Sophie/Controller/Search.pm (modified) (1 diff)
• root/templates/html/404 (added)
• root/templates/html/404/index.html (added)
• root/templates/html/distrib/distrib.html (modified) (1 diff)
• root/templates/html/distrib/distrib.tt (added)
• root/templates/html/distrib/media.html (added)
• root/templates/html/distrib/media.tt (added)
• t/controller_Distrib.t (modified) (2 diffs)

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

@@ -78 +78 @@
 }
 
+sub distrib_rs : Private {
+    my ( $self, $c, $distrib ) = @_;
+    return $c->model('Base')->resultset('Distribution')
+        ->search(
+            {
+                $distrib->{distribution}
+                    ? (name => $distrib->{distribution})
+                    : ()
+            }
+        )->search_related('Release',
+            {
+                $distrib->{release}
+                    ? (version => $distrib->{release})
+                    : ()
+            }
+        )->search_related('Arch',
+            {
+                $distrib->{arch}
+                    ? (arch => $distrib->{arch})
+                    : ()
+            }
+        )->search_related('Medias',
+            {
+                ($distrib->{media} ? (label => $distrib->{media}) : ()),
+                ($distrib->{media_group}
+                    ? (group_label => $distrib->{media_group})
+                    : ()),
+            }
+        );
+}
+
+sub exists : XMLRPC {
+    my ( $self, $c, $d ) = @_;
+
+    my $rs = $c->forward('distrib_rs', [ $d ]);
+
+    if ($rs->search({}, { rows => 1 })->next) {
+        $c->stash->{xmlrpc} = 1;
+    } else {
+        $c->stash->{xmlrpc} = 0;
+    }
+}
 
 =head2 index
@@ -96 +138 @@
     my ( $self, $c, $distribution ) = @_;
     $c->stash->{dist}{distribution} = $distribution;
+    if (!$c->forward('exists', [ $c->stash->{dist} ])) {
+        $c->go('/404/index');
+    }
     $c->forward('list', [ $c->stash->{dist} ] );
 }
@@ -127 +172 @@
 }
 
-sub rpms :XMLRPC {
-    my ( $self, $c, $distribution, $release, $arch ) = @_;
-
-    if (ref $distribution) {
-        ($distribution, $release, $arch) = (
-            $distribution->{distribution},
-            $distribution->{release},
-            $distribution->{arch},
-        );
-    }
-    
+sub anyrpms :XMLRPC {
+    my ( $self, $c, $distribution, $release, $arch ) = @_;
+
+    if (!ref $distribution) {
+        $distribution = {
+            distribution => $distribution,
+            release => $release,
+            arch => $arch,
+        }
+    }
+
     @{$c->stash->{rpm}} = map {
             { 
@@ -144 +189 @@
             }
         }
-        $c->model('Base')
-        ->resultset('Distribution')->search({ name => $distribution })
-        ->search_related('Release', { version => $release })
-        ->search_related('Arch',    { arch => $arch })
-        ->search_related('Medias')
+        $c->forward('distrib_rs', [ $distribution ])
+        ->search_related('MediasPaths')
+        ->search_related('Paths')
+        ->search_related('Rpmfiles')
+        ->all;
+
+    $c->stash->{xmlrpc} = $c->stash->{rpm};
+}
+
+sub rpms :XMLRPC {
+    my ( $self, $c, $distribution, $release, $arch ) = @_;
+
+    if (!ref $distribution) {
+        $distribution = {
+            distribution => $distribution,
+            release => $release,
+            arch => $arch,
+        }
+    }
+
+    $c->stash->{rpm} = [ map {
+            { 
+              pkgid => $_->pkgid,
+              filename => $_->filename,
+            }
+        }
+        $c->forward('distrib_rs', [ $distribution ])
         ->search_related('MediasPaths')
         ->search_related('Paths')
@@ -155 +222 @@
                 IN => $c->model('Base')->resultset('Rpms')
                 ->search({ issrc => 'false' })->get_column('pkgid') ->as_query }
-        } )->all;
+        } )->all ];
 
     $c->stash->{xmlrpc} = $c->stash->{rpm};
@@ -163 +230 @@
     my ( $self, $c, $distribution, $release, $arch ) = @_;
 
-    if (ref $distribution) {
-        ($distribution, $release, $arch) = (
-            $distribution->{distribution},
-            $distribution->{release},
-            $distribution->{arch},
-        );
+    if (!ref $distribution) {
+        $distribution = {
+            distribution => $distribution,
+            release => $release,
+            arch => $arch,
+        }
     }
 
@@ -177 +244 @@
             }
         }
-        $c->model('Base')
-        ->resultset('Distribution')->search({ name => $distribution })
-        ->search_related('Release', { version => $release })
-        ->search_related('Arch',    { arch => $arch })
-        ->search_related('Medias')
+        $c->forward('distrib_rs', [ $distribution ])
         ->search_related('MediasPaths')
         ->search_related('Paths')
@@ -193 +256 @@
 }
 
+sub rpms_name :XMLRPC {
+    my ( $self, $c, $distribution, $release, $arch ) = @_;
+
+    if (!ref $distribution) {
+        $distribution = {
+            distribution => $distribution,
+            release => $release,
+            arch => $arch,
+        }
+    }
+
+    $c->stash->{xmlrpc} = [
+        $c->model('Base')->resultset('Rpms')->search(
+            { pkgid => {
+                IN =>
+        $c->forward('distrib_rs', [ $distribution ])
+        ->search_related('MediasPaths')
+        ->search_related('Paths')
+        ->search_related('Rpmfiles')->get_column('pkgid')->as_query
+        } },
+        { group_by => [ qw(name) ], order_by => [ qw(name) ] }
+        )->get_column('name')->all ];
+}
+
 sub list_rpms :Chained('distrib_view') PathPart('rpms') {
     my ( $self, $c ) = @_;
@@ -224 +311 @@
 }
 
-sub media_rpms : XMLRPC {
-    my ( $self, $c, $distribution, $release, $arch, $media ) = @_;
-    
-    if (ref $distribution) {
-        ($distribution, $release, $arch, $media) = (
-            $distribution->{distribution},
-            $distribution->{release},
-            $distribution->{arch},
-            $release,
-        );
-    }
-    
-    @{$c->stash->{rpm}} = map {
-            { 
-              pkgid => $_->pkgid,
-              filename => $_->filename,
-            }
-        }
-        $c->model('Base')
-        ->resultset('Distribution')->search({ name => $distribution })
-        ->search_related('Release', { version => $release })
-        ->search_related('Arch',    { arch => $arch })
-        ->search_related('Medias', { label => $media })
-        ->search_related('MediasPaths')
-        ->search_related('Paths')
-        ->search_related('Rpmfiles')->all;
-
-    $c->stash->{xmlrpc} = $c->stash->{rpm};
-}
-
 sub _media_list_rpms :Chained('distrib_view') PathPart('media') CaptureArgs(1) {
     my ( $self, $c, $media ) = @_;
-    $c->stash->{media} = $media;
+    $c->stash->{dist}{media} = $media;
 }
 
 sub media_list_rpms :Chained('_media_list_rpms') PathPart('') {
     my ( $self, $c ) = @_;
-    $c->forward('media_rpms', [ $c->stash->{dist}, $c->stash->{media} ]);
+    $c->forward('anyrpms', [ $c->stash->{dist} ]);
 }
 

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

@@ -66 +66 @@
     my ( $self, $c, $searchspec ) = @_;
 
-    return $c->model('Base')->resultset('Distribution')
-        ->search(
-            {
-                $searchspec->{distribution}
-                    ? (name => $searchspec->{distribution})
-                    : ()
-            }
-        )->search_related('Release',
-            {
-                $searchspec->{release}
-                    ? (version => $searchspec->{release})
-                    : ()
-            }
-        )->search_related('Arch',
-            {
-                $searchspec->{arch}
-                    ? (arch => $searchspec->{arch})
-                    : ()
-            }
-        )->search_related('Medias',
-            {
-                ($searchspec->{media} ? (label => $searchspec->{media}) : ()),
-                ($searchspec->{media_group}
-                    ? (group_label => $searchspec->{media_group}) 
-                    : ()),
-            }
-        )->search_related('MediasPaths')
+    return $c->forward('/distrib/distrib_rs', [ $searchspec ])
+        ->search_related('MediasPaths')
         ->search_related('Paths')
         ->search_related('Rpmfiles');

server/trunk/web/root/templates/html/distrib/distrib.html

@@ -1 @@
-<ol>
-[% FOREACH media = xmlrpc %]
-<li><a href="[% c.uri_for('/', c.req.path, 'media', media) %]">[% media %]</a></li>
-[% END %]
-</ol>
+<!-- $Id$ -->
+
+[% INCLUDE 'distrib/distrib.tt' %]

server/trunk/web/t/controller_Distrib.t

@@ -9 +9 @@
 my $release = 'cooker';
 my $arch = 'i586';
+my $media = 'main-release';
 
 BEGIN { use_ok 'Catalyst::Test', 'Sophie' }
@@ -30 +31 @@
 ok( request("/distrib/$distribution/$release")->is_success, 'Request should succeed' );
 ok( request("/distrib/$distribution/$release/$arch")->is_success, 'Request should succeed' );
+ok( request("/distrib/$distribution/$release/$arch/media")->is_success, 'Request should succeed' );
 done_testing();