X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FCgit.pm;h=336098caac063a30f97e711ede41fc9e918540f7;hb=5b39ed2b6b3d5d8c24240f1b1df8bfd751b0e6bc;hp=d9b7831fe91006e4e263068b7d83492d84263c3b;hpb=b7c0114745e5b11f5606c43c391b2417779cbdf3;p=public-inbox.git

diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index d9b7831f..336098ca 100644
--- 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) 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
@@ -6,20 +6,20 @@
 # directive to be set in the public-inbox config file.
 
 package PublicInbox::Cgit;
-use strict;
+use v5.12;
+use parent qw(PublicInbox::WwwCoderepo);
 use PublicInbox::GitHTTPBackend;
 use PublicInbox::Git;
 # not bothering with Exporter for a one-off
-*input_prepare = *PublicInbox::GitHTTPBackend::input_prepare;
-*serve = *PublicInbox::GitHTTPBackend::serve;
-use warnings;
+*input_prepare = \&PublicInbox::GitHTTPBackend::input_prepare;
+*serve = \&PublicInbox::GitHTTPBackend::serve;
 use PublicInbox::Qspawn;
 use PublicInbox::WwwStatic qw(r);
 
 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
@@ -41,10 +41,9 @@ sub locate_cgit ($) {
 		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;
+		for (@dirs) {
+			next unless -f "$_/cgit.css";
+			$cgit_data = $_;
 			last;
 		}
 	}
@@ -52,30 +51,19 @@ 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);
+	$cgit_bin // return; # fall back in WWW->cgit
 	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) {
-		$k =~ /\Acoderepo\.(.+)\.dir\z/ or next;
-		my $dir = $pi_config->{$k};
-		$code_repos->{$1} ||= PublicInbox::Git->new($dir);
-	}
-	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/;
+	PublicInbox::WwwCoderepo::prepare_coderepos($self);
+	my $s = join('|', map { quotemeta } keys %{$pi_cfg->{-cgit_static}});
+	$self->{static} = qr/\A($s)\z/;
 	$self;
 }
 
@@ -96,7 +84,7 @@ my @PASS_ENV = qw(
 my $parse_cgi_headers = \&PublicInbox::GitHTTPBackend::parse_cgi_headers;
 
 sub call {
-	my ($self, $env) = @_;
+	my ($self, $env, $ctx) = @_; # $ctx is optional, used by WWW
 	my $path_info = $env->{PATH_INFO};
 	my $cgit_data;
 
@@ -114,15 +102,15 @@ sub call {
 
 	my $cgi_env = { PATH_INFO => $path_info };
 	foreach (@PASS_ENV) {
-		defined(my $v = $env->{$_}) or next;
+		my $v = $env->{$_} // next;
 		$cgi_env->{$_} = $v;
 	}
 	$cgi_env->{'HTTPS'} = 'on' if $env->{'psgi.url_scheme'} eq 'https';
 
 	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, $parse_cgi_headers);
+	my $limiter = $self->{pi_cfg}->limiter('-cgit');
+	$qsp->psgi_return($env, $limiter, $parse_cgi_headers, $ctx);
 }
 
 1;