imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/ExtSearch.pm b/lib/PublicInbox/ExtSearch.pm
index a2b97798bae9da6298ecc6da6b443092b582f0bc..2460d74f5bdbda074be7cdea059c4025993b43ab 100644 (file)
--- a/lib/PublicInbox/ExtSearch.pm
+++ b/lib/PublicInbox/ExtSearch.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Read-only external (detached) index for cross inbox search.
@@ -16,12 +16,13 @@ use DBI qw(:sql_types); # SQL_BLOB
 use parent qw(PublicInbox::Search);
 
 sub new {
-       my (undef, $topdir) = @_;
+       my ($class, $topdir) = @_;
        bless {
                topdir => $topdir,
+               -primary_address => 'unknown@example.com',
                # xpfx => 'ei15'
                xpfx => "$topdir/ei".PublicInbox::Search::SCHEMA_VERSION
-       }, __PACKAGE__;
+       }, $class;
 }
 
 sub misc {
@@ -29,23 +30,21 @@ sub misc {
        $self->{misc} //= PublicInbox::MiscSearch->new("$self->{xpfx}/misc");
 }
 
-sub search { $_[0] } # self
-
-# overrides PublicInbox::Search::_xdb
-sub _xdb {
-       my ($self) = @_;
-       $self->xdb_sharded;
-}
-
 # same as per-inbox ->over, for now...
 sub over {
        my ($self) = @_;
-       $self->{over} //= PublicInbox::Over->new("$self->{xpfx}/over.sqlite3");
+       $self->{over} //= do {
+               PublicInbox::Inbox::_cleanup_later($self);
+               PublicInbox::Over->new("$self->{xpfx}/over.sqlite3");
+       };
 }
 
 sub git {
        my ($self) = @_;
-       $self->{git} //= PublicInbox::Git->new("$self->{topdir}/ALL.git");
+       $self->{git} //= do {
+               PublicInbox::Inbox::_cleanup_later($self);
+               PublicInbox::Git->new("$self->{topdir}/ALL.git");
+       };
 }
 
 # returns a hashref of { $NEWSGROUP_NAME => $ART_NO } using the `xref3' table
@@ -65,7 +64,7 @@ SELECT ibx_id FROM inboxes WHERE eidx_key = ? LIMIT 1
        $sth = $dbh->prepare_cached(<<'', undef, 1);
 SELECT docid FROM xref3 WHERE oidbin = ? AND xnum = ? AND ibx_id = ? LIMIT 1
 
-       $sth->bind_param(1, pack('H*', $xsmsg->{blob}), SQL_BLOB);
+       $sth->bind_param(1, $xsmsg->oidbin, SQL_BLOB);
 
        # NNTP::cmd_over can set {num} to zero according to RFC 3977 8.3.2
        $sth->bind_param(2, $xsmsg->{num} || $xsmsg->{-orig_num});
@@ -113,12 +112,13 @@ sub description {
                '$EXTINDEX_DIR/description missing';
 }
 
-sub cloneurl { [] } # TODO
-
-sub base_url { 'https://example.com/TODO/' }
-sub nntp_url { [] }
+sub search {
+       PublicInbox::Inbox::_cleanup_later($_[0]);
+       $_[0];
+}
 
 no warnings 'once';
+*base_url = \&PublicInbox::Inbox::base_url;
 *smsg_eml = \&PublicInbox::Inbox::smsg_eml;
 *smsg_by_mid = \&PublicInbox::Inbox::smsg_by_mid;
 *msg_by_mid = \&PublicInbox::Inbox::msg_by_mid;
@@ -126,6 +126,6 @@ no warnings 'once';
 *recent = \&PublicInbox::Inbox::recent;
 
 *max_git_epoch = *nntp_usable = *msg_by_path = \&mm; # undef
-*isrch = *search;
+*isrch = \&search;
 
 1;