diff options
Diffstat (limited to 'lib/PublicInbox/LeiConvert.pm')
| -rw-r--r-- | lib/PublicInbox/LeiConvert.pm | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm index 6550c242..4d4fceb2 100644 --- 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,42 +23,48 @@ 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 +sub input_maildir_cb { + my (undef, $kw, $eml, $self) = @_; # $_[0] $filename ignored $self->{wcb}->(undef, { kw => $kw }, $eml); } -sub input_maildir_cb { - my (undef, $kw, $eml, $self) = @_; # $_[0] $filename ignored +sub input_mh_cb { + my ($dn, $bn, $kw, $eml, $self) = @_; $self->{wcb}->(undef, { kw => $kw }, $eml); } sub process_inputs { # via wq_do my ($self) = @_; - local $PublicInbox::DS::in_loop = 0; # force synchronous dwaitpid + local $PublicInbox::DS::in_loop = 0; # force synchronous awaitpid $self->SUPER::process_inputs; my $lei = $self->{lei}; - delete $lei->{1}; - delete $self->{wcb}; # commit - my $nr = delete($lei->{-nr_write}) // 0; - $lei->err("# converted $nr messages") if $lei->{opt}->{verbose}; + my $l2m = delete $lei->{l2m}; + delete $self->{wcb}; # may close connections + $l2m->finish_output($lei) if $l2m; + if (my $v2w = delete $lei->{v2w}) { $v2w->done } # may die + my $nr_w = delete($l2m->{-nr_write}) // 0; + my $d = (delete($l2m->{-nr_seen}) // 0) - $nr_w; + $d = $d ? " ($d duplicates)" : ''; + $lei->qerr("# converted $nr_w messages$d"); } sub lei_convert { # the main "lei convert" method my ($lei, @inputs) = @_; $lei->{opt}->{kw} //= 1; $lei->{opt}->{dedupe} //= 'none'; + $lei->{input_opt}->{sort} = 1; # for LeiToMail conflict check 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); } @@ -66,7 +72,7 @@ sub ipc_atfork_child { my ($self) = @_; my $lei = $self->{lei}; $lei->_lei_atfork_child; - my $l2m = delete $lei->{l2m}; + my $l2m = $lei->{l2m}; if (my $net = $lei->{net}) { # may prompt user once $net->{mics_cached} = $net->imap_common_init($lei); $net->{nn_cached} = $net->nntp_common_init($lei); |