lei convert: use "--output" in failure message

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

diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index 0cc65108c3e3e560f6839369ae5c05f85067b4ba..623599aef883b7cb15b8f63264d23bc157c5da57 100644 (file)
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -7,6 +7,7 @@ use strict;
 use v5.10.1;
 use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
 use PublicInbox::LeiOverview;
+use PublicInbox::DS;
 
 # /^input_/ subs are used by PublicInbox::LeiInput
 
@@ -32,14 +33,15 @@ sub input_maildir_cb {
        $self->{wcb}->(undef, { kw => $kw }, $eml);
 }
 
-sub do_convert { # via wq_do
+sub process_inputs { # via wq_do
        my ($self) = @_;
-       $self->input_stdin;
-       for my $input (@{$self->{inputs}}) {
-               $self->input_path_url($input);
-       }
-       delete $self->{lei}->{1};
+       local $PublicInbox::DS::in_loop = 0; # force synchronous dwaitpid
+       $self->SUPER::process_inputs;
+       my $lei = $self->{lei};
+       delete $lei->{1};
        delete $self->{wcb}; # commit
+       my $nr = delete($lei->{-nr_write}) // 0;
+       $lei->qerr("# converted $nr messages");
 }
 
 sub lei_convert { # the main "lei convert" method
@@ -49,14 +51,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->{opt}->{augment} = 1 unless $ovv->{dst} eq '/dev/stdout';
+               $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 = $lei->workers_start($self, 'lei_convert', 1);
-       $lei->{cnv} = $self;
-       $self->wq_io_do('do_convert', []);
-       $self->wq_close(1);
-       while ($op && $op->{sock}) { $op->event_step }
+       # 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;
+       $lei->wait_wq_events($op_c, $ops);
 }
 
 sub ipc_atfork_child {
@@ -68,7 +72,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);