imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index c0b1a73b625edb420ebae33a34cc8fd9be34f897..cc729aa286f4bf126de8f7093dab1c37d0b480a2 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-2021 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
@@ -10,18 +10,15 @@ use strict;
 use PublicInbox::GitHTTPBackend;
 use PublicInbox::Git;
 # not bothering with Exporter for a one-off
-*input_prepare = *PublicInbox::GitHTTPBackend::input_prepare;
-*parse_cgi_headers = *PublicInbox::GitHTTPBackend::parse_cgi_headers;
-*serve = *PublicInbox::GitHTTPBackend::serve;
-use warnings;
+*input_prepare = \&PublicInbox::GitHTTPBackend::input_prepare;
+*serve = \&PublicInbox::GitHTTPBackend::serve;
 use PublicInbox::Qspawn;
 use PublicInbox::WwwStatic qw(r);
-use Plack::MIME;
 
 sub locate_cgit ($) {
-       my ($pi_config) = @_;
-       my $cgit_bin = $pi_config->{'publicinbox.cgitbin'};
-       my $cgit_data = $pi_config->{'publicinbox.cgitdata'};
+       my ($pi_cfg) = @_;
+       my $cgit_bin = $pi_cfg->{'publicinbox.cgitbin'};
+       my $cgit_data = $pi_cfg->{'publicinbox.cgitdata'};
 
        # /var/www/htdocs/cgit is the default install path from cgit.git
        # /usr/{lib,share}/cgit is where Debian puts cgit
@@ -54,28 +51,29 @@ sub locate_cgit ($) {
 }
 
 sub new {
-       my ($class, $pi_config) = @_;
-       my ($cgit_bin, $cgit_data) = locate_cgit($pi_config);
-
+       my ($class, $pi_cfg) = @_;
+       my ($cgit_bin, $cgit_data) = locate_cgit($pi_cfg);
+       # TODO: support gitweb and other repository viewers?
+       if (defined(my $cgitrc = $pi_cfg->{-cgitrc_unparsed})) {
+               $pi_cfg->parse_cgitrc($cgitrc, 0);
+       }
        my $self = bless {
                cmd => [ $cgit_bin ],
                cgit_data => $cgit_data,
-               pi_config => $pi_config,
+               pi_cfg => $pi_cfg,
        }, $class;
 
-       $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};
-       foreach my $k (keys %$pi_config) {
+       my $code_repos = $pi_cfg->{-code_repos};
+       foreach my $k (keys %$pi_cfg) {
                $k =~ /\Acoderepo\.(.+)\.dir\z/ or next;
-               my $dir = $pi_config->{$k};
-               $code_repos->{$1} ||= PublicInbox::Git->new($dir);
+               my $dir = $pi_cfg->{$k};
+               $code_repos->{$1} ||= $pi_cfg->fill_code_repo($1);
        }
        while (my ($nick, $repo) = each %$code_repos) {
                $self->{"\0$nick"} = $repo;
        }
-       my $cgit_static = $pi_config->{-cgit_static};
+       my $cgit_static = $pi_cfg->{-cgit_static};
        my $static = join('|', map { quotemeta $_ } keys %$cgit_static);
        $self->{static} = qr/\A($static)\z/;
        $self;
@@ -95,11 +93,7 @@ my @PASS_ENV = qw(
 );
 # XXX: cgit filters may care about more variables...
 
-sub cgit_parse_hdr { # {parse_hdr} for Qspawn
-       my ($r, $bref) = @_;
-       my $res = parse_cgi_headers($r, $bref) or return; # incomplete
-       $res;
-}
+my $parse_cgi_headers = \&PublicInbox::GitHTTPBackend::parse_cgi_headers;
 
 sub call {
        my ($self, $env) = @_;
@@ -114,9 +108,8 @@ sub call {
                }
        } elsif ($path_info =~ m!$self->{static}! &&
                 defined($cgit_data = $self->{cgit_data})) {
-               my $f = $1;
-               return PublicInbox::WwwStatic::response($env, [], $cgit_data.$f,
-                                               Plack::MIME->mime_type($f));
+               my $f = $cgit_data.$1; # {static} only matches leading slash
+               return PublicInbox::WwwStatic::response($env, [], $f);
        }
 
        my $cgi_env = { PATH_INFO => $path_info };
@@ -128,8 +121,8 @@ 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, \&cgit_parse_hdr);
+       my $limiter = $self->{pi_cfg}->limiter('-cgit');
+       $qsp->psgi_return($env, $limiter, $parse_cgi_headers);
 }
 
 1;