X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist%2FController%2FRoot.pm;h=af8cfb641244cdd2d0dbb37d2fe83edf4c5690ba;hb=d9a9b56b39318b92f10c9c11361ea534cf786993;hp=822f3b51e0e9a92735487ecc5959b9b103abcf92;hpb=ad8884fc358e6a8a37c03589818fcd2b81d68420;p=catagits%2FGitalist.git

diff --git a/lib/Gitalist/Controller/Root.pm b/lib/Gitalist/Controller/Root.pm
index 822f3b5..af8cfb6 100644
--- a/lib/Gitalist/Controller/Root.pm
+++ b/lib/Gitalist/Controller/Root.pm
@@ -30,7 +30,8 @@ use IO::Capture::Stdout;
 
 =head2 run_gitweb
 
-The main shim around C<gitweb.pm>.
+The C<gitweb> shim. It should now only be explicitly accessible by
+modifying the URL.
 
 =cut
 
@@ -46,11 +47,11 @@ sub run_gitweb {
       $action->();
     };
     $capture->stop();
-    
+
     use Data::Dumper;
     die Dumper($@)
       if $@;
-  
+
     my $output = join '', $capture->read;
     $c->stash->{gitweb_output} = $output;
     $c->stash->{template} = 'gitweb.tt2';
@@ -58,11 +59,11 @@ sub run_gitweb {
 }
 
 sub _get_commit {
-  my($self, $c) = @_;
+  my($self, $c, $haveh) = @_;
 
-  my $h = $c->req->param('h');
+  my $h = $haveh || $c->req->param('h');
   my $f = $c->req->param('f');
-  my $m = $c->model('Git');
+  my $m = $c->model();
 
   # Either use the provided h(ash) parameter, the f(ile) parameter or just use HEAD.
   my $hash = ($h =~ /[^a-f0-9]/ ? $m->head_hash($h) : $h)
@@ -71,7 +72,7 @@ sub _get_commit {
           # XXX This could definitely use more context.
           || Carp::croak("Couldn't find a hash for the commit object!");
 
-    
+
   (my $pd = $m->project_dir( $m->project )) =~ s{/\.git$}();
   my $commit = $m->get_object($hash)
     or Carp::croak("Couldn't find a commit object for '$hash' in '$pd'!");
@@ -87,14 +88,14 @@ Provides the project listing.
 
 sub index :Path :Args(0) {
   my ( $self, $c ) = @_;
-
+  $c->stash(current_model => 'GitRepos');
   # Leave actions up to gitweb at this point.
   return $self->run_gitweb($c)
     if $c->req->param('a');
 
-  my $list = $c->model('Git')->list_projects;
+  my $list = $c->model()->list_projects;
   unless(@$list) {
-    die "No projects found";
+    die "No projects found in ". $c->model->repo_dir;
   }
 
   $c->stash(
@@ -116,12 +117,12 @@ sub summary : Local {
   my $commit = $self->_get_commit($c);
   $c->stash(
     commit    => $commit,
-    info      => $c->model('Git')->project_info($c->model('Git')->project),
-    log_lines => [$c->model('Git')->list_revs(
+    info      => $c->model()->project_info($c->model()->project),
+    log_lines => [$c->model()->list_revs(
       sha1 => $commit->sha1, count => Gitalist->config->{paging}{summary}
     )],
-    refs      => $c->model('Git')->references,
-    heads     => [$c->model('Git')->heads],
+    refs      => $c->model()->references,
+    heads     => [$c->model()->heads],
     action    => 'summary',
   );
 }
@@ -137,7 +138,7 @@ sub heads : Local {
 
   $c->stash(
     commit => $self->_get_commit($c),
-    heads  => [$c->model('Git')->heads],
+    heads  => [$c->model()->heads],
     action => 'heads',
   );
 }
@@ -152,17 +153,17 @@ sub blob : Local {
   my ( $self, $c ) = @_;
 
   my $h  = $c->req->param('h')
-       || $c->model('Git')->hash_by_path($c->req->param('f'))
+       || $c->model()->hash_by_path($c->req->param('f'))
        || die "No file or sha1 provided.";
   my $hb = $c->req->param('hb')
-       || $c->model('Git')->head_hash
+       || $c->model()->head_hash
        || die "Couldn't discern the corresponding head.";
 
   my $filename = $c->req->param('f') || '';
 
   $c->stash(
-    blob     => $c->model('Git')->get_object($h)->content,
-    head     => $c->model('Git')->get_object($hb),
+    blob     => $c->model()->get_object($h)->content,
+    head     => $c->model()->get_object($hb),
     filename => $filename,
     # XXX Hack hack hack, see View::SyntaxHighlight
     language => ($filename =~ /\.p[lm]$/ ? 'Perl' : ''),
@@ -184,7 +185,7 @@ sub blobdiff : Local {
   my $commit = $self->_get_commit($c);
   my $filename = $c->req->param('f')
               || croak("No file specified!");
-  my($tree, $patch) = $c->model('Git')->diff(
+  my($tree, $patch) = $c->model()->diff(
     commit => $commit,
     parent => $c->req->param('hp') || '',
     file   => $filename,
@@ -214,8 +215,8 @@ sub commit : Local {
   my $commit = $self->_get_commit($c);
   $c->stash(
       commit      => $commit,
-      diff_tree   => ($c->model('Git')->diff(commit => $commit))[0],
-      branches_on => [$c->model('Git')->refs_for($commit->sha1)],
+      diff_tree   => ($c->model()->diff(commit => $commit))[0],
+      branches_on => [$c->model()->refs_for($commit->sha1)],
       action      => 'commit',
   );
 }
@@ -230,7 +231,7 @@ sub commitdiff : Local {
   my ( $self, $c ) = @_;
 
   my $commit = $self->_get_commit($c);
-  my($tree, $patch) = $c->model('Git')->diff(
+  my($tree, $patch) = $c->model()->diff(
       commit => $commit,
       parent => $c->req->param('hp') || '',
       patch  => 1,
@@ -270,10 +271,10 @@ sub shortlog : Local {
 
   $c->stash(
       commit    => $commit,
-      log_lines => [$c->model('Git')->list_revs(%logargs)],
-      refs      => $c->model('Git')->references,
+      log_lines => [$c->model()->list_revs(%logargs)],
+      refs      => $c->model()->references,
       action    => 'shortlog',
-      page      => $page + 1,
+      page      => $page,
   );
 }
 
@@ -296,12 +297,14 @@ The tree of a given commit.
 sub tree : Local {
   my ( $self, $c ) = @_;
 
-  my $commit = $self->_get_commit($c);
+  my $commit = $self->_get_commit($c, $c->req->param('hb'));
+  my $tree   = $c->model()->get_object($c->req->param('h') || $commit->tree_sha1);
   $c->stash(
       # XXX Useful defaults needed ...
       commit    => $commit,
-      tree      => $c->model('Git')->get_object($c->req->param('hb')),
-      tree_list => [$c->model('Git')->list_tree($commit->sha1)],
+      tree      => $tree,
+      tree_list => [$c->model()->list_tree($tree->sha1)],
+	  path      => $c->req->param('f') || '',
       action    => 'tree',
   );
 }
@@ -315,7 +318,7 @@ Expose the local reflog. This may go away.
 sub reflog : Local {
   my ( $self, $c ) = @_;
 
-  my @log = $c->model('Git')->reflog(
+  my @log = $c->model()->reflog(
       '--since=yesterday'
   );
 
@@ -325,6 +328,34 @@ sub reflog : Local {
   );
 }
 
+sub search : Local {
+  my($self, $c) = @_;
+
+  my $commit  = $self->_get_commit($c);
+  # Lifted from /shortlog.
+  my %logargs = (
+    sha1   => $commit->sha1,
+    count  => Gitalist->config->{paging}{log},
+    ($c->req->param('f') ? (file => $c->req->param('f')) : ()),
+	search => {
+	  type   => $c->req->param('type'),
+	  text   => $c->req->param('text'),
+	  regexp => $c->req->param('regexp') || 0,
+    }
+  );
+
+  $c->stash(
+      commit  => $commit,
+      results => [$c->model()->list_revs(%logargs)],
+      action  => 'search',
+	  # This could be added - page      => $page,
+  );
+}
+
+sub search_help : Local {
+    Carp::croak "Not implemented.";
+}
+
 =head2 auto
 
 Populate the header and footer. Perhaps not the best location.
@@ -364,7 +395,7 @@ sub header {
   }
 
   $c->stash->{version}     = $c->config->{version};
-  $c->stash->{git_version} = $c->model('Git')->run_cmd('--version');
+  $c->stash->{git_version} = $c->model()->run_cmd('--version');
   $c->stash->{title}       = $title;
 
   #$c->stash->{baseurl} = $ENV{PATH_INFO} && uri_escape($base_url);
@@ -422,7 +453,7 @@ sub header {
 
   if(defined $project) {
     $c->stash(
-      search_text => ( $c->req->param('s') || $c->req->param('searchtext') ),
+      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' ),
@@ -440,7 +471,7 @@ sub footer {
   my $project = $c->req->param('project')  || $c->req->param('p');
   if(defined $project) {
     (my $pstr = $project) =~ s[/?\.git$][];
-    my $descr = $c->model('Git')->project_info($project)->{description};
+    my $descr = $c->model()->project_info($project)->{description};
     $c->stash->{project_description} = defined $descr
       ? $descr
       : '';
@@ -515,6 +546,7 @@ sub feed_info {
 
   return %res;
 }
+
 =head2 end
 
 Attempt to render a view, if needed.
@@ -522,13 +554,29 @@ Attempt to render a view, if needed.
 =cut
 
 sub end : ActionClass('RenderView') {
-  # Give every view the current HEAD.
-  $_[1]->stash->{HEAD} = $_[1]->model('Git')->head_hash;
+    my ($self, $c) = @_;
+    # Give project views the current HEAD.
+    if ($c->stash->{project}) {
+        $c->stash->{HEAD} = $c->model()->head_hash;
+    }
+
+    # XXX Move this into a plugin!
+    use DateTime::Format::Human::Duration;
+    $c->stash->{time_since} = sub {
+        my($dt, $now) = ($self, DateTime->now);
+
+        my($age) = $dt < (DateTime->now - DateTime::Duration->new(days=>12))
+            ? $dt->ymd
+                : DateTime::Format::Human::Duration->new->format_duration($now - $dt)
+                    =~ /^(?:.*?weeks?, )?(\d+ [^\d]+)(?:,|$) /;
+
+        return $age;
+    };
 }
 
 =head1 AUTHOR
 
-Dan Brook,,,
+Dan Brook
 
 =head1 LICENSE