X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=4651861d215229fe6e53d5ca7f9886d395d3a2fe;hb=4d254238299f950c4a7f94ffd2e0c1fba28c74a4;hp=b6885a3108dfec79b72d5d28e25f8e8644605a44;hpb=e6c85810fc1536676fb72b4bf050aca72f0e9b10;p=public-inbox.git

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index b6885a31..4651861d 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -1,54 +1,146 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+#
+# Used throughout the project for reading configuration
 package PublicInbox::Config;
 use strict;
 use warnings;
-use File::Path::Expand qw/expand_filename/;
+require PublicInbox::Inbox;
+use PublicInbox::Spawn qw(popen_rd);
 
 # 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) = @_;
+	$file = default_file() unless defined($file);
+	$file = ref $file ? $file : git_config_dump($file);
+	my $self = bless $file, $class;
 
-	local $ENV{GIT_CONFIG} = defined $file ? $file : default_file();
-
-	my @cfg = `git config -l`;
-	$? == 0 or die "git config -l failed: $?\n";
-	chomp @cfg;
-	my %rv = map { split(/=/, $_, 2) } @cfg;
-	bless \%rv, $class;
+	# caches
+	$self->{-by_addr} ||= {};
+	$self->{-by_name} ||= {};
+	$self->{-by_newsgroup} ||= {};
+	$self;
 }
 
 sub lookup {
 	my ($self, $recipient) = @_;
 	my $addr = lc($recipient);
+	my $inbox = $self->{-by_addr}->{$addr};
+	return $inbox if $inbox;
+
 	my $pfx;
 
 	foreach my $k (keys %$self) {
-		$k =~ /\A(publicinbox\.[A-Z0-9a-z-]+)\.address\z/ or next;
-		(lc($self->{$k}) eq $addr) or next;
-		$pfx = $1;
-		last;
+		$k =~ /\A(publicinbox\.[\w-]+)\.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);
+}
 
-	my %rv = map {
-		$_ => $self->{"$pfx.$_"}
-	} (qw(mainrepo description address));
-	\%rv;
+sub lookup_name {
+	my ($self, $name) = @_;
+	my $rv = $self->{-by_name}->{$name};
+	return $rv if $rv;
+	$rv = _fill($self, "publicinbox.$name") or return;
+}
+
+sub lookup_newsgroup {
+	my ($self, $ng) = @_;
+	$ng = lc($ng);
+	my $rv = $self->{-by_newsgroup}->{$ng};
+	return $rv if $rv;
+
+	foreach my $k (keys %$self) {
+		$k =~ /\A(publicinbox\.[\w-]+)\.newsgroup\z/ or next;
+		my $v = $self->{$k};
+		my $pfx = $1;
+		if ($v eq $ng) {
+			$rv = _fill($self, $pfx);
+			return $rv;
+		}
+	}
+	undef;
 }
 
 sub get {
-	my ($self, $listname, $key) = @_;
+	my ($self, $inbox, $key) = @_;
 
-	$self->{"publicinbox.$listname.$key"};
+	$self->{"publicinbox.$inbox.$key"};
 }
 
+sub config_dir { $ENV{PI_DIR} || "$ENV{HOME}/.public-inbox" }
+
 sub default_file {
 	my $f = $ENV{PI_CONFIG};
 	return $f if defined $f;
-	my $pi_dir = $ENV{PI_DIR} || expand_filename('~/.public-inbox/');
-	"$pi_dir/config";
+	config_dir() . '/config';
+}
+
+sub git_config_dump {
+	my ($file) = @_;
+	my ($in, $out);
+	my @cmd = (qw/git config/, "--file=$file", '-l');
+	my $cmd = join(' ', @cmd);
+	my $fh = popen_rd(\@cmd);
+	my %rv;
+	local $/ = "\n";
+	foreach my $line (<$fh>) {
+		chomp $line;
+		my ($k, $v) = split(/=/, $line, 2);
+		my $cur = $rv{$k};
+
+		if (defined $cur) {
+			if (ref($cur) eq "ARRAY") {
+				push @$cur, $v;
+			} else {
+				$rv{$k} = [ $cur, $v ];
+			}
+		} else {
+			$rv{$k} = $v;
+		}
+	}
+	close $fh or die "failed to close ($cmd) pipe: $?";
+	\%rv;
+}
+
+sub _fill {
+	my ($self, $pfx) = @_;
+	my $rv = {};
+
+	foreach my $k (qw(mainrepo address filter url newsgroup)) {
+		my $v = $self->{"$pfx.$k"};
+		$rv->{$k} = $v if defined $v;
+	}
+	return unless $rv->{mainrepo};
+	my $name = $pfx;
+	$name =~ s/\Apublicinbox\.//;
+	$rv->{name} = $name;
+	my $v = $rv->{address} ||= 'public-inbox@example.com';
+	my $p = $rv->{-primary_address} = ref($v) eq 'ARRAY' ? $v->[0] : $v;
+	$rv->{domain} = ($p =~ /\@(\S+)\z/) ? $1 : 'localhost';
+	$rv = PublicInbox::Inbox->new($rv);
+	if (ref($v) eq 'ARRAY') {
+		$self->{-by_addr}->{lc($_)} = $rv foreach @$v;
+	} else {
+		$self->{-by_addr}->{lc($v)} = $rv;
+	}
+	if (my $ng = $rv->{newsgroup}) {
+		$self->{-by_newsgroup}->{$ng} = $rv;
+	}
+	$self->{-by_name}->{$name} = $rv;
 }
 
 1;