lei <q|up>: distinguish between mset and l2m counts

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

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index fa3af71038dc1c7a222d68d38db4be7d1d6b9cd6..a546ab421eeb7c72282f1e72de3a811fbad1f2ed 100644 (file)
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -196,9 +196,13 @@ sub _mbox_write_cb ($$) {
                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};
        }
 }
 
@@ -273,15 +277,13 @@ sub _maildir_write_cb ($$) {
        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
-               $buf //= \($eml->as_string);
+               return if $dedupe && $dedupe->is_dup($eml //
+                                               PublicInbox::Eml->new($$bref));
                $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};
        }
 }
 
@@ -296,16 +298,15 @@ sub _imap_write_cb ($$) {
        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;
                }
+               ++$lei->{-nr_write};
        }
 }
 
@@ -351,14 +352,14 @@ sub new {
                require PublicInbox::MboxReader;
                $self->can("eml2$fmt") or die "bad mbox format: $fmt\n";
                $self->{base_type} = 'mbox';
-       } elsif ($fmt =~ /\Aimaps?\z/) { # TODO .onion support
+       } elsif ($fmt =~ /\Aimaps?\z/) {
                require PublicInbox::NetWriter;
                require PublicInbox::URIimap;
                my $net = PublicInbox::NetWriter->new;
                $net->{quiet} = $lei->{opt}->{quiet};
                my $uri = PublicInbox::URIimap->new($dst)->canonical;
                $net->add_url($uri);
-               my $err = $net->errors;
+               my $err = $net->errors($lei);
                return $lei->fail($err) if $err;
                $uri->mailbox or return $lei->fail("No mailbox: $dst");
                $self->{uri} = $uri;
@@ -659,7 +660,12 @@ sub write_mail { # via ->wq_io_do
 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