treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / Cgit.pm

diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index 353f41627b983d1426cdf6680a4b4e0b400ad6c2..9a51b451cfb59413d047cc21ca84b00ba4aaf64e 100644 (file)
--- a/lib/PublicInbox/Cgit.pm
+++ b/lib/PublicInbox/Cgit.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # wrapper for cgit(1) and git-http-backend(1) for browsing and
@@ -8,15 +8,13 @@
 package PublicInbox::Cgit;
 use strict;
 use PublicInbox::GitHTTPBackend;
+use PublicInbox::Git;
 # not bothering with Exporter for a one-off
-*r = *PublicInbox::GitHTTPBackend::r;
 *input_prepare = *PublicInbox::GitHTTPBackend::input_prepare;
-*parse_cgi_headers = *PublicInbox::GitHTTPBackend::parse_cgi_headers;
 *serve = *PublicInbox::GitHTTPBackend::serve;
-*static_result = *PublicInbox::GitHTTPBackend::static_result;
 use warnings;
 use PublicInbox::Qspawn;
-use Plack::MIME;
+use PublicInbox::WwwStatic qw(r);
 
 sub locate_cgit ($) {
        my ($pi_config) = @_;
@@ -63,7 +61,7 @@ sub new {
                pi_config => $pi_config,
        }, $class;
 
-       $pi_config->each_inbox(sub {}); # fill in -code_repos mapped to inboxes
+       $pi_config->fill_all; # fill in -code_repos mapped to inboxes
 
        # some cgit repos may not be mapped to inboxes, so ensure those exist:
        my $code_repos = $pi_config->{-code_repos};
@@ -95,6 +93,8 @@ my @PASS_ENV = qw(
 );
 # XXX: cgit filters may care about more variables...
 
+my $parse_cgi_headers = \&PublicInbox::GitHTTPBackend::parse_cgi_headers;
+
 sub call {
        my ($self, $env) = @_;
        my $path_info = $env->{PATH_INFO};
@@ -103,14 +103,13 @@ sub call {
        # handle requests without spawning cgit iff possible:
        if ($path_info =~ m!\A/(.+?)/($PublicInbox::GitHTTPBackend::ANY)\z!ox) {
                my ($nick, $path) = ($1, $2);
-               if (my $git = $self->{"\0$nick"}) {
+               if (my PublicInbox::Git $git = $self->{"\0$nick"}) {
                        return serve($env, $git, $path);
                }
        } elsif ($path_info =~ m!$self->{static}! &&
                 defined($cgit_data = $self->{cgit_data})) {
-               my $f = $1;
-               my $type = Plack::MIME->mime_type($f);
-               return static_result($env, [], $cgit_data.$f, $type);
+               my $f = $cgit_data.$1; # {static} only matches leading slash
+               return PublicInbox::WwwStatic::response($env, [], $f);
        }
 
        my $cgi_env = { PATH_INFO => $path_info };
@@ -123,11 +122,7 @@ sub call {
        my $rdr = input_prepare($env) or return r(500);
        my $qsp = PublicInbox::Qspawn->new($self->{cmd}, $cgi_env, $rdr);
        my $limiter = $self->{pi_config}->limiter('-cgit');
-       $qsp->psgi_return($env, $limiter, sub {
-               my ($r, $bref) = @_;
-               my $res = parse_cgi_headers($r, $bref) or return; # incomplete
-               $res;
-       });
+       $qsp->psgi_return($env, $limiter, $parse_cgi_headers);
 }
 
 1;