lei export-kw: support exporting keywords to IMAP

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

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 96a1f8815dd3eb8c9f0a45e1701d9c33a8c7b124..f3c039699cc26bdd5c539fe6b3acc8ed5a4c70d7 100644 (file)
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -307,11 +307,12 @@ sub _imap_write_cb ($$) {
        my $dedupe = $lei->{dedupe};
        $dedupe->prepare_dedupe if $dedupe;
        my $append = $lei->{net}->can('imap_append');
-       my $mic = $lei->{net}->mic_get($self->{uri});
-       my $folder = $self->{uri}->mailbox;
+       my $uri = $self->{uri};
+       my $mic = $lei->{net}->mic_get($uri);
+       my $folder = $uri->mailbox;
+       $uri->uidvalidity($mic->uidvalidity($folder));
        my $lse = $lei->{lse}; # may be undef
        my $sto = $lei->{opt}->{'mail-sync'} ? $lei->{sto} : undef;
-       my $out = $lei->{ovv}->{dst};
        sub { # for git_to_mail
                my ($bref, $smsg, $eml) = @_;
                $mic // return $lei->fail; # mic may be undef-ed in last run
@@ -327,7 +328,7 @@ sub _imap_write_cb ($$) {
                # imap_append returns UID if IMAP server has UIDPLUS extension
                ($sto && $uid =~ /\A[0-9]+\z/) and
                        $sto->ipc_do('set_sync_info',
-                                       $smsg->{blob}, $out, $uid + 0);
+                                       $smsg->{blob}, $$uri, $uid + 0);
                ++$lei->{-nr_write};
        }
 }
@@ -452,10 +453,10 @@ sub _do_augment_maildir {
 }
 
 sub _imap_augment_or_delete { # PublicInbox::NetReader::imap_each cb
-       my ($url, $uid, $kw, $eml, $lei, $lse, $delete_mic) = @_;
+       my ($uri, $uid, $kw, $eml, $lei, $lse, $delete_mic) = @_;
        update_kw_maybe($lei, $lse, $eml, $kw);
        if ($delete_mic) {
-               $lei->{net}->imap_delete_1($url, $uid, $delete_mic);
+               $lei->{net}->imap_delete_1($uri, $uid, $delete_mic);
        } else {
                _augment($eml, $lei);
        }