Changeset 235

Timestamp:

12/30/10 13:28:46 (13 years ago)

Author:

nanardon

Message:

• improve rss output

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Feed/Distrib.pm (modified) (1 diff)
• lib/Sophie/Controller/Feed/Last.pm (modified) (2 diffs)
• t/controller_Feed-Last.t (modified) (1 diff)

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

@@ -55 +55 @@
         $c->stash->{rss}->add_item(
             title => $item->{filename},
-            permaLink => $c->uri_for('/rpms', $item->{pkgid}),
+            permaLink => $c->uri_for('/distrib', $item->{distribution},
+                $item->{release}, $item->{arch}, 'by-pkgid', $item->{pkgid}),
             guid => $item->{pkgid},
-            description => $info->{description},
+            description => "In " . join('/', $item->{distribution},
+                $item->{release}, $item->{arch}) . ":\n" .
+                $info->{description},
         );
     }

server/trunk/web/lib/Sophie/Controller/Feed/Last.pm

@@ -17 +17 @@
 =cut
 
+sub topfeed :Path :Args(1) {
+    my ( $self, $c, $feed ) = @_;
+    $c->forward('feed', [ '', $feed ]);
+}
 
-sub index :Path :Args(2) {
+sub feed :Path :Args(2) {
     my ( $self, $c, $dist, $feed ) = @_;
     
@@ -48 +52 @@
 sub end : Private {
     my ( $self, $c ) = @_;
-    $c->stash->{current_view} = 'Rss';
-    $c->stash->{rss} = $c->model('Rss');
-    foreach my $item (@{ $c->forward(
-        '/search/rpms/bydate',
-        [
-            {
-                %{ $c->stash->{dist} || {}},
-                src => $c->stash->{src},
-                rows => 50,
-            }, 1
-        ]
-    ) }) {
-        my $info = $c->forward('/rpms/basicinfo', [ $item->{pkgid} ]);
-        $c->stash->{rss}->add_item(
-            title => $item->{filename},
-            permaLink => $c->uri_for('/rpms', $item->{pkgid}),
-            guid => $item->{pkgid},
-            description => $info->{description},
-        );
-    }
-
-    $c->forward('/feed/end');
+    $c->forward('/feed/distrib/end');
 }
 

server/trunk/web/t/controller_Feed-Last.t

@@ -6 +6 @@
 BEGIN { use_ok 'Sophie::Controller::Feed::Last' }
 
+ok( request('/feed/last/srpms.rss')->is_success, 'Request should succeed' );
 ok( request('/feed/last/Mdv,cooker,i586/srpms.rss')->is_success, 'Request should succeed' );
 ok( request('/feed/last/cooker,i586/srpms.rss')->is_success, 'Request should succeed' );