-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# Used throughout the project for reading configuration
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] ] }
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;
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) {
$rel =~ s!/?\.git\z!!;
}
$self->{"coderepo.$rel.dir"} //= $path;
- $self->{"coderepo.$rel.cgiturl"} //= $rel;
+ $self->{"coderepo.$rel.cgiturl"} //= _array($rel);
}
sub is_git_dir ($) {
warn "failed to open cgit projectlist=$list: $!\n";
return;
};
- foreach (<$fh>) {
+ while (<$fh>) {
chomp;
scan_path_coderepo($self, $path, "$path/$_");
}
# 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;
_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=
my $ibx = {};
foreach my $k (qw(inboxdir filter newsgroup
- watch watchheader httpbackendmax
+ watch httpbackendmax
replyto feedmax nntpserver indexlevel)) {
my $v = $self->{"$pfx.$k"};
$ibx->{$k} = $v if defined $v;
# TODO: more arrays, we should support multi-value for
# more things to encourage decentralization
foreach my $k (qw(address altid nntpmirror coderepo hide listid url
- infourl)) {
+ infourl watchheader)) {
if (defined(my $v = $self->{"$pfx.$k"})) {
$ibx->{$k} = _array($v);
}