X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=2be485e5efd68d038d877a39733466f6ce5a68bb;hb=bde2d8c8de65a4d6b06e8d7365f504f2d8db90a6;hp=ea84da353c81827bcd018aa3a880d17959a52893;hpb=0c8f677e55941c5c65b263294692899c549ce533;p=public-inbox.git

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index ea84da35..2be485e5 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -20,6 +20,7 @@ sub new {
 	$self->{-by_addr} ||= {};
 	$self->{-by_name} ||= {};
 	$self->{-by_newsgroup} ||= {};
+	$self->{-limiters} ||= {};
 	$self;
 }
 
@@ -50,11 +51,21 @@ sub lookup {
 	_fill($self, $pfx);
 }
 
-sub lookup_name {
+sub lookup_name ($$) {
 	my ($self, $name) = @_;
-	my $rv = $self->{-by_name}->{$name};
-	return $rv if $rv;
-	$rv = _fill($self, "publicinbox.$name") or return;
+	$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 lookup_newsgroup {
@@ -75,10 +86,13 @@ sub lookup_newsgroup {
 	undef;
 }
 
-sub get {
-	my ($self, $inbox, $key) = @_;
-
-	$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} || "$ENV{HOME}/.public-inbox" }
@@ -94,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};
@@ -120,22 +134,39 @@ sub _fill {
 	my ($self, $pfx) = @_;
 	my $rv = {};
 
-	foreach my $k (qw(mainrepo address filter url newsgroup
-			watch watchheader)) {
+	foreach my $k (qw(mainrepo filter url newsgroup
+			infourl watch watchheader httpbackendmax
+			replyto feedmax nntpserver)) {
 		my $v = $self->{"$pfx.$k"};
 		$rv->{$k} = $v if defined $v;
 	}
+	foreach my $k (qw(obfuscate)) {
+		my $v = $self->{"$pfx.$k"};
+		defined $v or next;
+		if ($v =~ /\A(?:false|no|off|0)\z/) {
+			$rv->{$k} = 0;
+		} elsif ($v =~ /\A(?:true|yes|on|1)\z/) {
+			$rv->{$k} = 1;
+		} else {
+			warn "Ignoring $pfx.$k=$v in config, not boolean\n";
+		}
+	}
+
+	# TODO: more arrays, we should support multi-value for
+	# more things to encourage decentralization
+	foreach my $k (qw(address 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;
-	}
+	$self->{-by_addr}->{lc($_)} = $rv foreach @{$rv->{address}};
 	if (my $ng = $rv->{newsgroup}) {
 		$self->{-by_newsgroup}->{$ng} = $rv;
 	}