X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=f6275cdd24663d2f5b3f8235d7e188a04863b923;hb=ba4c50c20b95679580beba1ef290a4281d5285b7;hp=935b04450b3c4f2cbdb32348355894e9fcb8be82;hpb=e8e1aba1abd87dacfe46704a9e939f13c9ad3b52;p=public-inbox.git

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 935b0445..f6275cdd 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -5,11 +5,8 @@
 package PublicInbox::Config;
 use strict;
 use warnings;
-use base qw/Exporter/;
-our @EXPORT_OK = qw/try_cat/;
 require PublicInbox::Inbox;
 use PublicInbox::Spawn qw(popen_rd);
-use File::Path::Expand qw/expand_filename/;
 
 # 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
@@ -22,6 +19,8 @@ sub new {
 	# caches
 	$self->{-by_addr} ||= {};
 	$self->{-by_name} ||= {};
+	$self->{-by_newsgroup} ||= {};
+	$self->{-limiters} ||= {};
 	$self;
 }
 
@@ -52,20 +51,51 @@ sub lookup {
 	_fill($self, $pfx);
 }
 
-sub lookup_name {
+sub lookup_name ($$) {
 	my ($self, $name) = @_;
-	my $rv = $self->{-by_name}->{$name};
-	return $rv if $rv;
-	$self->{-by_name}->{$name} = _fill($self, "publicinbox.$name");
+	$self->{-by_name}->{$name} || _fill($self, "publicinbox.$name");
+}
+
+sub each_inbox {
+	my ($self, $cb) = @_;
+	my %seen;
+	foreach my $k (keys %$self) {
+		$k =~ /\Apublicinbox\.([A-Z0-9a-z-]+)\.mainrepo\z/ or next;
+		next if $seen{$1};
+		$seen{$1} = 1;
+		my $ibx = lookup_name($self, $1) or next;
+		$cb->($ibx);
+	}
 }
 
-sub get {
-	my ($self, $inbox, $key) = @_;
+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;
+}
 
-	$self->{"publicinbox.$inbox.$key"};
+sub limiter {
+	my ($self, $name) = @_;
+	$self->{-limiters}->{$name} ||= do {
+		require PublicInbox::Qspawn;
+		my $max = $self->{"publicinboxlimiter.$name.max"};
+		PublicInbox::Qspawn::Limiter->new($max);
+	};
 }
 
-sub config_dir { $ENV{PI_DIR} || expand_filename('~/.public-inbox') }
+sub config_dir { $ENV{PI_DIR} || "$ENV{HOME}/.public-inbox" }
 
 sub default_file {
 	my $f = $ENV{PI_CONFIG};
@@ -78,10 +108,10 @@ sub git_config_dump {
 	my ($in, $out);
 	my @cmd = (qw/git config/, "--file=$file", '-l');
 	my $cmd = join(' ', @cmd);
-	my $fh = popen_rd(\@cmd);
+	my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n";
 	my %rv;
 	local $/ = "\n";
-	foreach my $line (<$fh>) {
+	while (defined(my $line = <$fh>)) {
 		chomp $line;
 		my ($k, $v) = split(/=/, $line, 2);
 		my $cur = $rv{$k};
@@ -100,37 +130,41 @@ sub git_config_dump {
 	\%rv;
 }
 
-sub try_cat {
-	my ($path) = @_;
-	my $rv;
-	if (open(my $fh, '<', $path)) {
-		local $/;
-		$rv = <$fh>;
-	}
-	$rv;
-}
-
 sub _fill {
 	my ($self, $pfx) = @_;
 	my $rv = {};
 
-	foreach my $k (qw(mainrepo address filter url)) {
+	foreach my $k (qw(mainrepo address filter url newsgroup
+			infourl watch watchheader httpbackendmax
+			feedmax nntpserver)) {
 		my $v = $self->{"$pfx.$k"};
 		$rv->{$k} = $v if defined $v;
 	}
-	my $inbox = $pfx;
-	$inbox =~ s/\Apublicinbox\.//;
-	$rv->{name} = $inbox;
-	my $v = $rv->{address} ||= 'public-inbox@example.com';
-	$rv->{-primary_address} = ref($v) eq 'ARRAY' ? $v->[0] : $v;
+
+	# TODO: more arrays, we should support multi-value for
+	# more things to encourage decentralization
+	foreach my $k (qw(altid nntpmirror)) {
+		if (defined(my $v = $self->{"$pfx.$k"})) {
+			$rv->{$k} = ref($v) eq 'ARRAY' ? $v : [ $v ];
+		}
+	}
+
+	return unless $rv->{mainrepo};
+	my $name = $pfx;
+	$name =~ s/\Apublicinbox\.//;
+	$rv->{name} = $name;
+	$rv->{-pi_config} = $self;
 	$rv = PublicInbox::Inbox->new($rv);
+	my $v = $rv->{address};
 	if (ref($v) eq 'ARRAY') {
 		$self->{-by_addr}->{lc($_)} = $rv foreach @$v;
 	} else {
 		$self->{-by_addr}->{lc($v)} = $rv;
 	}
-	$rv;
+	if (my $ng = $rv->{newsgroup}) {
+		$self->{-by_newsgroup}->{$ng} = $rv;
+	}
+	$self->{-by_name}->{$name} = $rv;
 }
 
-
 1;