get rid of unnecessary bytes::length usage

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

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 5b5caee76a1908761ae507c0fd00318ea6500ca6..be6e178fe2c3019575afa815ba4faeac3a61c80f 100644 (file)
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -9,7 +9,6 @@ use parent qw(PublicInbox::IPC);
 use PublicInbox::Eml;
 use PublicInbox::ProcessPipe;
 use PublicInbox::Spawn qw(spawn);
-use PublicInbox::PktOp qw(pkt_do);
 use Symbol qw(gensym);
 use IO::Handle; # ->autoflush
 use Fcntl qw(SEEK_SET SEEK_END O_CREAT O_EXCL O_WRONLY);
@@ -199,7 +198,7 @@ sub _mbox_write_cb ($$) {
        my $dedupe = $lei->{dedupe};
        $dedupe->prepare_dedupe;
        my $lse = $lei->{lse}; # may be undef
-       my $set_recent = $dedupe->dedupe_nr;
+       my $set_recent = $dedupe->has_entries;
        sub { # for git_to_mail
                my ($buf, $smsg, $eml) = @_;
                $eml //= PublicInbox::Eml->new($buf);
@@ -294,7 +293,7 @@ sub _maildir_write_cb ($$) {
        # Favor cur/ and only write to new/ when augmenting.  This
        # saves MUAs from having to do a mass rename when the initial
        # search result set is huge.
-       my $dir = $dedupe && $dedupe->dedupe_nr ? 'new/' : 'cur/';
+       my $dir = $dedupe && $dedupe->has_entries ? 'new/' : 'cur/';
        sub { # for git_to_mail
                my ($bref, $smsg, $eml) = @_;
                $dst // return $lei->fail; # dst may be undef-ed in last run
@@ -391,10 +390,16 @@ sub new {
                -e $dst && !-d _ and die
                                "$dst exists and is not a directory\n";
                $lei->{ovv}->{dst} = $dst .= '/' if substr($dst, -1) ne '/';
+               $lei->{opt}->{save} //= \1 if $lei->{cmd} eq 'q';
        } elsif (substr($fmt, 0, 4) eq 'mbox') {
                require PublicInbox::MboxReader;
                $self->can("eml2$fmt") or die "bad mbox format: $fmt\n";
                $self->{base_type} = 'mbox';
+               if ($lei->{cmd} eq 'q' &&
+                               (($lei->path_to_fd($dst) // -1) < 0) &&
+                               (-f $dst || !-e _)) {
+                       $lei->{opt}->{save} //= \1;
+               }
        } elsif ($fmt =~ /\Aimaps?\z/) {
                require PublicInbox::NetWriter;
                require PublicInbox::URIimap;
@@ -409,6 +414,7 @@ sub new {
                $dst = $lei->{ovv}->{dst} = $$uri; # canonicalized
                $lei->{net} = $net;
                $self->{base_type} = 'imap';
+               $lei->{opt}->{save} //= \1 if $lei->{cmd} eq 'q';
        } elsif ($fmt eq 'text') {
                require PublicInbox::LeiViewText;
                $lei->{lvt} = PublicInbox::LeiViewText->new($lei);
@@ -455,9 +461,17 @@ sub _pre_augment_maildir {
        open $self->{poke_dh}, '<', "${dst}cur" or die "open ${dst}cur: $!";
 }
 
+sub clobber_dst_prepare ($;$) {
+       my ($lei, $f) = @_;
+       my $wait = (defined($f) && $lei->{sto}) ?
+                       $lei->{sto}->ipc_do('lms_forget_folders', $f) : undef;
+       my $dedupe = $lei->{dedupe} or return;
+       $dedupe->reset_dedupe if $dedupe->can('reset_dedupe');
+}
+
 sub _do_augment_maildir {
        my ($self, $lei) = @_;
-       return if ($lei->{opt}->{save} // 0) < 0;
+       return if $lei->{cmd} eq 'up';
        my $dst = $lei->{ovv}->{dst};
        my $lse = $lei->{opt}->{'import-before'} ? $lei->{lse} : undef;
        my $mdr = PublicInbox::MdirReader->new;
@@ -469,9 +483,11 @@ sub _do_augment_maildir {
                        $dedupe->pause_dedupe;
                }
        } elsif ($lse) {
+               clobber_dst_prepare($lei, "maildir:$dst");
                $mdr->{shard_info} = $self->{shard_info};
                $mdr->maildir_each_eml($dst, \&_md_update, $lei, $lse, 1);
        } else {# clobber existing Maildir
+               clobber_dst_prepare($lei, "maildir:$dst");
                $mdr->maildir_each_file($dst, \&_unlink);
        }
 }
@@ -488,7 +504,7 @@ sub _imap_augment_or_delete { # PublicInbox::NetReader::imap_each cb
 
 sub _do_augment_imap {
        my ($self, $lei) = @_;
-       return if ($lei->{opt}->{save} // 0) < 0;
+       return if $lei->{cmd} eq 'up';
        my $net = $lei->{net};
        my $lse = $lei->{opt}->{'import-before'} ? $lei->{lse} : undef;
        if ($lei->{opt}->{augment}) {
@@ -500,11 +516,13 @@ sub _do_augment_imap {
                }
        } elsif ($lse) {
                my $delete_mic;
+               clobber_dst_prepare($lei, "$self->{uri}");
                $net->imap_each($self->{uri}, \&_imap_augment_or_delete,
                                        $lei, $lse, \$delete_mic);
                $delete_mic->expunge if $delete_mic;
        } elsif (!$self->{-wq_worker_nr}) { # undef or 0
                # clobber existing IMAP folder
+               clobber_dst_prepare($lei, "$self->{uri}");
                $net->imap_delete_all($self->{uri});
        }
 }
@@ -564,6 +582,8 @@ sub _pre_augment_mbox {
                        if $imp_before && !ref($imp_before);
                die "--augment specified but $dst is not seekable\n" if
                        $lei->{opt}->{augment};
+               die "cannot --save with unseekable $dst\n" if
+                       $lei->{dedupe} && $lei->{dedupe}->can('reset_dedupe');
        }
        if ($self->{zsfx} = PublicInbox::MboxReader::zsfx($dst)) {
                pipe(my ($r, $w)) or die "pipe: $!";
@@ -582,10 +602,10 @@ sub _do_augment_mbox {
        my ($self, $lei) = @_;
        return unless $self->{seekable};
        my $opt = $lei->{opt};
-       return if ($opt->{save} // 0) < 0;
+       return if $lei->{cmd} eq 'up';
        my $out = $lei->{1};
        my ($fmt, $dst) = @{$lei->{ovv}}{qw(fmt dst)};
-       return unless -s $out;
+       return clobber_dst_prepare($lei) unless -s $out;
        unless ($opt->{augment} || $opt->{'import-before'}) {
                truncate($out, 0) or die "truncate($dst): $!";
                return;
@@ -600,6 +620,8 @@ sub _do_augment_mbox {
        if ($opt->{augment}) {
                $dedupe = $lei->{dedupe};
                $dedupe->prepare_dedupe if $dedupe;
+       } else {
+               clobber_dst_prepare($lei);
        }
        if ($opt->{'import-before'}) { # the default
                my $lse = $lei->{lse};
@@ -679,7 +701,7 @@ sub do_post_auth {
        my ($self) = @_;
        my $lei = $self->{lei};
        # lei_xsearch can start as soon as all l2m workers get here
-       pkt_do($lei->{pkt_op_p}, 'incr_start_query') or
+       $lei->{pkt_op_p}->pkt_do('incr_start_query') or
                die "incr_start_query: $!";
        my $aug;
        if (lock_free($self)) { # all workers do_augment
@@ -698,7 +720,7 @@ sub do_post_auth {
                local $0 = 'do_augment';
                eval { do_augment($self, $lei) };
                $lei->fail($@) if $@;
-               pkt_do($lei->{pkt_op_p}, $aug) == 1 or
+               $lei->{pkt_op_p}->pkt_do($aug) == 1 or
                                die "do_post_augment trigger: $!";
        }
        # done augmenting, connect the compressor pipe for each worker
@@ -758,8 +780,7 @@ sub wq_atexit_child {
        $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);
+       $lei->{pkt_op_p}->pkt_do('l2m_progress', $nr);
 }
 
 # called in top-level lei-daemon when LeiAuth is done