X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist%2FController%2FRoot.pm;h=7b921f89281b3f141c6b161b78396d771b39c1d8;hb=2d52ed84dbce5932f14972ba91a33de23faac648;hp=d39c8675f347447bf2117671c19fd40540b86600;hpb=8fd20a28cd2d6df24f0f4a123dffa53ae3547f45;p=catagits%2FGitalist.git diff --git a/lib/Gitalist/Controller/Root.pm b/lib/Gitalist/Controller/Root.pm index d39c867..7b921f8 100644 --- a/lib/Gitalist/Controller/Root.pm +++ b/lib/Gitalist/Controller/Root.pm @@ -2,164 +2,27 @@ package Gitalist::Controller::Root; use Moose; use Moose::Autobox; -use Sys::Hostname qw/hostname/; -use XML::OPML::SimpleGen; - +use Digest::MD5 qw(md5_hex); use Gitalist::Utils qw/ age_string /; use namespace::autoclean; BEGIN { extends 'Gitalist::Controller' } -__PACKAGE__->config->{namespace} = ''; +__PACKAGE__->config(namespace => ''); sub root : Chained('/') PathPart('') CaptureArgs(0) {} -sub _get_object { - my($self, $c, $haveh) = @_; - - my $h = $haveh || $c->req->param('h') || ''; - my $f = $c->req->param('f'); - - my $m = $c->stash->{Repository}; - my $pd = $m->path; - - # 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 $obj = $m->get_object($hash) - or Carp::croak("Couldn't find a object for '$hash' in '$pd'!"); - - return $obj; -} - sub index : Chained('base') PathPart('') Args(0) { - my ( $self, $c ) = @_; - - $c->detach($c->req->param('a')) - if $c->req->param('a'); - - my $search = $c->req->param('s') || ''; - - $c->stash( - search_text => $search, - ); -} - -sub _blob_objs { - my ( $self, $c ) = @_; - my $repository = $c->stash->{Repository}; - my $h = $c->req->param('h') - || $repository->hash_by_path($c->req->param('hb'), $c->req->param('f')) - || die "No file or sha1 provided."; - my $hb = $c->req->param('hb') - || $repository->head_hash - || die "Couldn't discern the corresponding head."; - - my $filename = $c->req->param('f') || ''; - - my $blob = $repository->get_object($h); - $blob = $repository->get_object( - $repository->hash_by_path($h || $hb, $filename) - ) if $blob->type ne 'blob'; - - return $blob, $repository->get_object($hb), $filename; -} - -=head2 blobdiff_plain - -The plain text version of blobdiff. - -=cut - -sub blobdiff_plain : Chained('base') Args(0) { - 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 : Chained('base') Args(0) { - 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->{Repository}->diff( - commit => $commit, - patch => 1, - parent => $c->req->param('hpb') || undef, - file => $filename, - ); - $c->stash( - commit => $commit, - diff => $patch, - filename => $filename, - # XXX Hack hack hack, see View::SyntaxHighlight - blobs => [$patch->[0]->{diff}], - language => 'Diff', - ); - - $c->forward('View::SyntaxHighlight') - unless $c->stash->{no_wrapper}; -} - -# For legacy support. -sub history : Chained('base') Args(0) { my ( $self, $c ) = @_; - $self->shortlog($c); - my $repository = $c->stash->{Repository}; - my $file = $repository->get_object( - $repository->hash_by_path( - $repository->head_hash, - $c->stash->{filename} - ) - ); - $c->stash( - filetype => $file->type, - ); + $c->stash( search_text => $c->req->param('s') || '' ) # FIXME - XSS? } -=head2 search_help - -Provides some help for the search form. - -=cut - -sub search_help : Chained('base') Args(0) {} - -sub opml : Chained('base') Args(0) { - my($self, $c) = @_; - - my $opml = XML::OPML::SimpleGen->new(); - - $opml->head(title => lc(hostname()) . ' - ' . Gitalist->config->{name}); - - my @list = @{ $c->model()->repositories }; - die 'No repositories found in '. $c->model->repo_dir - unless @list; - - for my $proj ( @list ) { - $opml->insert_outline( - text => $proj->name. ' - '. $proj->description, - xmlUrl => $c->uri_for(rss => {p => $proj->name}), - ); - } +# XXX Fragile much? +sub css : Chained('/root') PathPart('core.css') Args(0) { + my ( $self, $c ) = @_; - $c->response->body($opml->as_string); - $c->response->content_type('application/rss'); - $c->response->status(200); + $c->stash( template => 'static/css/core.css', content_type => 'text/css' ); } sub base : Chained('/root') PathPart('') CaptureArgs(0) { @@ -171,7 +34,6 @@ sub base : Chained('/root') PathPart('') CaptureArgs(0) { git_version => $git_version, version => $Gitalist::VERSION, - # XXX Move these to a plugin! time_since => sub { return 'never' unless $_[0]; return age_string(time - $_[0]->epoch); @@ -179,21 +41,41 @@ sub base : Chained('/root') PathPart('') CaptureArgs(0) { short_cmt => sub { my $cmt = shift; my($line) = split /\n/, $cmt; - $line =~ s/^(.{70,80}\b).*/$1 \x{2026}/; + $line =~ s/^(.{70,80}\b).*/$1 \x{2026}/ if defined $line; return $line; }, abridged_description => sub { join(' ', grep { defined } (split / /, shift)[0..10]); }, + uri_for_gravatar => sub { + my $email = shift; + my $size = shift; + my $uri = 'http://www.gravatar.com/avatar/' . md5_hex($email); + $uri .= "?s=$size" if $size; + return $uri; + }, ); } -sub end : ActionClass('RenderView') { +sub search : Chained('base') Args(0) {} + +=head2 search_help + +Provides some help for the search form. + +=cut + +sub search_help : Chained('base') Args(0) {} + +sub end : ActionClass('Serialize') { my ($self, $c) = @_; # Give repository views the current HEAD. if ($c->stash->{Repository}) { $c->stash->{HEAD} = $c->stash->{Repository}->head_hash; } + if ($c->stash->{data} && blessed $c->stash->{data}) { + $c->stash->{rest} = $c->stash->{data}->pack; + } } sub error_404 : Action { @@ -202,6 +84,17 @@ sub error_404 : Action { $c->response->body('Page not found'); } +__PACKAGE__->config( + default => 'text/html', + map => { + 'application/json' => [qw/ JSON /], + map { $_ => [qw/ View Default /] } + qw( text/css text/html text/plain + application/atom+xml application/rss+xml application/rss ) + }, + content_type_stash_key => 'content_type', +); + __PACKAGE__->meta->make_immutable; __END__ @@ -232,16 +125,8 @@ Provides the repository listing. Attempt to render a view, if needed. -=head2 blame - =head2 error_404 -=head2 history - -=head2 opml - -=head2 repository_index - =head1 AUTHORS See L for authors.