X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=f2e5d5f0801e4c0f566f51ae654bdc55a5112c38;hb=1d6ebab439828dce8b7e8cbb99dfbc237e9d5a74;hp=5e7a9f2b6d8d55e61fce036ca101bbda10c9f761;hpb=b4bc9aeed78078feae58d150970fe224f10098e3;p=public-inbox.git

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 5e7a9f2b..f2e5d5f0 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -328,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;
@@ -385,10 +369,10 @@ 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];
 }
 
@@ -430,7 +414,7 @@ sub _fill_ibx {
 	}
 	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 +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 nntpserver)) {
+	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);
 	}
@@ -522,7 +507,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)) {