#
__PACKAGE__->config->{namespace} = '';
+use IO::Capture::Stdout;
+use Sys::Hostname ();
+use XML::Atom::Feed;
+use XML::Atom::Entry;
+use XML::RSS;
+
=head1 NAME
Gitalist::Controller::Root - Root Controller for Gitalist
=cut
-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
$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) = @_;
+sub _get_object {
+ my($self, $c, $haveh) = @_;
+
+ my $h = $haveh || $c->req->param('h') || '';
+ my $f = $c->req->param('f');
+
+ my $m = $c->stash->{Project};
+ my $pd = $m->path;
# Either use the provided h(ash) parameter, the f(ile) parameter or just use HEAD.
- my $hash = $c->req->param('h')
- || ($c->req->param('f') ? $c->model('Git')->hash_by_path($c->req->param('f')) : '')
- || $c->model('Git')->head_hash
+ 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 = $c->model('Git')->get_object($hash)
- or Carp::croak("Couldn't find a commit object for '$hash'!");
+ my $commit = $m->get_object($hash)
+ or Carp::croak("Couldn't find a commit object for '$hash' in '$pd'!");
return $commit;
}
sub index :Path :Args(0) {
my ( $self, $c ) = @_;
- # Leave actions up to gitweb at this point.
- return $self->run_gitweb($c)
+ $c->detach($c->req->param('a'))
if $c->req->param('a');
- my $list = $c->model('Git')->list_projects;
- unless(@$list) {
- die "No projects found";
+ my @list = @{ $c->model()->projects };
+ die 'No projects found in '. $c->model->repo_dir
+ unless @list;
+
+ my $search = $c->req->param('s') || '';
+ if($search) {
+ @list = grep {
+ index($_->name, $search) > -1
+ or ( $_->description !~ /^Unnamed repository/ and index($_->description, $search) > -1 )
+ } @list
}
$c->stash(
- searchtext => $c->req->param('searchtext') || '',
- projects => $list,
- action => 'index',
+ search_text => $search,
+ projects => \@list,
+ action => 'index',
);
}
sub summary : Local {
my ( $self, $c ) = @_;
-
- my $commit = $self->_get_commit($c);
+ my $project = $c->stash->{Project};
+ $c->detach('error_404') unless $project;
+ my $commit = $self->_get_object($c);
+ my @heads = @{$project->heads};
+ my $maxitems = Gitalist->config->{paging}{summary} || 10;
$c->stash(
commit => $commit,
- info => $c->model('Git')->project_info($c->model('Git')->project),
- log_lines => [$c->model('Git')->list_revs(rev => $commit->sha1, count => 17)],
- heads => [$c->model('Git')->heads],
+ log_lines => [$project->list_revs(
+ sha1 => $commit->sha1,
+ count => $maxitems,
+ )],
+ refs => $project->references,
+ heads => [ @heads[0 .. ($#heads < $maxitems ? $#heads : $maxitems)] ],
action => 'summary',
);
}
sub heads : Local {
my ( $self, $c ) = @_;
-
+ my $project = $c->stash->{Project};
$c->stash(
- commit => $self->_get_commit($c),
- heads => [$c->model('Git')->heads],
+ commit => $self->_get_object($c),
+ heads => $project->heads,
action => 'heads',
);
}
sub blob : Local {
my ( $self, $c ) = @_;
-
+ 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),
- filename => $c->req->param('f') || '',
+ blob => $project->get_object($h)->content,
+ head => $project->get_object($hb),
+ filename => $filename,
+ # XXX Hack hack hack, see View::SyntaxHighlight
+ language => ($filename =~ /\.p[lm]$/ ? 'Perl' : ''),
action => 'blob',
);
- $c->forward('View::SyntaxHighlight');
+ $c->forward('View::SyntaxHighlight')
+ unless $c->stash->{no_wrapper};
+}
+
+sub blob_plain : Local {
+ my($self, $c) = @_;
+
+ $c->stash(no_wrapper => 1);
+ $c->response->content_type('text/plain; charset=utf-8');
+
+ $c->forward('blob');
+}
+
+sub blobdiff_plain : Local {
+ my($self, $c) = @_;
+
+ $c->stash(no_wrapper => 1);
+ $c->response->content_type('text/plain; charset=utf-8');
+
+ $c->forward('blobdiff');
+
+}
+
+=head2 blobdiff
+
+Exposes a given diff of a blob.
+
+=cut
+
+sub blobdiff : Local {
+ my ( $self, $c ) = @_;
+ my $commit = $self->_get_object($c, $c->req->param('hb'));
+ my $filename = $c->req->param('f')
+ || croak("No file specified!");
+ my($tree, $patch) = $c->stash->{Project}->diff(
+ commit => $commit,
+ patch => 1,
+ parent => $c->req->param('hpb') || undef,
+ file => $filename,
+ );
+ $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')
+ unless $c->stash->{no_wrapper};
}
=head2 commit
sub commit : Local {
my ( $self, $c ) = @_;
-
- my $commit = $self->_get_commit($c);
+ my $project = $c->stash->{Project};
+ my $commit = $self->_get_object($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',
);
}
sub commitdiff : Local {
my ( $self, $c ) = @_;
-
- my $commit = $self->_get_commit($c);
+ my $commit = $self->_get_object($c);
+ 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 => [$c->model('Git')->diff($commit->parent_sha1, $commit->sha1)],
- action => 'commitdiff',
+ 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')
+ unless $c->stash->{no_wrapper};
+}
+
+sub commitdiff_plain : Local {
+ my($self, $c) = @_;
+
+ $c->stash(no_wrapper => 1);
+ $c->response->content_type('text/plain; charset=utf-8');
+
+ $c->forward('commitdiff');
}
=head2 shortlog
sub shortlog : Local {
my ( $self, $c ) = @_;
+ my $project = $c->stash->{Project};
+ my $commit = $self->_get_object($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(rev => $commit->sha1)],
+ log_lines => [$project->list_revs(%logargs)],
+ refs => $project->references,
action => 'shortlog',
+ page => $page,
);
}
$_[1]->stash->{action} = 'log';
}
+# For legacy support.
+sub history : Local {
+ $_[0]->shortlog(@_[1 .. $#_]);
+}
+
=head2 tree
The tree of a given commit.
sub tree : Local {
my ( $self, $c ) = @_;
-
- my $commit = $self->_get_commit($c);
+ my $project = $c->stash->{Project};
+ my $commit = $self->_get_object($c, $c->req->param('hb'));
+ my $tree = $self->_get_object($c, $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',
);
}
sub reflog : Local {
my ( $self, $c ) = @_;
-
- my @log = $c->model('Git')->reflog(
+ my @log = $c->stash->{Project}->reflog(
'--since=yesterday'
);
);
}
-=head2 auto
-
-Populate the header and footer. Perhaps not the best location.
-
-=cut
-
-sub auto : Private {
- my($self, $c) = @_;
+sub search : Local {
+ my($self, $c) = @_;
+ $c->stash(current_action => 'GitRepos');
+ my $project = $c->stash->{Project};
+ my $commit = $self->_get_object($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,
+ },
+ );
- # XXX Temp hack until a decent solution is invented.
- $c->model('Git')->project($c->req->param('p'))
- if $c->req->param('p');
+ $c->stash(
+ commit => $commit,
+ results => [$project->list_revs(%logargs)],
+ action => 'search',
+ # This could be added - page => $page,
+ );
+}
- # Yes, this is hideous.
- $self->header($c);
- $self->footer($c);
+sub search_help : Local {
+ my ($self, $c) = @_;
+ $c->stash(template => 'search_help.tt2');
}
-# XXX This could probably be dropped altogether.
-use Gitalist::Util qw(to_utf8);
-# Formally git_header_html
-sub header {
+sub atom : Local {
my($self, $c) = @_;
- 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 .= " - " . $file_name;
- if ($action eq "tree" && $file_name !~ m|/$|) {
- $title .= "/";
- }
- }
- }
- }
+ my $feed = XML::Atom::Feed->new;
- $c->stash->{version} = $c->config->{version};
- $c->stash->{git_version} = $c->model('Git')->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->{project} = $project;
- my @links;
- if($project) {
- my %href_params = $self->feed_info($c);
- $href_params{'-title'} ||= 'log';
-
- 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',
-
- # 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 {
- 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"
- };
- }
-
- $c->stash->{favicon} = $c->config->{favicon};
-
- # </head><body>
+ my $host = lc Sys::Hostname::hostname();
+ $feed->title($host . ' - ' . Gitalist->config->{name});
+ $feed->updated(~~DateTime->now);
- $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},
- );
+ my $project = $c->stash->{Project};
+ my %logargs = (
+ sha1 => $project->head_hash,
+ count => Gitalist->config->{paging}{log} || 25,
+ ($c->req->param('f') ? (file => $c->req->param('f')) : ())
+ );
- 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' ),
- );
+ my $mk_title = $c->stash->{short_cmt};
+ for my $commit ($project->list_revs(%logargs)) {
+ my $entry = XML::Atom::Entry->new;
+ $entry->title( $mk_title->($commit->comment) );
+ $entry->id($c->uri_for('commit', {h=>$commit->sha1}));
+ # XXX Needs work ...
+ $entry->content($commit->comment);
+ $feed->add_entry($entry);
}
+
+ $c->response->body($feed->as_xml);
+ $c->response->content_type('application/atom+xml');
+ $c->response->status(200);
}
-# Formally git_footer_html
-sub footer {
- my($self, $c) = @_;
+sub rss : Local {
+ my ($self, $c) = @_;
- my $feed_class = 'rss_logo';
+ my $project = $c->stash->{Project};
- my @feeds;
- 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};
- $c->stash->{project_description} = defined $descr
- ? $descr
- : '';
+ my $rss = XML::RSS->new(version => '2.0');
+ $rss->channel(
+ title => lc(Sys::Hostname::hostname()) . ' - ' . Gitalist->config->{name},
+ link => $c->uri_for('summary', {p=>$project->name}),
+ language => 'en',
+ description => $project->description,
+ pubDate => DateTime->now,
+ lastBuildDate => DateTime->now,
+ );
- my %href_params = $self->feed_info($c);
- if (!%href_params) {
- $feed_class .= ' generic';
- }
- $href_params{'-title'} ||= 'log';
-
- @feeds = [
- map +{
- class => $feed_class,
- title => "$href_params{'-title'} $_ feed",
- href => "/?p=$project;a=\L$_",
- name => lc $_,
- }, qw(RSS Atom)
- ];
- } else {
- @feeds = [
- map {
- class => $feed_class,
- title => '',
- href => "/?a=$_->[0]",
- name => $_->[1],
- }, [opml=>'OPML'],[project_index=>'TXT'],
- ];
+ my %logargs = (
+ sha1 => $project->head_hash,
+ count => Gitalist->config->{paging}{log} || 25,
+ ($c->req->param('f') ? (file => $c->req->param('f')) : ())
+ );
+ my $mk_title = $c->stash->{short_cmt};
+ for my $commit ($project->list_revs(%logargs)) {
+ # XXX Needs work ....
+ $rss->add_item(
+ title => $mk_title->($commit->comment),
+ permaLink => $c->uri_for(commit => {h=>$commit->sha1}),
+ description => $commit->comment,
+ );
}
+
+ $c->response->body($rss->as_string);
+ $c->response->content_type('application/rss+xml');
+ $c->response->status(200);
}
-# XXX This feels wrong here, should probably be refactored.
-# returns hash to be passed to href to generate gitweb URL
-# in -title key it returns description of link
-sub feed_info {
- my($self, $c) = @_;
+sub patch : Local {
+ my ($self, $c) = @_;
+ $c->detach('patches', [1]);
+}
- my $format = shift || 'Atom';
- my %res = (action => lc($format));
+sub patches : Local {
+ my ($self, $c, $count) = @_;
+ $count ||= Gitalist->config->{patches}{max};
+ my $commit = $self->_get_object($c);
+ my $parent = $c->req->param('hp') || undef;
+ my $patch = $commit->get_patch( $parent, $count );
+ $c->response->body($patch);
+ $c->response->content_type('text/plain');
+ $c->response->status(200);
+}
- # feed links are possible only for project views
- return unless $c->req->param('project');
+sub snapshot : Local {
+ # FIXME - implement snapshot
+ Carp::croak "Not implemented.";
+}
- # 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;
+=head2 auto
- my $branch;
- my $hash = $c->req->param('h') || $c->req->param('hash');
- my $hash_base = $c->req->param('hb') || $c->req->param('hashbase');
+Populate the header and footer. Perhaps not the best location.
- # 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;
- }
+=cut
- # 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);
- }
+sub auto : Private {
+ my($self, $c) = @_;
- $res{-title} = $type;
- $res{'hash'} = (defined $branch ? "refs/heads/$branch" : undef);
- $res{'file_name'} = $file_name;
+ my $project = $c->req->param('p');
+ if (defined $project) {
+ eval {
+ $c->stash(Project => $c->model('GitRepos')->project($project));
+ };
+ if ($@) {
+ $c->detach('error_404');
+ }
+ }
- return %res;
+ my $a_project = $c->stash->{Project} || $c->model()->projects->[0];
+ $c->stash(
+ git_version => $a_project->run_cmd('--version'),
+ version => $Gitalist::VERSION,
+
+ # XXX Move these to a plugin!
+ 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]);
+ },
+ );
}
+
=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}) {
+ $c->stash->{HEAD} = $c->stash->{Project}->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
projects / catagits/Gitalist.git / blobdiff