Migrate search and reflog to new model.

[catagits/Gitalist.git] / lib / Gitalist / Controller / Root.pm

diff --git a/lib/Gitalist/Controller/Root.pm b/lib/Gitalist/Controller/Root.pm
index 4be75a5..5a75fe7 100644 (file)
--- a/lib/Gitalist/Controller/Root.pm
+++ b/lib/Gitalist/Controller/Root.pm
@@ -68,7 +68,7 @@ sub _get_commit {
   my ($m, $pd);
   if (defined $c->stash->{current_model} &&
           $c->stash->{current_model} eq 'GitRepos') {
-      $m = $c->model()->project($c->stash->{project});
+      $m = $c->stash->{Project};
       $pd = $m->path;
   } else {
       $m = $c->model();
@@ -120,21 +120,14 @@ A summary of what's happening in the repo.
 sub summary : Local {
   my ( $self, $c ) = @_;
   $c->stash(current_model => 'GitRepos');
-  warn("project is " . $c->stash->{project});
-  my $project;
-  eval {
-      $project = $c->model()->project($c->stash->{project});
-  };
-  if ($@) {
-      $c->detach('error_404');
-  }
+  my $project = $c->stash->{Project};
   my $commit = $self->_get_commit($c);
   $c->stash(
     commit    => $commit,
     info      => $project->info,
     log_lines => [$project->list_revs(
         sha1 => $commit->sha1,
-        count => Gitalist->config->{paging}{summary} || 50
+        count => Gitalist->config->{paging}{summary} || 10
     )],
     refs      => $project->references,
     heads     => [$project->heads],
@@ -151,7 +144,7 @@ The current list of heads (aka branches) in the repo.
 sub heads : Local {
   my ( $self, $c ) = @_;
   $c->stash( current_model => 'GitRepos' );
-  my $project = $c->model()->project( $c->stash->{project} );
+  my $project = $c->stash->{Project};
   $c->stash(
     commit => $self->_get_commit($c),
     heads  => [$project->heads],
@@ -227,12 +220,13 @@ Exposes a given commit.
 
 sub commit : Local {
   my ( $self, $c ) = @_;
-
+  $c->stash(current_model => 'GitRepos');
+  my $project = $c->stash->{Project};
   my $commit = $self->_get_commit($c);
   $c->stash(
       commit      => $commit,
-      diff_tree   => ($c->model()->diff(commit => $commit))[0],
-      refs      => $c->model()->references,
+      diff_tree   => ($project->diff(commit => $commit))[0],
+      refs      => $project->references,
       action      => 'commit',
   );
 }
@@ -273,11 +267,12 @@ Expose an abbreviated log of a given sha1.
 
 sub shortlog : Local {
   my ( $self, $c ) = @_;
-
+  $c->stash(current_model => 'GitRepos');
+  my $project = $c->stash->{Project};
   my $commit  = $self->_get_commit($c);
   my %logargs = (
       sha1   => $commit->sha1,
-      count  => Gitalist->config->{paging}{log},
+      count  => Gitalist->config->{paging}{log} || 25,
       ($c->req->param('f') ? (file => $c->req->param('f')) : ())
   );
 
@@ -287,8 +282,8 @@ sub shortlog : Local {
 
   $c->stash(
       commit    => $commit,
-      log_lines => [$c->model()->list_revs(%logargs)],
-      refs      => $c->model()->references,
+      log_lines => [$project->list_revs(%logargs)],
+      refs      => $project->references,
       action    => 'shortlog',
       page      => $page,
   );
@@ -312,14 +307,15 @@ The tree of a given commit.
 
 sub tree : Local {
   my ( $self, $c ) = @_;
-
+  $c->stash(current_model => 'GitRepos');
+  my $project = $c->stash->{Project};
   my $commit = $self->_get_commit($c, $c->req->param('hb'));
-  my $tree   = $c->model()->get_object($c->req->param('h') || $commit->tree_sha1);
+  my $tree   = $project->get_object($c->req->param('h') || $commit->tree_sha1);
   $c->stash(
       # XXX Useful defaults needed ...
       commit    => $commit,
       tree      => $tree,
-      tree_list => [$c->model()->list_tree($tree->sha1)],
+      tree_list => [$project->list_tree($tree->sha1)],
          path      => $c->req->param('f') || '',
       action    => 'tree',
   );
@@ -333,8 +329,8 @@ Expose the local reflog. This may go away.
 
 sub reflog : Local {
   my ( $self, $c ) = @_;
-
-  my @log = $c->model()->reflog(
+  $c->stash(current_model => 'GitRepos');
+  my @log = $c->stash->{Project}->reflog(
       '--since=yesterday'
   );
 
@@ -346,7 +342,8 @@ sub reflog : Local {
 
 sub search : Local {
   my($self, $c) = @_;
-
+  $c->stash(current_action => 'GitRepos');
+  my $project = $c->stash->{Project};
   my $commit  = $self->_get_commit($c);
   # Lifted from /shortlog.
   my %logargs = (
@@ -362,7 +359,7 @@ sub search : Local {
 
   $c->stash(
       commit  => $commit,
-      results => [$c->model()->list_revs(%logargs)],
+      results => [$project->list_revs(%logargs)],
       action  => 'search',
          # This could be added - page      => $page,
   );
@@ -485,11 +482,13 @@ sub header {
     );
 
   if(defined $project) {
-    $c->stash(
-      search_text => ( $c->req->param('s') || $c->req->param('searchtext') || ''),
-      search_hash => ( $c->req->param('hb') || $c->req->param('hashbase')
-          || $c->req->param('h')  || $c->req->param('hash')
-          || 'HEAD' ),
+      $c->stash(
+          search_text => ( $c->req->param('s') ||
+                               $c->req->param('searchtext') || ''),
+          search_hash => ( $c->req->param('hb') || $c->req->param('hashbase')
+                               || $c->req->param('h')  || $c->req->param('hash')
+                                   || 'HEAD' ),
+          Project => $c->model('GitRepos')->project($project),
       );
   }
 }
@@ -592,8 +591,7 @@ sub end : ActionClass('RenderView') {
   if ($c->stash->{project}) {
       if ($c->stash->{current_model} &&
               $c->stash->{current_model} eq 'GitRepos') {
-          my $project = $c->model()->project($c->stash->{project});
-          $c->stash->{HEAD} = $project->head_hash;
+          $c->stash->{HEAD} = $c->stash->{Project}->head_hash;
       } else {
           $c->stash->{HEAD} = $c->model()->head_hash;
       }