X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiConvert.pm;h=59af40dea1b11a64ca8e074412c978ab1e98020d;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=da3b50ccfefd0a4ffbcec9307e113ddb4c4d31f2;hpb=64233e6d87994bdda47bfaaf154d55ad8d7802c2;p=public-inbox.git
diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index da3b50cc..59af40de 100644
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
# front-end for the "lei convert" sub-command
@@ -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
@@ -22,23 +23,22 @@ 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);
}
-sub do_convert { # via wq_do
+sub process_inputs { # via wq_do
my ($self) = @_;
- 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_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;
- $self->wq_io_do('do_convert', []);
- $self->wq_close(1);
- $op_c->op_wait_event($ops);
+ # 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 +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);