imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index 0c3241694f70d525fe7300a7eddced06c77012f6..59af40dea1b11a64ca8e074412c978ab1e98020d 100644 (file)
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 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>
 
 # front-end for the "lei convert" sub-command
@@ -23,11 +23,6 @@ sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh
        $self->{wcb}->(undef, {}, $eml);
 }
 
-sub input_net_cb { # callback for ->imap_each, ->nntp_each
-       my (undef, undef, $kw, $eml, $self) = @_; # @_[0,1]: url + uid ignored
-       $self->{wcb}->(undef, { kw => $kw }, $eml);
-}
-
 sub input_maildir_cb {
        my (undef, $kw, $eml, $self) = @_; # $_[0] $filename ignored
        $self->{wcb}->(undef, { kw => $kw }, $eml);
@@ -37,8 +32,13 @@ sub process_inputs { # via wq_do
        my ($self) = @_;
        local $PublicInbox::DS::in_loop = 0; # force synchronous dwaitpid
        $self->SUPER::process_inputs;
-       delete $self->{lei}->{1};
+       my $lei = $self->{lei};
+       delete $lei->{1};
        delete $self->{wcb}; # commit
+       my $nr_w = delete($lei->{-nr_write}) // 0;
+       my $d = (delete($lei->{-nr_seen}) // 0) - $nr_w;
+       $d = $d ? " ($d duplicates)" : '';
+       $lei->qerr("# converted $nr_w messages$d");
 }
 
 sub lei_convert { # the main "lei convert" method
@@ -48,15 +48,16 @@ sub lei_convert { # the main "lei convert" method
        my $self = bless {}, __PACKAGE__;
        my $ovv = PublicInbox::LeiOverview->new($lei, 'out-format');
        $lei->{l2m} or return
-               $lei->fail("output not specified or is not a mail destination");
+               $lei->fail('--output unspecified or is not a mail destination');
        my $devfd = $lei->path_to_fd($ovv->{dst}) // return;
        $lei->{opt}->{augment} = 1 if $devfd < 0;
        $self->prepare_inputs($lei, \@inputs) or return;
-       my ($op_c, $ops) = $lei->workers_start($self, 'lei-convert', 1);
-       $lei->{cnv} = $self;
+       # n.b. {net} {auth} is handled by l2m worker
+       my ($op_c, $ops) = $lei->workers_start($self, 1);
+       $lei->{wq1} = $self;
        $self->wq_io_do('process_inputs', []);
-       $self->wq_close(1);
-       $op_c->op_wait_event($ops);
+       $self->wq_close;
+       $lei->wait_wq_events($op_c, $ops);
 }
 
 sub ipc_atfork_child {
@@ -68,7 +69,6 @@ sub ipc_atfork_child {
                $net->{mics_cached} = $net->imap_common_init($lei);
                $net->{nn_cached} = $net->nntp_common_init($lei);
        }
-       $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb();
        $l2m->pre_augment($lei);
        $l2m->do_augment($lei);
        $l2m->post_augment($lei);