diff options
| author | Eric Wong <e@80x24.org> | 2021-06-13 18:12:06 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-06-14 20:00:48 +0000 |
| commit | 45d516cc3defdffbf3da07a7fc5e8d534b5a8d90 (patch) | |
| tree | fe4391ed98d8ad2aaffdfbf8ab810e816ff5bb32 /lib | |
| parent | 499aea505f58be23a125f4fe2e3af654d42eea9f (diff) | |
| download | public-inbox-45d516cc3defdffbf3da07a7fc5e8d534b5a8d90.tar.gz | |
Since users can't set IMAP flags in read-only IMAP folders, we won't clobber local flags when importing from IMAP. This also enables the local_blob fallback used for lei-index to be used for index deduplication.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/PublicInbox/LeiStore.pm | 3 | ||||
| -rw-r--r-- | lib/PublicInbox/NetReader.pm | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm index 5446873e..f978288a 100644 --- a/lib/PublicInbox/LeiStore.pm +++ b/lib/PublicInbox/LeiStore.pm @@ -151,7 +151,8 @@ sub _docids_for ($$) { my $oid = $cur->{blob}; my $docid = $cur->{num}; my $bref = $im ? $im->cat_blob($oid) : undef; - $bref //= $eidx->git->cat_file($oid) // do { + $bref //= $eidx->git->cat_file($oid) // + _lms_rw($self)->local_blob($oid, 1) // do { warn "W: $oid (#$docid) <$mid> not found\n"; next; }; diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index 30784199..0c2288d8 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -420,7 +420,8 @@ sub _imap_do_msg ($$$$$) { my ($self, $uri, $uid, $raw, $flags) = @_; # our target audience expects LF-only, save storage $$raw =~ s/\r\n/\n/sg; - my $kw = flags2kw($self, $uri, $uid, $flags) // return; + my $kw = defined($flags) ? + (flags2kw($self, $uri, $uid, $flags) // return) : undef; my ($eml_cb, @args) = @{$self->{eml_each}}; $eml_cb->($uri, $uid, $kw, PublicInbox::Eml->new($raw), @args); } @@ -537,8 +538,8 @@ E: $uri strangely, UIDVALIDLITY matches ($l_uidval) EOF $mic->Uid(1); # the default, we hope my $err; - if (!defined($single_uid) && $self->{each_old} && - perm_fl_ok($perm_fl)) { + my $use_fl = perm_fl_ok($perm_fl); + if (!defined($single_uid) && $self->{each_old} && $use_fl) { $err = each_old_flags($self, $mic, $uri, $l_uid); return $err if $err; } @@ -593,8 +594,8 @@ EOF # messages get deleted, so holes appear my $per_uid = delete $r->{$uid} // next; my $raw = delete($per_uid->{$key}) // next; - _imap_do_msg($self, $uri, $uid, \$raw, - $per_uid->{FLAGS}); + my $fl = $use_fl ? $per_uid->{FLAGS} : undef; + _imap_do_msg($self, $uri, $uid, \$raw, $fl); $last_uid = $uid; last if $self->{quit}; } |