X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=42bd9438fb82db44f6fff62cbbc5d5c0ea78f8fe;hb=6dec9bf8c0e1b859703d7a5dfb87052cf4e87846;hp=ee5322fe142a1507cd1c11a0d9db23a9549ad5d2;hpb=0c2eaee968cb59ae60c10ce89b2c236fd9369830;p=public-inbox.git
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index ee5322fe..42bd9438 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
#
# Used throughout the project for reading configuration
@@ -13,6 +13,7 @@ use v5.10.1;
use PublicInbox::Inbox;
use PublicInbox::Spawn qw(popen_rd);
our $LD_PRELOAD = $ENV{LD_PRELOAD}; # only valid at startup
+our $DEDUPE; # set to {} to dedupe or clear cache
sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] }
@@ -22,11 +23,17 @@ sub new {
my ($class, $file, $errfh) = @_;
$file //= default_file();
my $self;
+ my $set_dedupe;
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 {
+ if (-f $file && $DEDUPE) {
+ $file = rel2abs_collapsed($file);
+ $self = $DEDUPE->{$file} and return $self;
+ $set_dedupe = 1;
+ }
$self = git_config_dump($class, $file, $errfh);
$self->{'-f'} = $file;
}
@@ -62,7 +69,7 @@ sub new {
if (my $css = delete $self->{'publicinbox.css'}) {
$self->{css} = _array($css);
}
-
+ $DEDUPE->{$file} = $self if $set_dedupe;
$self;
}
@@ -323,37 +330,20 @@ sub parse_cgitrc {
cgit_repo_merge($self, $repo->{dir}, $repo) if $repo;
}
-# parse a code repo
-# Only git is supported at the moment, but SVN and Hg are possibilities
-sub _fill_code_repo {
+# parse a code repo, only git is supported at the moment
+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->{nick} = $nick;
$git;
}
@@ -385,17 +375,17 @@ sub rel2abs_collapsed {
}
sub get_1 {
- my ($self, $pfx, $k) = @_;
- my $v = $self->{"$pfx.$k"} // return;
+ 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];
}
sub repo_objs {
my ($self, $ibxish) = @_;
- my $ibx_code_repos = $ibxish->{coderepo} or return;
- $ibxish->{-repo_objs} //= do {
+ my $ibx_code_repos = $ibxish->{coderepo} // return;
+ $ibxish->{-repo_objs} // do {
my $code_repos = $self->{-code_repos};
my @repo_objs;
for my $nick (@$ibx_code_repos) {
@@ -408,14 +398,13 @@ sub repo_objs {
next;
}
my $repo = $code_repos->{$nick} //=
- _fill_code_repo($self, $nick);
+ fill_code_repo($self, $nick);
push @repo_objs, $repo if $repo;
}
if (scalar @repo_objs) {
- \@repo_objs;
+ $ibxish->{-repo_objs} = \@repo_objs;
} else {
delete $ibxish->{coderepo};
- undef;
}
}
}
@@ -424,13 +413,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 boost)) {
- my $v = get_1($self, $pfx, $k) // next;
+ my $v = get_1($self, "$pfx.$k") // next;
$ibx->{$k} = $v;
}
@@ -450,8 +439,10 @@ 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 pop3server)) {
my $v = $self->{"$pfx.$k"} // next;
$ibx->{$k} = _array($v);
}
@@ -522,7 +513,7 @@ sub _fill_ei ($$) {
}
my $es = PublicInbox::ExtSearch->new($d);
for my $k (qw(indexlevel indexsequentialshard)) {
- my $v = get_1($self, $pfx, $k) // next;
+ my $v = get_1($self, "$pfx.$k") // next;
$es->{$k} = $v;
}
for my $k (qw(coderepo hide url infourl)) {