Merge remote-tracking branch 'origin/danga-bundle'

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

diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index 9ba9e14dea0efb21602381f87d851115af67125b..353f41627b983d1426cdf6680a4b4e0b400ad6c2 100644 (file)
--- a/lib/PublicInbox/Cgit.pm
+++ b/lib/PublicInbox/Cgit.pm
@@ -13,17 +13,53 @@ use PublicInbox::GitHTTPBackend;
 *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;
+
+sub locate_cgit ($) {
+       my ($pi_config) = @_;
+       my $cgit_bin = $pi_config->{'publicinbox.cgitbin'};
+       my $cgit_data = $pi_config->{'publicinbox.cgitdata'};
+
+       # /var/www/htdocs/cgit is the default install path from cgit.git
+       # /usr/{lib,share}/cgit is where Debian puts cgit
+       # TODO: check other distros for common paths
+       unless (defined $cgit_bin) {
+               foreach (qw(/var/www/htdocs/cgit /usr/lib/cgit)) {
+                       my $x = "$_/cgit.cgi";
+                       next unless -x $x;
+                       $cgit_bin = $x;
+                       last;
+               }
+       }
+       unless (defined $cgit_data) {
+               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;
+                       last;
+               }
+       }
+       ($cgit_bin, $cgit_data);
+}
 
 sub new {
        my ($class, $pi_config) = @_;
-       my $cgit_bin = $pi_config->{'publicinbox.cgitbin'} ||
-               # Debian default location:
-               '/usr/lib/cgit/cgit.cgi';
+       my ($cgit_bin, $cgit_data) = locate_cgit($pi_config);
 
        my $self = bless {
                cmd => [ $cgit_bin ],
+               cgit_data => $cgit_data,
                pi_config => $pi_config,
        }, $class;
 
@@ -39,6 +75,9 @@ sub new {
        while (my ($nick, $repo) = each %$code_repos) {
                $self->{"\0$nick"} = $repo;
        }
+       my $cgit_static = $pi_config->{-cgit_static};
+       my $static = join('|', map { quotemeta $_ } keys %$cgit_static);
+       $self->{static} = qr/\A($static)\z/;
        $self;
 }
 
@@ -59,6 +98,7 @@ my @PASS_ENV = qw(
 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) {
@@ -66,6 +106,11 @@ sub call {
                if (my $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 $cgi_env = { PATH_INFO => $path_info };