www: allow including links to NNTP sites in HTML footer

[public-inbox.git] / lib / PublicInbox / Config.pm

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 4651861d215229fe6e53d5ca7f9886d395d3a2fe..5adcd0ccf44ac2f13eb90b66c205de45dcf31bae 100644 (file)
--- 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,6 +86,15 @@ sub lookup_newsgroup {
        undef;
 }
 
+sub limiter {
+       my ($self, $name) = @_;
+       $self->{-limiters}->{$name} ||= do {
+               require PublicInbox::Qspawn;
+               my $key = "limiter.$name.max";
+               PublicInbox::Qspawn::Limiter->new($self->{$key});
+       };
+}
+
 sub get {
        my ($self, $inbox, $key) = @_;
 
@@ -94,7 +114,7 @@ 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>) {
@@ -120,18 +140,27 @@ sub _fill {
        my ($self, $pfx) = @_;
        my $rv = {};
 
-       foreach my $k (qw(mainrepo address filter url newsgroup)) {
+       foreach my $k (qw(mainrepo address filter url newsgroup
+                       infourl watch watchheader httpbackendmax)) {
                my $v = $self->{"$pfx.$k"};
                $rv->{$k} = $v if defined $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;
-       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->{-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 {