The number of messages we write to --output is usually different
than the mset count due to deduplication from combining multiple
sources.
This change makes the stderr output of "lei up --all=local" way
more useful IMHO.
return if $dedupe->is_dup($eml, $smsg);
$lse->xsmsg_vmd($smsg) if $lse;
$buf = $eml2mbox->($eml, $smsg);
return if $dedupe->is_dup($eml, $smsg);
$lse->xsmsg_vmd($smsg) if $lse;
$buf = $eml2mbox->($eml, $smsg);
- return atomic_append($lei, $buf) if $atomic_append;
- my $lk = $ovv->lock_for_scope;
- $lei->out($$buf);
+ if ($atomic_append) {
+ atomic_append($lei, $buf);
+ } else {
+ my $lk = $ovv->lock_for_scope;
+ $lei->out($$buf);
+ }
+ ++$lei->{-nr_write};
my $dst = $lei->{ovv}->{dst};
my $lse = $lei->{lse}; # may be undef
sub { # for git_to_mail
my $dst = $lei->{ovv}->{dst};
my $lse = $lei->{lse}; # may be undef
sub { # for git_to_mail
- my ($buf, $smsg, $eml) = @_;
+ my ($bref, $smsg, $eml) = @_;
$dst // return $lei->fail; # dst may be undef-ed in last run
$dst // return $lei->fail; # dst may be undef-ed in last run
- $buf //= \($eml->as_string);
+ return if $dedupe && $dedupe->is_dup($eml //
+ PublicInbox::Eml->new($$bref));
$lse->xsmsg_vmd($smsg) if $lse;
$lse->xsmsg_vmd($smsg) if $lse;
- return _buf2maildir($dst, $buf, $smsg) if !$dedupe;
- $eml //= PublicInbox::Eml->new($$buf); # copy buf
- return if $dedupe->is_dup($eml, $smsg);
- undef $eml;
- _buf2maildir($dst, $buf, $smsg);
+ _buf2maildir($dst, $bref // \($eml->as_string), $smsg);
+ ++$lei->{-nr_write};
sub { # for git_to_mail
my ($bref, $smsg, $eml) = @_;
$mic // return $lei->fail; # mic may be undef-ed in last run
sub { # for git_to_mail
my ($bref, $smsg, $eml) = @_;
$mic // return $lei->fail; # mic may be undef-ed in last run
- if ($dedupe) {
- $eml //= PublicInbox::Eml->new($$bref); # copy bref
- return if $dedupe->is_dup($eml, $smsg);
- }
+ return if $dedupe && $dedupe->is_dup($eml //
+ PublicInbox::Eml->new($$bref));
$lse->xsmsg_vmd($smsg) if $lse;
eval { $imap_append->($mic, $folder, $bref, $smsg, $eml) };
if (my $err = $@) {
undef $mic;
die $err;
}
$lse->xsmsg_vmd($smsg) if $lse;
eval { $imap_append->($mic, $folder, $bref, $smsg, $eml) };
if (my $err = $@) {
undef $mic;
die $err;
}
sub wq_atexit_child {
my ($self) = @_;
delete $self->{wcb};
sub wq_atexit_child {
my ($self) = @_;
delete $self->{wcb};
- $self->{lei}->{ale}->git->async_wait_all;
+ my $lei = $self->{lei};
+ $lei->{ale}->git->async_wait_all;
+ my $nr = delete($lei->{-nr_write}) or return;
+ return if $lei->{early_mua} || !$lei->{-progress} || !$lei->{pkt_op_p};
+ require PublicInbox::PktOp;
+ PublicInbox::PktOp::pkt_do($lei->{pkt_op_p}, 'l2m_progress', $nr);
}
# called in top-level lei-daemon when LeiAuth is done
}
# called in top-level lei-daemon when LeiAuth is done
+sub l2m_progress {
+ my ($lei, $nr) = @_;
+ $lei->{-nr_write} += $nr;
+}
+
sub query_one_mset { # for --threads and l2m w/o sort
my ($self, $ibxish) = @_;
local $0 = "$0 query_one_mset";
sub query_one_mset { # for --threads and l2m w/o sort
my ($self, $ibxish) = @_;
local $0 = "$0 query_one_mset";
}
my $wait = $lei->{sto} ? $lei->{sto}->ipc_do('done') : undef;
$lei->{ovv}->ovv_end($lei);
}
my $wait = $lei->{sto} ? $lei->{sto}->ipc_do('done') : undef;
$lei->{ovv}->ovv_end($lei);
if ($l2m) { # close() calls LeiToMail reap_compress
@out = (" in $lei->{ovv}->{dst}");
if (my $out = delete $lei->{old_1}) {
if ($l2m) { # close() calls LeiToMail reap_compress
@out = (" in $lei->{ovv}->{dst}");
if (my $out = delete $lei->{old_1}) {
$lei->poke_mua;
} else { # mbox users
delete $l2m->{mbl}; # drop dotlock
$lei->poke_mua;
} else { # mbox users
delete $l2m->{mbl}; # drop dotlock
- $lei->{-progress} and
- $lei->err('# ', $lei->{-mset_total} // 0, " matches", @out);
+ if ($lei->{-progress}) {
+ $lei->qerr('# ', $lei->{-mset_total} // 0, " matches", @out);
+ my $nr = $lei->{-nr_write} // 0;
+ $lei->qerr("# $nr written to $lei->{ovv}->{dst}") if $l2m;
+ }
+ $lei->start_mua if $start_mua;
'+' => [ \&incr_post_augment, $lei ],
'' => [ \&query_done, $lei ],
'mset_progress' => [ \&mset_progress, $lei ],
'+' => [ \&incr_post_augment, $lei ],
'' => [ \&query_done, $lei ],
'mset_progress' => [ \&mset_progress, $lei ],
+ 'l2m_progress' => [ \&l2m_progress, $lei ],
'x_it' => [ $lei->can('x_it'), $lei ],
'child_error' => [ $lei->can('child_error'), $lei ],
'incr_start_query' => [ \&incr_start_query, $self, $l2m ],
'x_it' => [ $lei->can('x_it'), $lei ],
'child_error' => [ $lei->can('child_error'), $lei ],
'incr_start_query' => [ \&incr_start_query, $self, $l2m ],