X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInbox.pm;h=cb98d2ad5e29cbc017ddf65df293e9bbe1546d9f;hb=refs%2Fheads%2Fmaster;hp=b7b71268187e86ce8f6f583e5391d645da8fb7f5;hpb=48cfcb04ed337f96e5105a2f93d127d2d6692c5a;p=public-inbox.git

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index b7b71268..cb98d2ad 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 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 a public-inbox (which may have multiple mailing addresses)
@@ -28,7 +28,7 @@ sub do_cleanup {
 		check_inodes($ibx);
 	} else {
 		delete(@$ibx{qw(over mm description cloneurl
-				-imap_url -nntp_url)});
+				-imap_url -nntp_url -pop3_url)});
 	}
 	my $srch = $ibx->{search} // $ibx;
 	delete @$srch{qw(xdb qp)};
@@ -48,7 +48,7 @@ sub _cleanup_later ($) {
 sub _set_limiter ($$$) {
 	my ($self, $pi_cfg, $pfx) = @_;
 	my $lkey = "-${pfx}_limiter";
-	$self->{$lkey} ||= do {
+	$self->{$lkey} //= do {
 		# full key is: publicinbox.$NAME.httpbackendmax
 		my $mkey = $pfx.'max';
 		my $val = $self->{$mkey} or return;
@@ -181,33 +181,18 @@ sub over {
 	} // ($req ? croak("E: $@") : undef);
 }
 
-sub try_cat {
-	my ($path) = @_;
-	open(my $fh, '<', $path) or return '';
-	local $/;
-	<$fh> // '';
-}
-
-sub cat_desc ($) {
-	my $desc = try_cat($_[0]);
-	local $/ = "\n";
-	chomp $desc;
-	utf8::decode($desc);
-	$desc =~ s/\s+/ /smg;
-	$desc eq '' ? undef : $desc;
-}
-
 sub description {
 	my ($self) = @_;
-	($self->{description} //= cat_desc("$self->{inboxdir}/description")) //
+	($self->{description} //=
+		PublicInbox::Git::cat_desc("$self->{inboxdir}/description")) //
 		'($INBOX_DIR/description missing)';
 }
 
 sub cloneurl {
 	my ($self) = @_;
 	$self->{cloneurl} // do {
-		my $s = try_cat("$self->{inboxdir}/cloneurl");
-		my @urls = split(/\s+/s, $s);
+		my @urls = split(/\s+/s,
+		  PublicInbox::Git::try_cat("$self->{inboxdir}/cloneurl"));
 		scalar(@urls) ? ($self->{cloneurl} = \@urls) : undef;
 	} // [];
 }
@@ -220,7 +205,8 @@ sub base_url {
 		$url .= '/' if $url !~ m!/\z!;
 		return $url .= $self->{name} . '/';
 	}
-	# called from a non-PSGI environment (e.g. NNTP/POP3):
+	# called from a non-PSGI environment or cross-inbox environment
+	# where multiple inboxes can have different domains
 	my $url = $self->{url} // return undef;
 	$url = $url->[0] // return undef;
 	# expand protocol-relative URLs to HTTPS if we're
@@ -230,8 +216,9 @@ sub base_url {
 	$url;
 }
 
+# imapserver, nntpserver configs are used here:
 sub _x_url ($$$) {
-	my ($self, $x, $ctx) = @_; # $x is "nntp" or "imap"
+	my ($self, $x, $ctx) = @_; # $x is "imap" or "nntp"
 	# no checking for nntp_usable here, we can point entirely
 	# to non-local servers or users run by a different user
 	my $ns = $self->{"${x}server"} //
@@ -253,7 +240,7 @@ sub _x_url ($$$) {
 				if ($group) {
 					$u .= '/' if $u !~ m!/\z!;
 					$u .= $group;
-				} else { # n.b. IMAP uses "newsgroup"
+				} else { # n.b. IMAP and POP3 use "newsgroup"
 					warn <<EOM;
 publicinbox.$self->{name}.${x}mirror=$_ missing newsgroup name
 EOM
@@ -273,8 +260,31 @@ EOM
 }
 
 # my ($self, $ctx) = @_;
-sub nntp_url { $_[0]->{-nntp_url} //= _x_url($_[0], 'nntp', $_[1]) }
 sub imap_url { $_[0]->{-imap_url} //= _x_url($_[0], 'imap', $_[1]) }
+sub nntp_url { $_[0]->{-nntp_url} //= _x_url($_[0], 'nntp', $_[1]) }
+
+sub pop3_url {
+	my ($self, $ctx) = @_;
+	$self->{-pop3_url} //= do {
+		my $ps = $self->{'pop3server'} //
+		       $ctx->{www}->{pi_cfg}->get_all('publicinbox.pop3server');
+		my $group = $self->{newsgroup};
+		my @urls;
+		($ps && $group) and
+			@urls = map { m!\Apop3?s?://! ? $_ : "pop3://$_" } @$ps;
+		if (my $mi = $self->{'pop3mirror'}) {
+			my @m = map { m!\Apop3?s?://! ? $_ : "pop3://$_" } @$mi;
+			my %seen; # List::Util::uniq requires Perl 5.26+
+			@urls = grep { !$seen{$_}++ } (@urls, @m);
+		}
+		my $n = 0;
+		for (@urls) { $n += s!/+\z!! }
+		warn <<EOM if $n;
+W: pop3server and/or pop3mirror URLs should not end with trailing slash `/'
+EOM
+		\@urls;
+	}
+}
 
 sub nntp_usable {
 	my ($self) = @_;
@@ -327,11 +337,6 @@ sub msg_by_mid ($$) {
 	$smsg ? msg_by_smsg($self, $smsg) : msg_by_path($self, mid2path($mid));
 }
 
-sub recent {
-	my ($self, $opts, $after, $before) = @_;
-	$self->over->recent($opts, $after, $before);
-}
-
 sub modified {
 	my ($self) = @_;
 	if (my $over = $self->over) {
@@ -385,6 +390,16 @@ sub uidvalidity { $_[0]->{uidvalidity} //= eval { $_[0]->mm->created_at } }
 
 sub eidx_key { $_[0]->{newsgroup} // $_[0]->{inboxdir} }
 
+# only used by NNTP, so we need ->mm anyways
+sub art_min { $_[0]->{-art_min} //= eval { $_[0]->mm(1)->min } }
+
+# used by IMAP, too, which tries to avoid ->mm (but ->{mm} is likely
+# faster since it's smaller iff available)
+sub art_max {
+	$_[0]->{-art_max} //= eval { $_[0]->{mm}->max } //
+				eval { $_[0]->over(1)->max };
+}
+
 sub mailboxid { # rfc 8474, 8620, 8621
 	my ($self, $imap_slice) = @_;
 	my $pfx = defined($imap_slice) ? $self->{newsgroup} : $self->{name};
@@ -397,4 +412,6 @@ sub mailboxid { # rfc 8474, 8620, 8621
 		sprintf('-%x', uidvalidity($self) // 0)
 }
 
+sub thing_type { 'public inbox' }
+
 1;