www_stream: fix search for new.html endpoint

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

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 35b24af4567eeb83ae1458b06eb078278970c89c..ddb4f6b1e95fe2af6a326c45d5025c64549b2918 100644 (file)
--- 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,7 @@ sub new {
        # caches
        $self->{-by_addr} ||= {};
        $self->{-by_name} ||= {};
+       $self->{-by_newsgroup} ||= {};
        $self;
 }
 
@@ -57,7 +55,24 @@ sub lookup_name {
        my $rv = $self->{-by_name}->{$name};
        return $rv if $rv;
        $rv = _fill($self, "publicinbox.$name") or return;
-       $self->{-by_name}->{$name} = $rv;
+}
+
+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 {
@@ -66,7 +81,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};
@@ -79,7 +94,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>) {
@@ -101,38 +116,30 @@ 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
+                       watch watchheader)) {
                my $v = $self->{"$pfx.$k"};
                $rv->{$k} = $v if defined $v;
        }
        return unless $rv->{mainrepo};
-       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;
+       my $name = $pfx;
+       $name =~ s/\Apublicinbox\.//;
+       $rv->{name} = $name;
        $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;