X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPublicInbox%2FNNTPD.pm;h=f31d43818e5570fa44f33a8c63fedc9610930956;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=6b762d8923b41ff63d973a6e8db71a37506ec9ce;hpb=2a717d13f10fcdc69921d80cf94c47a694a175d4;p=public-inbox.git
diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 6b762d89..f31d4381 100644
--- a/lib/PublicInbox/NNTPD.pm
+++ b/lib/PublicInbox/NNTPD.pm
@@ -1,19 +1,20 @@
-# Copyright (C) 2016-2020 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
# represents an NNTPD (currently a singleton),
# see script/public-inbox-nntpd for how it is used
package PublicInbox::NNTPD;
use strict;
-use warnings;
+use v5.10.1;
use Sys::Hostname;
use PublicInbox::Config;
use PublicInbox::InboxIdle;
+use PublicInbox::NNTP;
sub new {
my ($class) = @_;
- my $pi_config = PublicInbox::Config->new;
- my $name = $pi_config->{'publicinbox.nntpserver'};
+ my $pi_cfg = PublicInbox::Config->new;
+ my $name = $pi_cfg->{'publicinbox.nntpserver'};
if (!defined($name) or $name eq '') {
$name = hostname;
} elsif (ref($name) eq 'ARRAY') {
@@ -24,8 +25,7 @@ sub new {
groups => {},
err => \*STDERR,
out => \*STDOUT,
- grouplist => [],
- pi_config => $pi_config,
+ pi_cfg => $pi_cfg,
servername => $name,
greet => \"201 $name ready - post via email\r\n",
# accept_tls => { SSL_server => 1, ..., SSL_reuse_ctx => ... }
@@ -35,40 +35,33 @@ sub new {
sub refresh_groups {
my ($self, $sig) = @_;
- my $pi_config = $sig ? PublicInbox::Config->new : $self->{pi_config};
- my $new = {};
- my @list;
- $pi_config->each_inbox(sub {
- my ($ng) = @_;
- my $ngname = $ng->{newsgroup} or return;
- if (ref $ngname) {
- warn 'multiple newsgroups not supported: '.
- join(', ', @$ngname). "\n";
- # Newsgroup name needs to be compatible with RFC 3977
- # wildmat-exact and RFC 3501 (IMAP) ATOM-CHAR.
- # Leave out a few chars likely to cause problems or conflicts:
- # '|', '<', '>', ';', '#', '$', '&',
- } elsif ($ngname =~ m![^A-Za-z0-9/_\.\-\~\@\+\=:]!) {
- warn "newsgroup name invalid: `$ngname'\n";
- } elsif ($ng->nntp_usable) {
- # Only valid if msgmap and search works
- $new->{$ngname} = $ng;
- push @list, $ng;
-
+ my $pi_cfg = $sig ? PublicInbox::Config->new : $self->{pi_cfg};
+ my $groups = $pi_cfg->{-by_newsgroup}; # filled during each_inbox
+ my $cache = eval { $pi_cfg->ALL->misc->nntpd_cache_load } // {};
+ $pi_cfg->each_inbox(sub {
+ my ($ibx) = @_;
+ my $ngname = $ibx->{newsgroup} // return;
+ my $ce = $cache->{$ngname};
+ if (($ce and (%$ibx = (%$ibx, %$ce))) || $ibx->nntp_usable) {
+ # only valid if msgmap and over works
# preload to avoid fragmentation:
- $ng->description;
- $ng->base_url;
+ $ibx->description;
+ $ibx->base_url;
+ } else {
+ delete $groups->{$ngname};
+ delete $ibx->{newsgroup};
+ # Note: don't be tempted to delete more for memory
+ # savings just yet: NNTP, IMAP, and WWW may all
+ # run in the same process someday.
}
});
- @list = sort { $a->{newsgroup} cmp $b->{newsgroup} } @list;
- $self->{grouplist} = \@list;
- $self->{pi_config} = $pi_config;
+ @{$self->{groupnames}} = sort(keys %$groups);
# this will destroy old groups that got deleted
- %{$self->{groups}} = %$new;
+ $self->{pi_cfg} = $pi_cfg;
}
sub idler_start {
- $_[0]->{idler} //= PublicInbox::InboxIdle->new($_[0]->{pi_config});
+ $_[0]->{idler} //= PublicInbox::InboxIdle->new($_[0]->{pi_cfg});
}
1;