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 da3a95d20d2e1869124f77d1e4b0f14b17d28ec6..f3c039699cc26bdd5c539fe6b3acc8ed5a4c70d7 100644 (file)
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -243,10 +243,14 @@ sub _rand () {
        sprintf('%x,%x,%x,%x', rand(0xffffffff), time, $$, ++$seq);
 }
 
+sub kw2suffix ($;@) {
+       my $kw = shift;
+       join('', sort(map { $kw2char{$_} // () } @$kw, @_));
+}
+
 sub _buf2maildir {
        my ($dst, $buf, $smsg) = @_;
        my $kw = $smsg->{kw} // [];
-       my $sfx = join('', sort(map { $kw2char{$_} // () } @$kw));
        my $rand = ''; # chosen by die roll :P
        my ($tmp, $fh, $base, $ok);
        my $common = $smsg->{blob} // _rand;
@@ -263,7 +267,7 @@ sub _buf2maildir {
                $dst .= 'cur/';
                $rand = '';
                do {
-                       $base = $rand.$common.':2,'.$sfx
+                       $base = $rand.$common.':2,'.kw2suffix($kw);
                } while (!($ok = link($tmp, $dst.$base)) && $!{EEXIST} &&
                        ($rand = _rand.','));
                die "link($tmp, $dst$base): $!" unless $ok;
@@ -303,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
@@ -323,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};
        }
 }
@@ -448,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);
        }
@@ -650,7 +655,9 @@ sub ipc_atfork_child {
        my ($self) = @_;
        my $lei = $self->{lei};
        $lei->_lei_atfork_child;
-       $self->{-lms_ro} = $lei->{lse}->lms if $lei->{lse};
+       if (my $lse = $lei->{lse}) {
+               $self->{-lms_ro} = $lse->{-lms_ro} //= $lse->lms;
+       }
        $lei->{auth}->do_auth_atfork($self) if $lei->{auth};
        $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb();
        $self->SUPER::ipc_atfork_child;