about summary refs log tree commit homepage
path: root/lib/PublicInbox/Cgit.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2020-12-08 21:21:27 +0000
committerEric Wong <e@80x24.org>2020-12-09 21:13:34 +0000
commit0d38f65c490466837ae091afa7a7b6f59d04ce7c (patch)
tree8c838c12ce3c28ef1c15a15dd6584e0d0d831a34 /lib/PublicInbox/Cgit.pm
parent416d1c3f6d5e5a857760ffc1b679e86a070bdbd4 (diff)
downloadpublic-inbox-0d38f65c490466837ae091afa7a7b6f59d04ce7c.tar.gz
{pi_config} may be confused with the documented `PI_CONFIG'
environment variable, and we'll favor vowel-removal to be
consistent with our usage of object references.

The `pi_' prefix may stay in some places, for now; since a
separate namespace may come into this codebase for local/private
client-tooling.

For InboxIdle, we'll also remove an invalid comment about
holding a reference to the PublicInbox::Config object, too.
Diffstat (limited to 'lib/PublicInbox/Cgit.pm')
-rw-r--r--lib/PublicInbox/Cgit.pm24
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index fb0d0e60..472509a8 100644
--- a/lib/PublicInbox/Cgit.pm
+++ b/lib/PublicInbox/Cgit.pm
@@ -16,9 +16,9 @@ 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
@@ -51,28 +51,28 @@ 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);
 
         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
+        $pi_cfg->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};
+                my $dir = $pi_cfg->{$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 $cgit_static = $pi_cfg->{-cgit_static};
         my $static = join('|', map { quotemeta $_ } keys %$cgit_static);
         $self->{static} = qr/\A($static)\z/;
         $self;
@@ -120,7 +120,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');
+        my $limiter = $self->{pi_cfg}->limiter('-cgit');
         $qsp->psgi_return($env, $limiter, $parse_cgi_headers);
 }