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 b38f444362c9b513561d3f2eafe5f65e23443682..5adcd0ccf44ac2f13eb90b66c205de45dcf31bae 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -5,10 +5,8 @@
 package PublicInbox::Config;
 use strict;
 use warnings;
-use base qw/Exporter/;
-our @EXPORT_OK = qw/try_cat/;
 require PublicInbox::Inbox;
-use File::Path::Expand qw/expand_filename/;
+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
@@ -21,6 +19,8 @@ sub new {
        # caches
        $self->{-by_addr} ||= {};
        $self->{-by_name} ||= {};
+       $self->{-by_newsgroup} ||= {};
+       $self->{-limiters} ||= {};
        $self;
 }
 
@@ -51,11 +51,48 @@ sub lookup {
        _fill($self, $pfx);
 }
 
-sub lookup_name {
+sub lookup_name ($$) {
        my ($self, $name) = @_;
-       my $rv = $self->{-by_name}->{$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 lookup_newsgroup {
+       my ($self, $ng) = @_;
+       $ng = lc($ng);
+       my $rv = $self->{-by_newsgroup}->{$ng};
        return $rv if $rv;
-       $self->{-by_name}->{$name} = _fill($self, "publicinbox.$name");
+
+       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 limiter {
+       my ($self, $name) = @_;
+       $self->{-limiters}->{$name} ||= do {
+               require PublicInbox::Qspawn;
+               my $key = "limiter.$name.max";
+               PublicInbox::Qspawn::Limiter->new($self->{$key});
+       };
 }
 
 sub get {
@@ -64,7 +101,7 @@ sub get {
        $self->{"publicinbox.$inbox.$key"};
 }
 
-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};
@@ -77,8 +114,7 @@ sub git_config_dump {
        my ($in, $out);
        my @cmd = (qw/git config/, "--file=$file", '-l');
        my $cmd = join(' ', @cmd);
-       my $pid = open(my $fh, '-|', @cmd);
-       defined $pid or die "$cmd failed: $!";
+       my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n";
        my %rv;
        local $/ = "\n";
        foreach my $line (<$fh>) {
@@ -96,42 +132,44 @@ sub git_config_dump {
                        $rv{$k} = $v;
                }
        }
-       close $fh or die "failed to close ($cmd) pipe: $!";
-       $? and warn "$$ $cmd exited with: ($pid) $?";
+       close $fh or die "failed to close ($cmd) pipe: $?";
        \%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)) {
                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;