X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist%2FController%2FRoot.pm;h=5a75fe75d90a09621c341f289f2c9d3d535654da;hb=d8abdf1cd357564b8e9e7b2c766feb9990a941fb;hp=a71c03d7f4ab3349b1a39d376b938e08d688c348;hpb=e66db0fb45dbcb590646acf7c5fd6884b1ee65a4;p=catagits%2FGitalist.git

diff --git a/lib/Gitalist/Controller/Root.pm b/lib/Gitalist/Controller/Root.pm
index a71c03d..5a75fe7 100644
--- a/lib/Gitalist/Controller/Root.pm
+++ b/lib/Gitalist/Controller/Root.pm
@@ -27,9 +27,14 @@ Gitalist::Controller::Root - Root Controller for Gitalist
 =cut
 
 use IO::Capture::Stdout;
-use File::Slurp qw(slurp);
 
-#sub default :Path {
+=head2 run_gitweb
+
+The C<gitweb> shim. It should now only be explicitly accessible by
+modifying the URL.
+
+=cut
+
 sub run_gitweb {
   my ( $self, $c ) = @_;
 
@@ -42,154 +47,472 @@ 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';
   }
 }
 
+sub _get_commit {
+  my($self, $c, $haveh) = @_;
+
+  my $h = $haveh || $c->req->param('h') || '';
+  my $f = $c->req->param('f');
+
+  # 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)
+          || ($f && $m->hash_by_path($f))
+          || $m->head_hash
+          # XXX This could definitely use more context.
+          || Carp::croak("Couldn't find a hash for the commit object!");
+
+  my $commit = $m->get_object($hash)
+    or Carp::croak("Couldn't find a commit object for '$hash' in '$pd'!");
+
+  return $commit;
+}
+
+=head2 index
+
+Provides the project listing.
+
+=cut
+
 sub index :Path :Args(0) {
+    my ( $self, $c ) = @_;
+    $c->detach($c->req->param('a')) if $c->req->param('a');
+    $c->stash(current_model => 'GitRepos');
+
+    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',
+    );
+}
+
+=head2 summary
+
+A summary of what's happening in the repo.
+
+=cut
+
+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      => $project->info,
+    log_lines => [$project->list_revs(
+        sha1 => $commit->sha1,
+        count => Gitalist->config->{paging}{summary} || 10
+    )],
+    refs      => $project->references,
+    heads     => [$project->heads],
+    action    => 'summary',
+);
+}
 
-  # Leave actions up to gitweb at this point.
-  return $self->run_gitweb($c)
-    if $c->req->param('a');
+=head2 heads
 
-  my $list = $c->model('Git')->list_projects;
-  unless(@$list) {
-    die "No projects found";
-  }
+The current list of heads (aka branches) in the repo.
 
+=cut
+
+sub heads : Local {
+  my ( $self, $c ) = @_;
+  $c->stash( current_model => 'GitRepos' );
+  my $project = $c->stash->{Project};
   $c->stash(
-    searchtext => $c->req->param('searchtext') || '',
-    projects   => $list,
-    action     => 'index',
+    commit => $self->_get_commit($c),
+    heads  => [$project->heads],
+    action => 'heads',
   );
 }
 
+=head2 blob
+
+The blob action i.e the contents of a file.
+
+=cut
+
+sub blob : Local {
+  my ( $self, $c ) = @_;
+
+  my $h  = $c->req->param('h')
+       || $c->model()->hash_by_path($c->req->param('f'))
+       || die "No file or sha1 provided.";
+  my $hb = $c->req->param('hb')
+       || $c->model()->head_hash
+       || die "Couldn't discern the corresponding head.";
+
+  my $filename = $c->req->param('f') || '';
+
+  $c->stash(
+    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' : ''),
+    action   => 'blob',
+  );
+
+  $c->forward('View::SyntaxHighlight');
+}
+
+=head2 blobdiff
+
+Exposes a given diff of a blob.
+
+=cut
+
+sub blobdiff : Local {
+  my ( $self, $c ) = @_;
+
+  my $commit = $self->_get_commit($c);
+  my $filename = $c->req->param('f')
+              || croak("No file specified!");
+  my($tree, $patch) = $c->model()->diff(
+    commit => $commit,
+    parent => $c->req->param('hp') || '',
+    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.
+
+=cut
+
+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   => ($project->diff(commit => $commit))[0],
+      refs      => $project->references,
+      action      => 'commit',
+  );
+}
+
+=head2 commitdiff
+
+Exposes a given diff of a commit.
+
+=cut
+
+sub commitdiff : Local {
+  my ( $self, $c ) = @_;
+
+  my $commit = $self->_get_commit($c);
+  my($tree, $patch) = $c->model()->diff(
+      commit => $commit,
+      parent => $c->req->param('hp') || '',
+      patch  => 1,
+  );
+  $c->stash(
+    commit    => $commit,
+    diff_tree => $tree,
+    diff      => $patch,
+    # XXX Hack hack hack, see View::SyntaxHighlight
+    blobs     => [map $_->{diff}, @$patch],
+    language  => 'Diff',
+    action    => 'commitdiff',
+  );
+
+  $c->forward('View::SyntaxHighlight');
+}
+
+=head2 shortlog
+
+Expose an abbreviated log of a given sha1.
+
+=cut
+
+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');
+
+  $c->stash(
+      commit    => $commit,
+      log_lines => [$project->list_revs(%logargs)],
+      refs      => $project->references,
+      action    => 'shortlog',
+      page      => $page,
+  );
+}
+
+=head2 log
+
+Calls shortlog internally. Perhaps that should be reversed ...
+
+=cut
+sub log : Local {
+    $_[0]->shortlog($_[1]);
+    $_[1]->stash->{action} = 'log';
+}
+
+=head2 tree
+
+The tree of a given commit.
+
+=cut
+
+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   = $project->get_object($c->req->param('h') || $commit->tree_sha1);
+  $c->stash(
+      # XXX Useful defaults needed ...
+      commit    => $commit,
+      tree      => $tree,
+      tree_list => [$project->list_tree($tree->sha1)],
+	  path      => $c->req->param('f') || '',
+      action    => 'tree',
+  );
+}
+
+=head2 reflog
+
+Expose the local reflog. This may go away.
+
+=cut
+
+sub reflog : Local {
+  my ( $self, $c ) = @_;
+  $c->stash(current_model => 'GitRepos');
+  my @log = $c->stash->{Project}->reflog(
+      '--since=yesterday'
+  );
+
+  $c->stash(
+      log    => \@log,
+      action => 'reflog',
+  );
+}
+
+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 {
+    Carp::croak "Not implemented.";
+}
+
+=head2 auto
+
+Populate the header and footer. Perhaps not the best location.
+
+=cut
+
 sub auto : Private {
-    my($self, $c) = @_;
+  my($self, $c) = @_;
+
+  # 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.
 use Gitalist::Util qw(to_utf8);
-use HTML::Entities qw(encode_entities);
-use URI::Escape    qw(uri_escape);
 # Formally git_header_html
 sub header {
   my($self, $c) = @_;
 
-	my $title = $c->config->{sitename};
+  my $title = $c->config->{sitename};
 
   my $project   = $c->req->param('project')  || $c->req->param('p');
   my $action    = $c->req->param('action')   || $c->req->param('a');
   my $file_name = $c->req->param('filename') || $c->req->param('f');
-	if(defined $project) {
-		$title .= " - " . to_utf8($project);
-		if (defined $action) {
-			$title .= "/$action";
-			if (defined $file_name) {
-				$title .= " - " . encode_entities($file_name);
-				if ($action eq "tree" && $file_name !~ m|/$|) {
-					$title .= "/";
-				}
-			}
-		}
-	}
+  if(defined $project) {
+    $title .= " - " . to_utf8($project);
+    if (defined $action) {
+      $title .= "/$action";
+      if (defined $file_name) {
+        $title .= " - " . $file_name;
+        if ($action eq "tree" && $file_name !~ m|/$|) {
+          $title .= "/";
+        }
+      }
+    }
+  }
 
-	$c->stash->{version}     = $c->config->{version};
-	$c->stash->{git_version} = $c->model('Git')->run_cmd('--version');
-	$c->stash->{title}       = $title;
+  $c->stash->{version}     = $c->config->{version};
+  $c->stash->{git_version} = $c->model()->run_cmd('--version');
+  $c->stash->{title}       = $title;
 
   #$c->stash->{baseurl} = $ENV{PATH_INFO} && uri_escape($base_url);
-	$c->stash->{stylesheet} = $c->config->{stylesheet} || 'gitweb.css';
+  $c->stash->{stylesheet} = $c->config->{stylesheet} || 'gitweb.css';
 
-	$c->stash->{project} = $project;
+  $c->stash->{project} = $project;
   my @links;
-	if($project) {
-		my %href_params = $self->feed_info($c);
-		$href_params{'-title'} ||= 'log';
+  if($project) {
+    my %href_params = $self->feed_info($c);
+    $href_params{'-title'} ||= 'log';
 
-		foreach my $format qw(RSS Atom) {
-			my $type = lc($format);
+    foreach my $format qw(RSS Atom) {
+      my $type = lc($format);
       push @links, {
-			      rel   => 'alternate',
-			      title => "$project - $href_params{'-title'} - $format feed",
-            # XXX A bit hacky and could do with using gitweb::href() features
-			      href  => "?a=$type;p=$project",
-			      type  => "application/$type+xml"
+        rel   => 'alternate',
+        title => "$project - $href_params{'-title'} - $format feed",
+
+        # XXX A bit hacky and could do with using gitweb::href() features
+        href  => "?a=$type;p=$project",
+        type  => "application/$type+xml"
         }, {
-			      rel   => 'alternate',
-            # XXX This duplication also feels a bit awkward
-			      title => "$project - $href_params{'-title'} - $format feed (no merges)",
-			      href  => "?a=$type;p=$project;opt=--no-merges",
-			      type  => "application/$type+xml"
+        rel   => 'alternate',
+
+        # XXX This duplication also feels a bit awkward
+        title => "$project - $href_params{'-title'} - $format feed (no merges)",
+        href  => "?a=$type;p=$project;opt=--no-merges",
+        type  => "application/$type+xml"
         };
-		}
-	} else {
+    }
+  } else {
     push @links, {
-        rel => "alternate",
-        title => $c->config->{sitename}." projects list",
-        href => '?a=project_index',
-        type => "text/plain; charset=utf-8"
-    }, {
-        rel => "alternate",
-        title => $c->config->{sitename}." projects feeds",
-        href => '?a=opml',
-        type => "text/plain; charset=utf-8"
-    };
-	}
+      rel => "alternate",
+      title => $c->config->{sitename}." projects list",
+      href => '?a=project_index',
+      type => "text/plain; charset=utf-8"
+      }, {
+      rel => "alternate",
+      title => $c->config->{sitename}." projects feeds",
+      href => '?a=opml',
+      type => "text/plain; charset=utf-8"
+      };
+  }
 
-	$c->stash->{favicon} = $c->config->{favicon};
+  $c->stash->{favicon} = $c->config->{favicon};
 
-	# </head><body>
+  # </head><body>
 
-	$c->stash(
-    logo_url      => uri_escape($c->config->{logo_url}),
-	  logo_label    => encode_entities($c->config->{logo_label}),
-	  logo_img      => $c->config->{logo},
-	  home_link     => uri_escape($c->config->{home_link}),
+  $c->stash(
+    logo_url      => $c->config->{logo_url},
+    logo_label    => $c->config->{logo_label},
+    logo_img      => $c->config->{logo},
+    home_link     => $c->config->{home_link},
     home_link_str => $c->config->{home_link_str},
-  );
-
-	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'
     );
-	}
+
+  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' ),
+          Project => $c->model('GitRepos')->project($project),
+      );
+  }
 }
 
 # Formally git_footer_html
 sub footer {
   my($self, $c) = @_;
 
-	my $feed_class = 'rss_logo';
+  my $feed_class = 'rss_logo';
 
   my @feeds;
   my $project = $c->req->param('project')  || $c->req->param('p');
-	if(defined $project) {
+  if(defined $project) {
     (my $pstr = $project) =~ s[/?\.git$][];
-		my $descr = $c->model('Git')->project_info($project)->{description};
-		$c->stash->{project_description} = defined $descr
-			? encode_entities($descr)
-			: '';
+    my $descr = $c->model()->project_info($project)->{description};
+    $c->stash->{project_description} = defined $descr
+      ? $descr
+      : '';
 
-		my %href_params = $self->feed_info($c);
-		if (!%href_params) {
-			$feed_class .= ' generic';
-		}
-		$href_params{'-title'} ||= 'log';
+    my %href_params = $self->feed_info($c);
+    if (!%href_params) {
+      $feed_class .= ' generic';
+    }
+    $href_params{'-title'} ||= 'log';
 
     @feeds = [
       map +{
@@ -197,18 +520,18 @@ sub footer {
         title => "$href_params{'-title'} $_ feed",
         href  => "/?p=$project;a=\L$_",
         name  => lc $_,
-      }, qw(RSS Atom)
-    ];
-	} else {
+        }, qw(RSS Atom)
+      ];
+  } else {
     @feeds = [
       map {
         class => $feed_class,
-        title => '',
-        href  => "/?a=$_->[0]",
-        name  => $_->[1],
-      }, [opml=>'OPML'],[project_index=>'TXT'],
-    ];
-	}
+          title => '',
+          href  => "/?a=$_->[0]",
+          name  => $_->[1],
+        }, [opml=>'OPML'],[project_index=>'TXT'],
+      ];
+  }
 }
 
 # XXX This feels wrong here, should probably be refactored.
@@ -217,52 +540,107 @@ sub footer {
 sub feed_info {
   my($self, $c) = @_;
 
-	my $format = shift || 'Atom';
-	my %res = (action => lc($format));
+  my $format = shift || 'Atom';
+  my %res = (action => lc($format));
 
-	# feed links are possible only for project views
-	return unless $c->req->param('project');
-	# some views should link to OPML, or to generic project feed,
-	# or don't have specific feed yet (so they should use generic)
-	return if $c->req->param('action') =~ /^(?:tags|heads|forks|tag|search)$/x;
+  # feed links are possible only for project views
+  return unless $c->req->param('project');
 
-	my $branch;
+  # some views should link to OPML, or to generic project feed,
+  # or don't have specific feed yet (so they should use generic)
+  return if $c->req->param('action') =~ /^(?:tags|heads|forks|tag|search)$/x;
+
+  my $branch;
   my $hash = $c->req->param('h')  || $c->req->param('hash');
   my $hash_base = $c->req->param('hb') || $c->req->param('hashbase');
-	# branches refs uses 'refs/heads/' prefix (fullname) to differentiate
-	# from tag links; this also makes possible to detect branch links
-	if ((defined $hash_base && $hash_base =~ m!^refs/heads/(.*)$!) ||
-	    (defined $hash      && $hash      =~ m!^refs/heads/(.*)$!)) {
-		$branch = $1;
-	}
-	# find log type for feed description (title)
-	my $type = 'log';
+
+  # branches refs uses 'refs/heads/' prefix (fullname) to differentiate
+  # from tag links; this also makes possible to detect branch links
+  if ((defined $hash_base && $hash_base =~ m!^refs/heads/(.*)$!) ||
+    (defined $hash      && $hash      =~ m!^refs/heads/(.*)$!)) {
+    $branch = $1;
+  }
+
+  # find log type for feed description (title)
+  my $type = 'log';
   my $file_name = $c->req->param('f') || $c->req->param('filename');
-	if (defined $file_name) {
-		$type  = "history of $file_name";
-		$type .= "/" if $c->req->param('action') eq 'tree';
-		$type .= " on '$branch'" if (defined $branch);
-	} else {
-		$type = "log of $branch" if (defined $branch);
-	}
+  if (defined $file_name) {
+    $type  = "history of $file_name";
+    $type .= "/" if $c->req->param('action') eq 'tree';
+    $type .= " on '$branch'" if (defined $branch);
+  } else {
+    $type = "log of $branch" if (defined $branch);
+  }
 
-	$res{-title} = $type;
-	$res{'hash'} = (defined $branch ? "refs/heads/$branch" : undef);
-	$res{'file_name'} = $file_name;
+  $res{-title} = $type;
+  $res{'hash'} = (defined $branch ? "refs/heads/$branch" : undef);
+  $res{'file_name'} = $file_name;
 
-	return %res;
+  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