cgit: type declaration for PublicInbox::Git

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

diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index 8922ec567c902d0cf4c3a5907cc6551021990aad..3623943882fdb9f95a50c90d0d397497606af4a9 100644 (file)
--- a/lib/PublicInbox/Cgit.pm
+++ b/lib/PublicInbox/Cgit.pm
@@ -8,14 +8,15 @@
 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 PublicInbox::WwwStatic;
 use Plack::MIME;
 
 sub locate_cgit ($) {
@@ -35,7 +36,15 @@ sub locate_cgit ($) {
                }
        }
        unless (defined $cgit_data) {
-               foreach my $d (qw(/var/www/htdocs/cgit /usr/share/cgit)) {
+               my @dirs = qw(/var/www/htdocs/cgit /usr/share/cgit);
+
+               # local installs of cgit from source have
+               # CGIT_SCRIPT_PATH==CGIT_DATA_PATH by default,
+               # so we can usually infer the cgit_data path from cgit_bin
+               if (defined($cgit_bin) && $cgit_bin =~ m!\A(.+?)/[^/]+\z!) {
+                       unshift @dirs, $1 if -d $1;
+               }
+               foreach my $d (@dirs) {
                        my $f = "$d/cgit.css";
                        next unless -f $f;
                        $cgit_data = $d;
@@ -55,7 +64,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};
@@ -87,20 +96,28 @@ 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;
+}
+
 sub call {
        my ($self, $env) = @_;
        my $path_info = $env->{PATH_INFO};
+       my $cgit_data;
 
        # 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}!) {
+       } 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, [], "$self->{cgit_data}$f", $type);
+               return PublicInbox::WwwStatic::response($env, [], $cgit_data.$f,
+                                               Plack::MIME->mime_type($f));
        }
 
        my $cgi_env = { PATH_INFO => $path_info };
@@ -113,11 +130,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, \&cgit_parse_hdr);
 }
 
 1;