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

diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 50d022be..4401a29b 100644
--- a/lib/PublicInbox/NNTPD.pm
+++ b/lib/PublicInbox/NNTPD.pm
@@ -1,47 +1,64 @@
-# Copyright (C) 2016 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;
-require PublicInbox::Config;
+use v5.10.1;
+use Sys::Hostname;
+use PublicInbox::Config;
+use PublicInbox::InboxIdle;
+use PublicInbox::NNTP;
 
 sub new {
 	my ($class) = @_;
 	bless {
-		groups => {},
 		err => \*STDERR,
 		out => \*STDOUT,
-		grouplist => [],
+		# pi_cfg => $pi_cfg,
+		# ssl_ctx_opt => { SSL_cert_file => ..., SSL_key_file => ... }
+		# idler => PublicInbox::InboxIdle
 	}, $class;
 }
 
-sub refresh_groups () {
-	my ($self) = @_;
-	my $pi_config = PublicInbox::Config->new;
-	my $new = {};
-	my @list;
-	foreach my $k (keys %$pi_config) {
-		$k =~ /\Apublicinbox\.([^\.]+)\.mainrepo\z/ or next;
-		my $name = $1;
-		my $git_dir = $pi_config->{$k};
-		my $ngname = $pi_config->{"publicinbox.$name.newsgroup"};
-		next unless defined $ngname;
-		next if ($ngname eq ''); # disabled
-		my $ng = $pi_config->lookup_newsgroup($ngname) or next;
-
-		# Only valid if msgmap and search works
-		if ($ng->nntp_usable) {
-			$new->{$ngname} = $ng;
-			push @list, $ng;
-		}
+sub refresh_groups {
+	my ($self, $sig) = @_;
+	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";
 	}
-	@list =	sort { $a->{newsgroup} cmp $b->{newsgroup} } @list;
-	$self->{grouplist} = \@list;
+	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:
+			$ibx->description;
+		} 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.
+		}
+	});
+	@{$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_cfg});
 }
 
 1;