lei convert: remove redundant input_net_cb

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

diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index 6550c242b1a2514ced857e2d956bfa0a8fdc0ad5..906f3026834481f8c98cd03e2a62f6ffede6c3e3 100644 (file)
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -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);
@@ -41,7 +36,7 @@ sub process_inputs { # via wq_do
        delete $lei->{1};
        delete $self->{wcb}; # commit
        my $nr = delete($lei->{-nr_write}) // 0;
-       $lei->err("# converted $nr messages") if $lei->{opt}->{verbose};
+       $lei->qerr("# converted $nr messages");
 }
 
 sub lei_convert { # the main "lei convert" method
@@ -51,14 +46,15 @@ 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;
+       # 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);
+       $self->wq_close;
        $lei->wait_wq_events($op_c, $ops);
 }