X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTPD.pm;h=4401a29b963fed06abcb670a93a8cc16f55defc9;hb=HEAD;hp=4de1944b27206c36e7afc6bce44353de532843ea;hpb=7b20e5135238a2780ac3df3198a02e9fbda4ba18;p=public-inbox.git

diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 4de1944b..4401a29b 100644
--- a/lib/PublicInbox/NNTPD.pm
+++ b/lib/PublicInbox/NNTPD.pm
@@ -1,75 +1,64 @@
-# 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::NNTP;
 
 sub new {
 	my ($class) = @_;
-	my $pi_config = PublicInbox::Config->new;
-	my $name = $pi_config->{'publicinbox.nntpserver'};
-	if (!defined($name) or $name eq '') {
-		$name = hostname;
-	} elsif (ref($name) eq 'ARRAY') {
-		$name = $name->[0];
-	}
-
 	bless {
-		groups => {},
 		err => \*STDERR,
 		out => \*STDOUT,
-		grouplist => [],
-		pi_config => $pi_config,
-		servername => $name,
-		greet => \"201 $name ready - post via email\r\n",
-		# accept_tls => { SSL_server => 1, ..., SSL_reuse_ctx => ... }
+		# pi_cfg => $pi_cfg,
+		# ssl_ctx_opt => { SSL_cert_file => ..., SSL_key_file => ... }
 		# idler => PublicInbox::InboxIdle
 	}, $class;
 }
 
 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 = PublicInbox::Config->new;
+	my $name = $pi_cfg->{'publicinbox.nntpserver'};
+	if (!defined($name) or $name eq '') {
+		$name = hostname;
+	} elsif (ref($name) eq 'ARRAY') {
+		$name = $name->[0];
+	}
+	if ($name ne ($self->{servername} // '')) {
+		$self->{servername} = $name;
+		$self->{greet} = \"201 $name ready - post via email\r\n";
+	}
+	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};
+			# 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.
 		}
 	});
-	my @names = sort(keys %$groups);
-	$self->{grouplist} = [ map { $groups->{$_} } @names ];
-	$self->{groupnames} = \@names;
-	$self->{pi_config} = $pi_config;
+	@{$self->{groupnames}} = sort(keys %$groups);
 	# this will destroy old groups that got deleted
-	$self->{groups} = $groups;
+	$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;