X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=458f29b2964d32c592f0e33d9c060216efb6aee7;hb=b3a04ae18a42ed960c89cc81c209633da6976380;hp=2b99346a81d0ef021a20f7708b6a1d0a05ef41c1;hpb=b41c19abcf0b0ac8a5f55678bfb0058ad50b3179;p=public-inbox.git
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 2b99346a..458f29b2 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 all contributors
+# Copyright (C) 2014-2020 all contributors
# License: AGPL-3.0+
#
# Used throughout the project for reading configuration
@@ -10,7 +10,7 @@
package PublicInbox::Config;
use strict;
use warnings;
-require PublicInbox::Inbox;
+use PublicInbox::Inbox;
use PublicInbox::Spawn qw(popen_rd);
sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] }
@@ -29,13 +29,13 @@ sub new {
}
bless $self, $class;
# caches
- $self->{-by_addr} ||= {};
- $self->{-by_list_id} ||= {};
- $self->{-by_name} ||= {};
- $self->{-by_newsgroup} ||= {};
- $self->{-no_obfuscate} ||= {};
- $self->{-limiters} ||= {};
- $self->{-code_repos} ||= {}; # nick => PublicInbox::Git object
+ $self->{-by_addr} = {};
+ $self->{-by_list_id} = {};
+ $self->{-by_name} = {};
+ $self->{-by_newsgroup} = {};
+ $self->{-no_obfuscate} = {};
+ $self->{-limiters} = {};
+ $self->{-code_repos} = {}; # nick => PublicInbox::Git object
$self->{-cgitrc_unparsed} = $self->{'publicinbox.cgitrc'};
if (my $no = delete $self->{'publicinbox.noobfuscate'}) {
@@ -63,12 +63,13 @@ sub new {
$self;
}
-sub _fill_all ($) { each_inbox($_[0], sub {}) }
+sub noop {}
+sub fill_all ($) { each_inbox($_[0], \&noop) }
sub _lookup_fill ($$$) {
my ($self, $cache, $key) = @_;
$self->{$cache}->{$key} // do {
- _fill_all($self);
+ fill_all($self);
$self->{$cache}->{$key};
}
}
@@ -85,17 +86,16 @@ sub lookup_list_id {
sub lookup_name ($$) {
my ($self, $name) = @_;
- $self->{-by_name}->{$name} || _fill($self, "publicinbox.$name");
+ $self->{-by_name}->{$name} // _fill($self, "publicinbox.$name");
}
sub each_inbox {
- my ($self, $cb) = @_;
+ my ($self, $cb, $arg) = @_;
# may auto-vivify if config file is non-existent:
foreach my $section (@{$self->{-section_order}}) {
next if $section !~ m!\Apublicinbox\.([^/]+)\z!;
- $self->{"publicinbox.$1.mainrepo"} or next;
my $ibx = lookup_name($self, $1) or next;
- $cb->($ibx);
+ $cb->($ibx, $arg);
}
}
@@ -106,7 +106,7 @@ sub lookup_newsgroup {
sub limiter {
my ($self, $name) = @_;
- $self->{-limiters}->{$name} ||= do {
+ $self->{-limiters}->{$name} //= do {
require PublicInbox::Qspawn;
my $max = $self->{"publicinboxlimiter.$name.max"} || 1;
my $limiter = PublicInbox::Qspawn::Limiter->new($max);
@@ -115,7 +115,7 @@ sub limiter {
};
}
-sub config_dir { $ENV{PI_DIR} || "$ENV{HOME}/.public-inbox" }
+sub config_dir { $ENV{PI_DIR} // "$ENV{HOME}/.public-inbox" }
sub default_file {
my $f = $ENV{PI_CONFIG};
@@ -156,9 +156,9 @@ sub config_fh_parse ($$$) {
sub git_config_dump {
my ($file) = @_;
return {} unless -e $file;
- my @cmd = (qw/git config -z -l/, "--file=$file");
+ my @cmd = (qw/git config -z -l --includes/, "--file=$file");
my $cmd = join(' ', @cmd);
- my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n";
+ my $fh = popen_rd(\@cmd);
my $rv = config_fh_parse($fh, "\0", "\n");
close $fh or die "failed to close ($cmd) pipe: $?";
$rv;
@@ -190,6 +190,9 @@ sub cgit_repo_merge ($$$) {
return unless -e "$path/$se";
}
return if -e "$path/noweb";
+ # this comes from the cgit config, and AFAIK cgit only allows
+ # repos to have one URL, but that's just the PATH_INFO component,
+ # not the Host: portion
# $repo = { url => 'foo.git', dir => '/path/to/foo.git' }
my $rel = $repo->{url};
unless (defined $rel) {
@@ -206,8 +209,8 @@ sub cgit_repo_merge ($$$) {
$self->{-cgit_remove_suffix} and
$rel =~ s!/?\.git\z!!;
}
- $self->{"coderepo.$rel.dir"} ||= $path;
- $self->{"coderepo.$rel.cgiturl"} ||= $rel;
+ $self->{"coderepo.$rel.dir"} //= $path;
+ $self->{"coderepo.$rel.cgiturl"} //= _array($rel);
}
sub is_git_dir ($) {
@@ -249,7 +252,7 @@ sub scan_projects_coderepo ($$$) {
warn "failed to open cgit projectlist=$list: $!\n";
return;
};
- foreach (<$fh>) {
+ while (<$fh>) {
chomp;
scan_path_coderepo($self, $path, "$path/$_");
}
@@ -274,7 +277,7 @@ sub parse_cgitrc {
# FIXME: this doesn't support macro expansion via $VARS, yet
my $repo;
- foreach (<$fh>) {
+ while (<$fh>) {
chomp;
if (m!\Arepo\.url=(.+?)/*\z!) {
my $nick = $1;
@@ -332,13 +335,14 @@ sub _fill_code_repo {
_array($self->{lc("$pfx.${t}UrlFormat")});
}
- if (my $cgits = $self->{lc("$pfx.cgitUrl")}) {
+ 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 {
+ $git->{$t.'_url_format'} //= map {
"$_/$t/?id=%s"
} @$cgits;
}
@@ -362,12 +366,16 @@ sub _fill {
my ($self, $pfx) = @_;
my $ibx = {};
- foreach my $k (qw(mainrepo filter url newsgroup
- infourl watch watchheader httpbackendmax
+ foreach my $k (qw(inboxdir filter newsgroup
+ watch httpbackendmax
replyto feedmax nntpserver indexlevel)) {
my $v = $self->{"$pfx.$k"};
$ibx->{$k} = $v if defined $v;
}
+
+ # backwards compatibility:
+ $ibx->{inboxdir} //= $self->{"$pfx.mainrepo"};
+
foreach my $k (qw(obfuscate)) {
my $v = $self->{"$pfx.$k"};
defined $v or next;
@@ -379,13 +387,14 @@ sub _fill {
}
# TODO: more arrays, we should support multi-value for
# more things to encourage decentralization
- foreach my $k (qw(address altid nntpmirror coderepo hide listid)) {
+ foreach my $k (qw(address altid nntpmirror coderepo hide listid url
+ infourl watchheader)) {
if (defined(my $v = $self->{"$pfx.$k"})) {
$ibx->{$k} = _array($v);
}
}
- return unless $ibx->{mainrepo};
+ return unless defined($ibx->{inboxdir});
my $name = $pfx;
$name =~ s/\Apublicinbox\.//;
@@ -414,7 +423,7 @@ sub _fill {
if ($ibx->{obfuscate}) {
$ibx->{-no_obfuscate} = $self->{-no_obfuscate};
$ibx->{-no_obfuscate_re} = $self->{-no_obfuscate_re};
- _fill_all($self); # noop to populate -no_obfuscate
+ fill_all($self); # noop to populate -no_obfuscate
}
if (my $ibx_code_repos = $ibx->{coderepo}) {
@@ -426,7 +435,7 @@ sub _fill {
$valid += valid_inbox_name($_) foreach (@parts);
$valid == scalar(@parts) or next;
- my $repo = $code_repos->{$nick} ||=
+ my $repo = $code_repos->{$nick} //=
_fill_code_repo($self, $nick);
push @$repo_objs, $repo if $repo;
}