X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist%2FController%2FRepository.pm;h=410f0a2613849e193ed9c5bfd88f4f406b1888c1;hb=d423d020c5af32ad81674bdf3af7c29da873912e;hp=33e6f538bf7ea43e722d8dcb52b2728c83dfe532;hpb=8fd20a28cd2d6df24f0f4a123dffa53ae3547f45;p=catagits%2FGitalist.git

diff --git a/lib/Gitalist/Controller/Repository.pm b/lib/Gitalist/Controller/Repository.pm
index 33e6f53..410f0a2 100644
--- a/lib/Gitalist/Controller/Repository.pm
+++ b/lib/Gitalist/Controller/Repository.pm
@@ -17,12 +17,12 @@ The action for the search form.
 
 =cut
 
-sub search : Chained('base') Args(0) {
+sub search : Chained('find') Args(0) {
   my($self, $c) = @_;
   my $repository = $c->stash->{Repository};
   # Lifted from /shortlog.
   my %logargs = (
-#    sha1   => $commit->sha1,
+    sha1   => $repository->head_hash,
 #    count  => Gitalist->config->{paging}{log},
 #    ($c->req->param('f') ? (file => $c->req->param('f')) : ()),
     search => {
@@ -45,7 +45,7 @@ Expose the local reflog. This may go away.
 
 =cut
 
-sub reflog : Chained('base') Args(0) {
+sub reflog : Chained('find') Args(0) {
   my ( $self, $c ) = @_;
   my @log = $c->stash->{Repository}->reflog(
       '--since=yesterday'
@@ -62,33 +62,37 @@ Provides an atom feed for a given repository.
 
 =cut
 
-sub atom : Chained('find') Args(0) {
-  my($self, $c) = @_;
-
-  my $feed = XML::Atom::Feed->new;
-
-  my $host = lc hostname();
-  $feed->title($host . ' - ' . Gitalist->config->{name});
-  $feed->updated(~~DateTime->now);
+sub atom : Chained('find') Does('FilenameArgs') Args() {
+    my ($self, $c) = @_;
 
-  my $repository = $c->stash->{Repository};
-  my %logargs = (
-      sha1   => $repository->head_hash,
-      count  => Gitalist->config->{paging}{log} || 25,
-  );
+    my $host = lc hostname();
+    $c->stash(
+        title => $host . ' - ' . Gitalist->config->{name},
+        updated => DateTime->now
+    );
 
-  my $mk_title = $c->stash->{short_cmt};
-  for my $commit ($repository->list_revs(%logargs)) {
-    my $entry = XML::Atom::Entry->new;
-    $entry->title( $mk_title->($commit->comment) );
-    $entry->id($c->uri_for_action('/commit/commit', [$repository->name, $commit->sha1]));
-    # XXX FIXME Needs work ...
-    $entry->content($commit->comment);
-    $feed->add_entry($entry);
-  }
+    my $repository = $c->stash->{Repository};
+    my %logargs = (
+        sha1     => $repository->head_hash,
+        count    => Gitalist->config->{paging}{log} || 25,
+        ($c->stash->{filename} ? (file => $c->stash->{filename}) : ()),
+    );
 
-  $c->response->body($feed->as_xml);
-  $c->response->content_type('application/atom+xml');
+    my @revs;
+    my $mk_title = $c->stash->{short_cmt};
+    for my $commit ($repository->list_revs(%logargs)) {
+        my $entry = {};
+        $entry->{title} = $mk_title->($commit->comment);
+        $entry->{id} = $c->uri_for_action('/ref/commit', [$repository->name, $commit->sha1]);
+        # XXX FIXME Needs work ...
+        $entry->{content} = $commit->comment;
+        push(@revs, $entry);
+    }
+    $c->stash(
+        Commits => \@revs,
+        no_wrapper => 1,
+    );
+    $c->response->content_type('application/atom+xml');
 }
 
 =head2 rss
@@ -97,37 +101,35 @@ Provides an RSS feed for a given repository.
 
 =cut
 
-sub rss : Chained('find') Args(0) {
+sub rss : Chained('find') Does('FilenameArgs') Args() {
   my ($self, $c) = @_;
 
   my $repository = $c->stash->{Repository};
 
-  my $rss = XML::RSS->new(version => '2.0');
-  $rss->channel(
+  $c->stash(
     title          => lc(Sys::Hostname::hostname()) . ' - ' . Gitalist->config->{name},
-    link           => $c->uri_for('summary', {p=>$repository->name}),
     language       => 'en',
-    description    => $repository->description,
     pubDate        => DateTime->now,
     lastBuildDate  => DateTime->now,
+    no_wrapper     => 1,
   );
 
   my %logargs = (
       sha1   => $repository->head_hash,
       count  => Gitalist->config->{paging}{log} || 25,
-#      ($c->req->param('f') ? (file => $c->req->param('f')) : ())
+      ($c->stash->{filename} ? (file => $c->stash->{filename}) : ()),
   );
+  my @revs;
   my $mk_title = $c->stash->{short_cmt};
   for my $commit ($repository->list_revs(%logargs)) {
     # XXX FIXME Needs work ....
-    $rss->add_item(
+    push(@revs, {
         title       => $mk_title->($commit->comment),
-        permaLink   => $c->uri_for_action('/commit/commit', [$repository->name, $commit->sha1]),
+        permaLink   => $c->uri_for_action('/ref/commit', [$repository->name, $commit->sha1]),
         description => $commit->comment,
-    );
+    });
   }
-
-  $c->response->body($rss->as_string);
+  $c->stash(Commits => \@revs);
   $c->response->content_type('application/rss+xml');
 }