X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist%2FController%2FRoot.pm;h=32e7d7ca5103303d100eeba58e6e4e0f3faaef09;hb=8bb7649bb9fb1347e1028d03b6eb6a21bcd115a7;hp=0cb7416dac0b29c8cabef12ca85948b4d82f16cf;hpb=f5da8e7a3489dfcc3b1dbfd5b36a8c4d917190fc;p=catagits%2FGitalist.git

diff --git a/lib/Gitalist/Controller/Root.pm b/lib/Gitalist/Controller/Root.pm
index 0cb7416..32e7d7c 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,21 @@ 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');
+
+  # FIXME this can die when everything is migrated
+  my ($m, $pd);
+  if (defined $c->stash->{current_model} &&
+          $c->stash->{current_model} eq 'GitRepos') {
+      $m = $c->stash->{Project};
+      $pd = $m->path;
+  } else {
+      $m = $c->model();
+      ($pd = $m->project_dir( $m->project )) =~ s{/\.git$}();
+  }
 
   # 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,8 +82,6 @@ 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'!");
 
@@ -86,22 +95,20 @@ Provides the project listing.
 =cut
 
 sub index :Path :Args(0) {
-  my ( $self, $c ) = @_;
-
-  # Leave actions up to gitweb at this point.
-  return $self->run_gitweb($c)
-    if $c->req->param('a');
+    my ( $self, $c ) = @_;
+    $c->detach($c->req->param('a')) if $c->req->param('a');
+    $c->stash(current_model => 'GitRepos');
 
-  my $list = $c->model('Git')->list_projects;
-  unless(@$list) {
-    die "No projects found";
-  }
+    my $list = $c->model()->list_projects;
+    unless(@$list) {
+        die "No projects found in ". $c->model->repo_dir;
+    }
 
-  $c->stash(
-    searchtext => $c->req->param('searchtext') || '',
-    projects   => $list,
-    action     => 'index',
-  );
+    $c->stash(
+        searchtext => $c->req->param('searchtext') || '',
+        projects   => $list,
+        action     => 'index',
+    );
 }
 
 =head2 summary
@@ -112,17 +119,20 @@ A summary of what's happening in the repo.
 
 sub summary : Local {
   my ( $self, $c ) = @_;
-
+  $c->stash(current_model => 'GitRepos');
+  my $project = $c->stash->{Project};
   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(sha1 => $commit->sha1, count => 16)],
-    refs      => $c->model('Git')->references,
-    heads     => [$c->model('Git')->heads],
-    HEAD      => $c->model('Git')->head_hash,
+    info      => $project->info,
+    log_lines => [$project->list_revs(
+        sha1 => $commit->sha1,
+        count => Gitalist->config->{paging}{summary} || 10
+    )],
+    refs      => $project->references,
+    heads     => [$project->heads],
     action    => 'summary',
-  );
+);
 }
 
 =head2 heads
@@ -133,11 +143,11 @@ The current list of heads (aka branches) in the repo.
 
 sub heads : Local {
   my ( $self, $c ) = @_;
-
+  $c->stash( current_model => 'GitRepos' );
+  my $project = $c->stash->{Project};
   $c->stash(
     commit => $self->_get_commit($c),
-    heads  => [$c->model('Git')->heads],
-    HEAD   => $c->model('Git')->head_hash,
+    heads  => [$project->heads],
     action => 'heads',
   );
 }
@@ -150,19 +160,20 @@ The blob action i.e the contents of a file.
 
 sub blob : Local {
   my ( $self, $c ) = @_;
-
+  $c->stash(current_model => 'GitRepos');
+  my $project = $c->stash->{Project};
   my $h  = $c->req->param('h')
-       || $c->model('Git')->hash_by_path($c->req->param('f'))
+       || $project->hash_by_path($c->req->param('hb'), $c->req->param('f'))
        || die "No file or sha1 provided.";
   my $hb = $c->req->param('hb')
-       || $c->model('Git')->head_hash
+       || $project->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     => $project->get_object($h)->contents,
+    head     => $project->get_object($hb),
     filename => $filename,
     # XXX Hack hack hack, see View::SyntaxHighlight
     language => ($filename =~ /\.p[lm]$/ ? 'Perl' : ''),
@@ -172,6 +183,36 @@ sub blob : Local {
   $c->forward('View::SyntaxHighlight');
 }
 
+=head2 blobdiff
+
+Exposes a given diff of a blob.
+
+=cut
+
+sub blobdiff : Local {
+  my ( $self, $c ) = @_;
+  $c->stash(current_model => 'GitRepos');
+  my $commit = $self->_get_commit($c, $c->req->param('hb'));
+  my $filename = $c->req->param('f')
+              || croak("No file specified!");
+  my($tree, $patch) = $c->stash->{Project}->diff(
+    commit => $commit,
+    parent => $c->req->param('hpb') || '',
+    file   => $filename,
+    patch  => 1,
+  );
+  $c->stash(
+    commit    => $commit,
+    diff      => $patch,
+    # XXX Hack hack hack, see View::SyntaxHighlight
+    blobs     => [$patch->[0]->{diff}],
+    language  => 'Diff',
+    action    => 'blobdiff',
+  );
+
+  $c->forward('View::SyntaxHighlight');
+}
+
 =head2 commit
 
 Exposes a given commit.
@@ -180,12 +221,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('Git')->diff_tree($commit)],
-      branches_on => [$c->model('Git')->refs_for($commit->sha1)],
+      diff_tree   => ($project->diff(commit => $commit))[0],
+      refs      => $project->references,
       action      => 'commit',
   );
 }
@@ -198,15 +240,19 @@ Exposes a given diff of a commit.
 
 sub commitdiff : Local {
   my ( $self, $c ) = @_;
-
+  $c->stash(current_model => 'GitRepos');
   my $commit = $self->_get_commit($c);
-  my @difflist = $c->model('Git')->diff($commit->parent_sha1, $commit->sha1);
+  my($tree, $patch) = $c->stash->{Project}->diff(
+      commit => $commit,
+      parent => $c->req->param('hp') || undef,
+      patch  => 1,
+  );
   $c->stash(
     commit    => $commit,
-    diff_tree => [$c->model('Git')->diff_tree($commit)],
-    diff      => \@difflist,
+    diff_tree => $tree,
+    diff      => $patch,
     # XXX Hack hack hack, see View::SyntaxHighlight
-    blobs     => [map $_->{diff}, @difflist],
+    blobs     => [map $_->{diff}, @$patch],
     language  => 'Diff',
     action    => 'commitdiff',
   );
@@ -222,14 +268,25 @@ 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} || 25,
+      ($c->req->param('f') ? (file => $c->req->param('f')) : ())
+  );
+
+  my $page = $c->req->param('pg') || 0;
+  $logargs{skip} = $c->req->param('pg') * $logargs{count}
+    if $c->req->param('pg');
 
-  my $commit = $self->_get_commit($c);
-  # XXX Needs paging.
   $c->stash(
       commit    => $commit,
-      log_lines => [$c->model('Git')->list_revs(sha1 => $commit->sha1)],
-      refs      => $c->model('Git')->references,
+      log_lines => [$project->list_revs(%logargs)],
+      refs      => $project->references,
       action    => 'shortlog',
+      page      => $page,
   );
 }
 
@@ -251,13 +308,16 @@ The tree of a given commit.
 
 sub tree : Local {
   my ( $self, $c ) = @_;
-
-  my $commit = $self->_get_commit($c);
+  $c->stash(current_model => 'GitRepos');
+  my $project = $c->stash->{Project};
+  my $commit = $self->_get_commit($c, $c->req->param('hb'));
+  my $tree   = $project->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 => [$project->list_tree($tree->sha1)],
+	  path      => $c->req->param('f') || '',
       action    => 'tree',
   );
 }
@@ -270,8 +330,8 @@ Expose the local reflog. This may go away.
 
 sub reflog : Local {
   my ( $self, $c ) = @_;
-
-  my @log = $c->model('Git')->reflog(
+  $c->stash(current_model => 'GitRepos');
+  my @log = $c->stash->{Project}->reflog(
       '--since=yesterday'
   );
 
@@ -281,6 +341,83 @@ 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 = (
+    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 => [$project->list_revs(%logargs)],
+      action  => 'search',
+	  # This could be added - page      => $page,
+  );
+}
+
+sub search_help : Local {
+    # FIXME - implement search_help
+    Carp::croak "Not implemented.";
+}
+
+sub atom : Local {
+    # FIXME - implement atom
+    Carp::croak "Not implemented.";
+}
+
+sub rss : Local {
+    # FIXME - implement rss
+    Carp::croak "Not implemented.";
+}
+
+sub blobdiff_plain : Local {
+    # FIXME - implement blobdiff_plain
+    Carp::croak "Not implemented.";
+}
+
+sub blob_plain : Local {
+    # FIXME - implement blobdiff_plain
+    Carp::croak "Not implemented.";
+}
+
+sub patch : Local {
+    # FIXME - implement patches
+    Carp::croak "Not implemented.";
+}
+
+sub patches : Local {
+    # FIXME - implement patches
+    Carp::croak "Not implemented.";
+}
+
+sub snapshot : Local {
+    # FIXME - implement snapshot
+    Carp::croak "Not implemented.";
+}
+
+sub history : Local {
+    # FIXME - implement history
+    Carp::croak "Not implemented.";
+}
+
+sub commitdiff_plain : Local {
+    # FIXME - implement commitdiff_plain
+    Carp::croak "Not implemented.";
+}
+
+
+
 =head2 auto
 
 Populate the header and footer. Perhaps not the best location.
@@ -288,15 +425,28 @@ Populate the header and footer. Perhaps not the best location.
 =cut
 
 sub auto : Private {
-    my($self, $c) = @_;
+  my($self, $c) = @_;
 
-    # XXX Temp hack until a decent solution is invented.
-    $c->model('Git')->project($c->req->param('p'))
-      if $c->req->param('p');
+  # XXX Move these to a plugin!
+  $c->stash(
+    time_since => sub {
+      return 'never' unless $_[0];
+      return age_string(time - $_[0]->epoch);
+    },
+    short_cmt => sub {
+      my $cmt = shift;
+      my($line) = split /\n/, $cmt;
+      $line =~ s/^(.{70,80}\b).*/$1 …/;
+      return $line;
+    },
+    abridged_description => sub {
+        join(' ', grep { defined } (split / /, shift)[0..10]);
+    },
+  );
 
-    # Yes, this is hideous.
-    $self->header($c);
-    $self->footer($c);
+  # Yes, this is hideous.
+  $self->header($c);
+  $self->footer($c);
 }
 
 # XXX This could probably be dropped altogether.
@@ -324,7 +474,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);
@@ -381,11 +531,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),
       );
   }
 }
@@ -400,7 +552,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
       : '';
@@ -475,17 +627,69 @@ sub feed_info {
 
   return %res;
 }
+
 =head2 end
 
 Attempt to render a view, if needed.
 
 =cut
 
-sub end : ActionClass('RenderView') {}
+sub end : ActionClass('RenderView') {
+  my ($self, $c) = @_;
+  # Give project views the current HEAD.
+  if ($c->stash->{project}) {
+      if ($c->stash->{current_model} &&
+              $c->stash->{current_model} eq 'GitRepos') {
+          $c->stash->{HEAD} = $c->stash->{Project}->head_hash;
+      } else {
+          $c->stash->{HEAD} = $c->model()->head_hash;
+      }
+  }
+}
+
+sub error_404 :Private {
+    my ($self, $c) = @_;
+    $c->response->status(404);
+    $c->stash(
+        title => 'Page not found',
+        content => 'Page not found',
+    )
+}
+
+sub age_string {
+	my $age = shift;
+	my $age_str;
+
+	if ($age > 60*60*24*365*2) {
+		$age_str = (int $age/60/60/24/365);
+		$age_str .= " years ago";
+	} elsif ($age > 60*60*24*(365/12)*2) {
+		$age_str = int $age/60/60/24/(365/12);
+		$age_str .= " months ago";
+	} elsif ($age > 60*60*24*7*2) {
+		$age_str = int $age/60/60/24/7;
+		$age_str .= " weeks ago";
+	} elsif ($age > 60*60*24*2) {
+		$age_str = int $age/60/60/24;
+		$age_str .= " days ago";
+	} elsif ($age > 60*60*2) {
+		$age_str = int $age/60/60;
+		$age_str .= " hours ago";
+	} elsif ($age > 60*2) {
+		$age_str = int $age/60;
+		$age_str .= " min ago";
+	} elsif ($age > 2) {
+		$age_str = int $age;
+		$age_str .= " sec ago";
+	} else {
+		$age_str .= " right now";
+	}
+	return $age_str;
+}
 
 =head1 AUTHOR
 
-Dan Brook,,,
+Dan Brook
 
 =head1 LICENSE