X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=42bd9438fb82db44f6fff62cbbc5d5c0ea78f8fe;hb=6dec9bf8c0e1b859703d7a5dfb87052cf4e87846;hp=d38f65863a49a6f8f01940e0d59dd74cc44dc1d8;hpb=996de3c67d490b4052bd16179b229b30c2f890f8;p=public-inbox.git

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index d38f6586..42bd9438 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
@@ -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;
 }
 
@@ -394,8 +384,8 @@ sub get_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;
 		}
 	}
 }
@@ -452,7 +441,8 @@ sub _fill_ibx {
 	# more things to encourage decentralization
 	for my $k (qw(address altid nntpmirror imapmirror
 			coderepo hide listid url
-			infourl watchheader nntpserver imapserver)) {
+			infourl watchheader
+			nntpserver imapserver pop3server)) {
 		my $v = $self->{"$pfx.$k"} // next;
 		$ibx->{$k} = _array($v);
 	}