X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=cc8c1eafb804e12f8c2c34d53740b24479ed4f11;hb=42f390c5e4d8e6619d234a43aa5397c9977cf070;hp=c2fa40f970d6575306e02c93cdf0f148ffdcc89b;hpb=53a8e32b97985803e9de12c4312a86a8850208b3;p=public-inbox.git

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index c2fa40f9..cc8c1eaf 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -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] ] }
@@ -20,17 +20,22 @@ sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] }
 sub new {
 	my ($class, $file) = @_;
 	$file = default_file() unless defined($file);
-	$file = ref $file ? $file : git_config_dump($file);
-	my $self = bless $file, $class;
-
+	my $self;
+	if (ref($file) eq 'SCALAR') { # used by some tests
+		open my $fh, '<', $file or die;  # PerlIO::scalar
+		$self = config_fh_parse($fh, "\n", '=');
+	} else {
+		$self = git_config_dump($file);
+	}
+	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'}) {
@@ -58,107 +63,50 @@ sub new {
 	$self;
 }
 
+sub noop {}
+sub fill_all ($) { each_inbox($_[0], \&noop) }
+
+sub _lookup_fill ($$$) {
+	my ($self, $cache, $key) = @_;
+	$self->{$cache}->{$key} // do {
+		fill_all($self);
+		$self->{$cache}->{$key};
+	}
+}
+
 sub lookup {
 	my ($self, $recipient) = @_;
-	my $addr = lc($recipient);
-	my $ibx = $self->{-by_addr}->{$addr};
-	return $ibx if $ibx;
-
-	my $pfx;
-
-	foreach my $k (keys %$self) {
-		$k =~ m!\A(publicinbox\.[^/]+)\.address\z! or next;
-		my $v = $self->{$k};
-		if (ref($v) eq "ARRAY") {
-			foreach my $alias (@$v) {
-				(lc($alias) eq $addr) or next;
-				$pfx = $1;
-				last;
-			}
-		} else {
-			(lc($v) eq $addr) or next;
-			$pfx = $1;
-			last;
-		}
-	}
-	defined $pfx or return;
-	_fill($self, $pfx);
+	_lookup_fill($self, '-by_addr', lc($recipient));
 }
 
 sub lookup_list_id {
 	my ($self, $list_id) = @_;
-	$list_id = lc($list_id);
-	my $ibx = $self->{-by_list_id}->{$list_id};
-	return $ibx if $ibx;
-
-	my $pfx;
-
-	foreach my $k (keys %$self) {
-		$k =~ /\A(publicinbox\.[\w-]+)\.listid\z/ or next;
-		my $v = $self->{$k};
-		if (ref($v) eq "ARRAY") {
-			foreach my $alias (@$v) {
-				(lc($alias) eq $list_id) or next;
-				$pfx = $1;
-				last;
-			}
-		} else {
-			(lc($v) eq $list_id) or next;
-			$pfx = $1;
-			last;
-		}
-	}
-	defined $pfx or return;
-	_fill($self, $pfx);
+	_lookup_fill($self, '-by_list_id', lc($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) = @_;
-	if (my $section_order = $self->{-section_order}) {
-		foreach my $section (@$section_order) {
-			next if $section !~ m!\Apublicinbox\.([^/]+)\z!;
-			$self->{"publicinbox.$1.mainrepo"} or next;
-			my $ibx = lookup_name($self, $1) or next;
-			$cb->($ibx);
-		}
-	} else {
-		my %seen;
-		foreach my $k (keys %$self) {
-			$k =~ m!\Apublicinbox\.([^/]+)\.mainrepo\z! or next;
-			next if $seen{$1};
-			$seen{$1} = 1;
-			my $ibx = lookup_name($self, $1) or next;
-			$cb->($ibx);
-		}
+	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!;
+		my $ibx = lookup_name($self, $1) or next;
+		$cb->($ibx, $arg);
 	}
 }
 
 sub lookup_newsgroup {
 	my ($self, $ng) = @_;
-	$ng = lc($ng);
-	my $ibx = $self->{-by_newsgroup}->{$ng};
-	return $ibx if $ibx;
-
-	foreach my $k (keys %$self) {
-		$k =~ m!\A(publicinbox\.[^/]+)\.newsgroup\z! or next;
-		my $v = $self->{$k};
-		my $pfx = $1;
-		if ($v eq $ng) {
-			$ibx = _fill($self, $pfx);
-			return $ibx;
-		}
-	}
-	undef;
+	_lookup_fill($self, '-by_newsgroup', lc($ng));
 }
 
 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);
@@ -167,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};
@@ -175,19 +123,14 @@ sub default_file {
 	config_dir() . '/config';
 }
 
-sub git_config_dump {
-	my ($file) = @_;
-	my (%section_seen, @section_order);
-	return {} unless -e $file;
-	my @cmd = (qw/git config -z -l/, "--file=$file");
-	my $cmd = join(' ', @cmd);
-	my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n";
+sub config_fh_parse ($$$) {
+	my ($fh, $rs, $fs) = @_;
 	my %rv;
-	local $/ = "\0";
+	my (%section_seen, @section_order);
+	local $/ = $rs;
 	while (defined(my $line = <$fh>)) {
 		chomp $line;
-		my ($k, $v) = split(/\n/, $line, 2);
-
+		my ($k, $v) = split($fs, $line, 2);
 		my ($section) = ($k =~ /\A(\S+)\.[^\.]+\z/);
 		unless (defined $section_seen{$section}) {
 			$section_seen{$section} = 1;
@@ -205,12 +148,22 @@ sub git_config_dump {
 			$rv{$k} = $v;
 		}
 	}
-	close $fh or die "failed to close ($cmd) pipe: $?";
 	$rv{-section_order} = \@section_order;
 
 	\%rv;
 }
 
+sub git_config_dump {
+	my ($file) = @_;
+	return {} unless -e $file;
+	my @cmd = (qw/git config -z -l/, "--file=$file");
+	my $cmd = join(' ', @cmd);
+	my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n";
+	my $rv = config_fh_parse($fh, "\0", "\n");
+	close $fh or die "failed to close ($cmd) pipe: $?";
+	$rv;
+}
+
 sub valid_inbox_name ($) {
 	my ($name) = @_;
 
@@ -253,8 +206,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"} //= $rel;
 }
 
 sub is_git_dir ($) {
@@ -385,7 +338,7 @@ sub _fill_code_repo {
 		# 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;
 		}
@@ -409,12 +362,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 watchheader 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;
@@ -426,13 +383,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)) {
 		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\.//;
 
@@ -461,7 +419,7 @@ sub _fill {
 	if ($ibx->{obfuscate}) {
 		$ibx->{-no_obfuscate} = $self->{-no_obfuscate};
 		$ibx->{-no_obfuscate_re} = $self->{-no_obfuscate_re};
-		each_inbox($self, sub {}); # noop to populate -no_obfuscate
+		fill_all($self); # noop to populate -no_obfuscate
 	}
 
 	if (my $ibx_code_repos = $ibx->{coderepo}) {
@@ -473,7 +431,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;
 		}