about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-05-31 10:20:06 +0000
committerEric Wong <e@80x24.org>2021-06-01 17:03:04 +0000
commit693247be6380c4f278ebc0c4f17c1ac995a831d3 (patch)
tree6e6b0d64bc7363805125af530f937c9e8c4a295c
parent525d14996e820e7bf2b5e035cf5826b6530f6d92 (diff)
downloadpublic-inbox-693247be6380c4f278ebc0c4f17c1ac995a831d3.tar.gz
We don't need to write VMD changes to lei/store if local
keywords are unchanged.
-rw-r--r--lib/PublicInbox/LeiImport.pm1
-rw-r--r--lib/PublicInbox/LeiSearch.pm8
-rw-r--r--lib/PublicInbox/NetReader.pm2
3 files changed, 7 insertions, 4 deletions
diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index f9a46ec5..860a2c98 100644
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -50,6 +50,7 @@ sub input_net_cb { # imap_each / nntp_each
         } elsif ($vmd) { # old message, kw only
                 my $oid = $self->{-lms_ro}->imap_oid2($uri, $uid) // return;
                 my @docids = $self->{lse}->over->blob_exists($oid) or return;
+                $self->{lse}->kw_changed(undef, $kw, \@docids) or return;
                 my $lei = $self->{lei};
                 $lei->qerr("# $oid => @$kw\n") if $lei->{opt}->{verbose};
                 $self->{lei}->{sto}->ipc_do('set_eml_vmd', undef,
diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm
index b09d1e45..d0963e92 100644
--- a/lib/PublicInbox/LeiSearch.pm
+++ b/lib/PublicInbox/LeiSearch.pm
@@ -133,9 +133,11 @@ sub xoids_for {
 # returns true if $eml is indexed by lei/store and keywords don't match
 sub kw_changed {
         my ($self, $eml, $new_kw_sorted, $docids) = @_;
-        my $xoids = xoids_for($self, $eml) // return;
-        $docids //= [];
-        @$docids = sort { $a <=> $b } values %$xoids;
+        if ($eml) {
+                my $xoids = xoids_for($self, $eml) // return;
+                $docids //= [];
+                @$docids = sort { $a <=> $b } values %$xoids;
+        }
         my $cur_kw = msg_keywords($self, $docids->[0]);
 
         # RFC 5550 sec 5.9 on the $Forwarded keyword states:
diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index b97444fd..39a8f7fc 100644
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -409,7 +409,7 @@ sub flags2kw ($$$$) {
                         warn "# unknown IMAP flag $f <$uri/;UID=$uid>\n";
                 }
         }
-        @$kw = sort @$kw; # for all UI/UX purposes
+        @$kw = sort @$kw; # for LeiSearch->kw_changed and UI/UX purposes
         $kw;
 }