X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=a31b5b74c7c7282ba1e3bb83e7fcc6603b7427bb;hb=68046e0fff12c35d793a7ae9f164ac415c84cc21;hp=36f2fafb2a532ecac9ee4167084bdb0c9c2ffe7e;hpb=520be116e8a686cb223b48fad1de29201dee45be;p=public-inbox.git

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 36f2fafb..a31b5b74 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) 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
@@ -19,7 +19,7 @@ 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
@@ -27,7 +27,7 @@ sub new {
 		$self = config_fh_parse($fh, "\n", '=');
 		bless $self, $class;
 	} else {
-		$self = git_config_dump($class, $file);
+		$self = git_config_dump($class, $file, $errfh);
 		$self->{'-f'} = $file;
 	}
 	# caches
@@ -164,12 +164,12 @@ sub config_fh_parse ($$$) {
 }
 
 sub git_config_dump {
-	my ($class, $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: $?";
+	close $fh or die "@$cmd failed: \$?=$?\n";
 	bless $rv, $class;
 }
 
@@ -323,35 +323,18 @@ 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;
@@ -384,18 +367,18 @@ 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];
 }
 
 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 +391,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 +406,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;
 	}
 
@@ -450,8 +432,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,10 +506,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);
 	}