config: remove *_url_format support for cgit

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

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 603dad983657441a68694bb7cc2bb19156794232..f2e5d5f0801e4c0f566f51ae654bdc55a5112c38 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -12,23 +12,24 @@ use strict;
 use v5.10.1;
 use PublicInbox::Inbox;
 use PublicInbox::Spawn qw(popen_rd);
+our $LD_PRELOAD = $ENV{LD_PRELOAD}; # only valid at startup
 
 sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] }
 
 # returns key-value pairs of config directives in a hash
 # if keys may be multi-value, the value is an array ref containing all values
 sub new {
-       my ($class, $file) = @_;
+       my ($class, $file, $errfh) = @_;
        $file //= default_file();
        my $self;
        if (ref($file) eq 'SCALAR') { # used by some tests
                open my $fh, '<', $file or die;  # PerlIO::scalar
                $self = config_fh_parse($fh, "\n", '=');
+               bless $self, $class;
        } else {
-               $self = git_config_dump($file);
+               $self = git_config_dump($class, $file, $errfh);
                $self->{'-f'} = $file;
        }
-       bless $self, $class;
        # caches
        $self->{-by_addr} = {};
        $self->{-by_list_id} = {};
@@ -96,6 +97,11 @@ sub lookup_ei {
        $self->{-ei_by_name}->{$name} //= _fill_ei($self, $name);
 }
 
+sub lookup_eidx_key {
+       my ($self, $eidx_key) = @_;
+       _lookup_fill($self, '-by_eidx_key', $eidx_key);
+}
+
 # special case for [extindex "all"]
 sub ALL { lookup_ei($_[0], 'all') }
 
@@ -158,13 +164,13 @@ sub config_fh_parse ($$$) {
 }
 
 sub git_config_dump {
-       my ($file) = @_;
-       return {} unless -e $file;
+       my ($class, $file, $errfh) = @_;
+       return bless {}, $class unless -e $file;
        my $cmd = [ qw(git config -z -l --includes), "--file=$file" ];
-       my $fh = popen_rd($cmd);
+       my $fh = popen_rd($cmd, undef, { 2 => $errfh // 2 });
        my $rv = config_fh_parse($fh, "\0", "\n");
-       close $fh or die "failed to close (@$cmd) pipe: $?";
-       $rv;
+       close $fh or die "@$cmd failed: \$?=$?\n";
+       bless $rv, $class;
 }
 
 sub valid_foo_name ($;$) {
@@ -322,30 +328,14 @@ sub parse_cgitrc {
 sub _fill_code_repo {
        my ($self, $nick) = @_;
        my $pfx = "coderepo.$nick";
-
-       my $dir = $self->{"$pfx.dir"}; # aka "GIT_DIR"
-       unless (defined $dir) {
+       my $dir = $self->{"$pfx.dir"} // do { # aka "GIT_DIR"
                warn "$pfx.dir unset\n";
                return;
-       }
-
+       };
        my $git = PublicInbox::Git->new($dir);
-       foreach my $t (qw(blob commit tree tag)) {
-               $git->{$t.'_url_format'} =
-                               _array($self->{lc("$pfx.${t}UrlFormat")});
-       }
-
        if (defined(my $cgits = $self->{"$pfx.cgiturl"})) {
                $git->{cgit_url} = $cgits = _array($cgits);
                $self->{"$pfx.cgiturl"} = $cgits;
-
-               # cgit supports "/blob/?id=%s", but it's only a plain-text
-               # display and requires an unabbreviated id=
-               foreach my $t (qw(blob commit tag)) {
-                       $git->{$t.'_url_format'} //= map {
-                               "$_/$t/?id=%s"
-                       } @$cgits;
-               }
        }
 
        $git;
@@ -378,11 +368,11 @@ sub rel2abs_collapsed {
        Cwd::abs_path($p);
 }
 
-sub _one_val {
-       my ($self, $pfx, $k) = @_;
-       my $v = $self->{"$pfx.$k"} // return;
+sub get_1 {
+       my ($self, $key) = @_;
+       my $v = $self->{$key};
        return $v if !ref($v);
-       warn "W: $pfx.$k has multiple values, only using `$v->[-1]'\n";
+       warn "W: $key has multiple values, only using `$v->[-1]'\n";
        $v->[-1];
 }
 
@@ -418,13 +408,13 @@ sub _fill_ibx {
        my ($self, $name) = @_;
        my $pfx = "publicinbox.$name";
        my $ibx = {};
-       for my $k (qw(watch nntpserver)) {
+       for my $k (qw(watch)) {
                my $v = $self->{"$pfx.$k"};
                $ibx->{$k} = $v if defined $v;
        }
        for my $k (qw(filter inboxdir newsgroup replyto httpbackendmax feedmax
-                       indexlevel indexsequentialshard)) {
-               my $v = _one_val($self, $pfx, $k) // next;
+                       indexlevel indexsequentialshard boost)) {
+               my $v = get_1($self, "$pfx.$k") // next;
                $ibx->{$k} = $v;
        }
 
@@ -444,8 +434,9 @@ sub _fill_ibx {
        }
        # TODO: more arrays, we should support multi-value for
        # more things to encourage decentralization
-       for my $k (qw(address altid nntpmirror coderepo hide listid url
-                       infourl watchheader)) {
+       for my $k (qw(address altid nntpmirror imapmirror
+                       coderepo hide listid url
+                       infourl watchheader nntpserver imapserver)) {
                my $v = $self->{"$pfx.$k"} // next;
                $ibx->{$k} = _array($v);
        }
@@ -516,10 +507,10 @@ sub _fill_ei ($$) {
        }
        my $es = PublicInbox::ExtSearch->new($d);
        for my $k (qw(indexlevel indexsequentialshard)) {
-               my $v = _one_val($self, $pfx, $k) // next;
+               my $v = get_1($self, "$pfx.$k") // next;
                $es->{$k} = $v;
        }
-       for my $k (qw(altid coderepo hide url infourl)) {
+       for my $k (qw(coderepo hide url infourl)) {
                my $v = $self->{"$pfx.$k"} // next;
                $es->{$k} = _array($v);
        }