X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTPD.pm;h=6e79f0be697fc909ac49ad301b54a4447eebfdc6;hp=5e287857232093a1257c84e24710facbe5472b9a;hb=9b0c238f887475d920a8589b492ec15c63770152;hpb=bdef958bdccc4b1d11cd8408a5c29167b5385dc0

diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 5e287857..6e79f0be 100644
--- a/lib/PublicInbox/NNTPD.pm
+++ b/lib/PublicInbox/NNTPD.pm
@@ -1,19 +1,20 @@
-# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # 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::NNTPdeflate; # loads 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,7 +25,7 @@ sub new {
 		groups => {},
 		err => \*STDERR,
 		out => \*STDOUT,
-		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 => ... }
@@ -34,38 +35,33 @@ sub new {
 
 sub refresh_groups {
 	my ($self, $sig) = @_;
-	my $pi_config = $sig ? PublicInbox::Config->new : $self->{pi_config};
-	my $groups = $pi_config->{-by_newsgroup}; # filled during each_inbox
-	$pi_config->each_inbox(sub {
+	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} 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";
-			delete $groups->{$ngname};
-		} elsif ($ibx->nntp_usable) {
-			# Only valid if msgmap and search works
-
+		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:
 			$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.
 		}
 	});
-	$self->{groupnames} = [ sort(keys %$groups) ];
+	@{$self->{groupnames}} = sort(keys %$groups);
 	# this will destroy old groups that got deleted
-	$self->{pi_config} = $pi_config;
+	$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;