imap+nntp: share COMPRESS implementation

[public-inbox.git] / lib / PublicInbox / Inbox.pm

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 724df50a7134725601cd1c2ce83d9a9f41805c77..da81fb67ad22efa8248c208a2d65629512153bbe 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -1,9 +1,10 @@
-# 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)
 package PublicInbox::Inbox;
 use strict;
+use v5.10.1;
 use PublicInbox::Git;
 use PublicInbox::MID qw(mid2path);
 use PublicInbox::Eml;
@@ -11,8 +12,6 @@ use List::Util qw(max);
 use Carp qw(croak);
 
 # returns true if further checking is required
-sub cleanup_shards { $_[0]->{search} ? $_[0]->{search}->cleanup_shards : undef }
-
 sub check_inodes ($) {
        for (qw(over mm)) { $_[0]->{$_}->check_inodes if $_[0]->{$_} }
 }
@@ -31,7 +30,8 @@ sub do_cleanup {
                delete(@$ibx{qw(over mm description cloneurl
                                -imap_url -nntp_url)});
        }
-       $ibx->cleanup_shards and $live = 1;
+       my $srch = $ibx->{search} // $ibx;
+       delete @$srch{qw(xdb qp)};
        for my $git (@{$ibx->{-repo_objs} // []}) {
                $live = 1 if $git->cleanup(1);
        }
@@ -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;
@@ -138,17 +138,18 @@ sub max_git_epoch {
        $cur;
 }
 
+sub mm_file {
+       my ($self) = @_;
+       my $d = $self->{inboxdir};
+       ($self->version >= 2 ? $d : "$d/public-inbox").'/msgmap.sqlite3';
+}
+
 sub mm {
        my ($self, $req) = @_;
        $self->{mm} //= eval {
                require PublicInbox::Msgmap;
                _cleanup_later($self);
-               my $dir = $self->{inboxdir};
-               if ($self->version >= 2) {
-                       PublicInbox::Msgmap->new_file("$dir/msgmap.sqlite3");
-               } else {
-                       PublicInbox::Msgmap->new($dir);
-               }
+               PublicInbox::Msgmap->new_file($self);
        } // ($req ? croak("E: $@") : undef);
 }
 
@@ -229,8 +230,9 @@ sub base_url {
        $url;
 }
 
+# imapserver, nntpserver, and pop3server configs are used here:
 sub _x_url ($$$) {
-       my ($self, $x, $ctx) = @_; # $x is "nntp" or "imap"
+       my ($self, $x, $ctx) = @_; # $x is "imap", "nntp", or "pop3"
        # 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"} //
@@ -252,7 +254,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
@@ -272,8 +274,9 @@ 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 { $_[0]->{-pop3_url} //= _x_url($_[0], 'pop3', $_[1]) }
 
 sub nntp_usable {
        my ($self) = @_;
@@ -293,17 +296,15 @@ sub msg_by_smsg ($$) {
 
        # ghosts may have undef smsg (from SearchThread.node) or
        # no {blob} field
-       return unless defined $smsg;
-       defined(my $blob = $smsg->{blob}) or return;
-
-       $self->git->cat_file($blob);
+       $smsg // return;
+       $self->git->cat_file($smsg->{blob} // return);
 }
 
 sub smsg_eml {
        my ($self, $smsg) = @_;
        my $bref = msg_by_smsg($self, $smsg) or return;
        my $eml = PublicInbox::Eml->new($bref);
-       $smsg->populate($eml) unless exists($smsg->{num}); # v1 w/o SQLite
+       $smsg->{num} // $smsg->populate($eml);
        $eml;
 }
 
@@ -313,7 +314,7 @@ sub smsg_by_mid ($$) {
        my $smsg;
        if (my $mm = $self->mm) {
                # favor the Message-ID we used for the NNTP article number:
-               defined(my $num = $mm->num_for($mid)) or return;
+               my $num = $mm->num_for($mid) // return;
                $smsg = $over->get_art($num);
        } else {
                my ($id, $prev);