nntpd: share {groups} hash with {-by_newsgroup} in Config

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

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index f78115b6e47b62c91f73b1d1599023774176de39..e7aea99b7ae80f8c8f515583b963d51bbfb59da7 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -89,6 +89,14 @@ sub lookup_name ($$) {
        $self->{-by_name}->{$name} // _fill($self, "publicinbox.$name");
 }
 
+sub lookup_ei {
+       my ($self, $name) = @_;
+       $self->{-ei_by_name}->{$name} //= _fill_ei($self, "extindex.$name");
+}
+
+# special case for [extindex "all"]
+sub ALL { lookup_ei($_[0], 'all') }
+
 sub each_inbox {
        my ($self, $cb, @arg) = @_;
        # may auto-vivify if config file is non-existent:
@@ -99,24 +107,6 @@ sub each_inbox {
        }
 }
 
-sub iterate_start {
-       my ($self, $cb, @arg) = @_;
-       my $i = 0;
-       $self->{-iter} = [ \$i, $cb, @arg ];
-}
-
-# for PublicInbox::DS::next_tick, we only call this is if
-# PublicInbox::DS is already loaded
-sub event_step {
-       my ($self) = @_;
-       my ($i, $cb, @arg) = @{$self->{-iter}};
-       my $section = $self->{-section_order}->[$$i++];
-       delete($self->{-iter}) unless defined($section);
-       eval { $cb->($self, $section, @arg) };
-       warn "E: $@ in ${self}::event_step" if $@;
-       PublicInbox::DS::requeue($self) if defined($section);
-}
-
 sub lookup_newsgroup {
        my ($self, $ng) = @_;
        _lookup_fill($self, '-by_newsgroup', lc($ng));
@@ -382,13 +372,23 @@ sub _fill {
        my ($self, $pfx) = @_;
        my $ibx = {};
 
-       foreach my $k (qw(inboxdir filter newsgroup
-                       watch httpbackendmax
-                       replyto feedmax nntpserver
-                       indexlevel indexsequentialshard)) {
+       for my $k (qw(watch nntpserver)) {
                my $v = $self->{"$pfx.$k"};
                $ibx->{$k} = $v if defined $v;
        }
+       for my $k (qw(filter inboxdir newsgroup replyto httpbackendmax feedmax
+                       indexlevel indexsequentialshard)) {
+               if (defined(my $v = $self->{"$pfx.$k"})) {
+                       if (ref($v) eq 'ARRAY') {
+                               warn <<EOF;
+W: $pfx.$k has multiple values, only using `$v->[-1]'
+EOF
+                               $ibx->{$k} = $v->[-1];
+                       } else {
+                               $ibx->{$k} = $v;
+                       }
+               }
+       }
 
        # backwards compatibility:
        $ibx->{inboxdir} //= $self->{"$pfx.mainrepo"};
@@ -432,12 +432,15 @@ sub _fill {
                $self->{-no_obfuscate}->{$lc_addr} = 1;
        }
        if (my $listids = $ibx->{listid}) {
+               # RFC2919 section 6 stipulates "case insensitive equality"
                foreach my $list_id (@$listids) {
-                       $self->{-by_list_id}->{$list_id} = $ibx;
+                       $self->{-by_list_id}->{lc($list_id)} = $ibx;
                }
        }
        if (my $ng = $ibx->{newsgroup}) {
-               $self->{-by_newsgroup}->{$ng} = $ibx;
+               # PublicInbox::NNTPD does stricter (and more expensive checks),
+               # keep this lean for startup speed
+               $self->{-by_newsgroup}->{$ng} = $ibx unless ref($ng);
        }
        $self->{-by_name}->{$name} = $ibx;
        if ($ibx->{obfuscate}) {
@@ -464,6 +467,13 @@ sub _fill {
        $ibx
 }
 
+sub _fill_ei ($$) {
+       my ($self, $pfx) = @_;
+       require PublicInbox::ExtSearch;
+       my $d = $self->{"$pfx.topdir"};
+       defined($d) && -d $d ? PublicInbox::ExtSearch->new($d) : undef;
+}
+
 sub urlmatch {
        my ($self, $key, $url) = @_;
        state $urlmatch_broken; # requires git 1.8.5
@@ -483,4 +493,16 @@ sub urlmatch {
        }
 }
 
+sub json {
+       state $json;
+       $json //= do {
+               for my $mod (qw(Cpanel::JSON::XS JSON::MaybeXS JSON JSON::PP)) {
+                       eval "require $mod" or next;
+                       # ->ascii encodes non-ASCII to "\uXXXX"
+                       $json = $mod->new->ascii(1) and last;
+               }
+               $json;
+       };
+}
+
 1;