diff options
author | Eric Wong <e@80x24.org> | 2020-10-16 06:59:31 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2020-10-16 17:15:12 +0000 |
commit | c0174089f48d081bb84ce776d5b6ee0bf19a4fa1 (patch) | |
tree | 53d7ae62a5ebec06fff7c87a9c0e4c55ff827306 /lib/PublicInbox | |
parent | 0438ee2b1a5fbeb587ee62aa3e267ec09d281bd9 (diff) | |
download | public-inbox-c0174089f48d081bb84ce776d5b6ee0bf19a4fa1.tar.gz |
This will make it easier to deal with ExtSearchIdx, which won't have msgmap.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/DummyInbox.pm | 4 | ||||
-rw-r--r-- | lib/PublicInbox/IMAPD.pm | 6 | ||||
-rw-r--r-- | lib/PublicInbox/Inbox.pm | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/PublicInbox/DummyInbox.pm b/lib/PublicInbox/DummyInbox.pm index 69b0b683..02426f13 100644 --- a/lib/PublicInbox/DummyInbox.pm +++ b/lib/PublicInbox/DummyInbox.pm @@ -7,13 +7,13 @@ package PublicInbox::DummyInbox; use strict; -sub created_at { 0 } # Msgmap::created_at +sub uidvalidity { 0 } # Msgmap::created_at sub mm { shift } sub uid_range { [] } # Over::uid_range sub subscribe_unlock { undef }; no warnings 'once'; -*max = \&created_at; +*max = \&uidvalidity; *query_xover = \&uid_range; *over = \&mm; *search = *unsubscribe_unlock = diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm index 3c211ee1..bb705136 100644 --- a/lib/PublicInbox/IMAPD.pm +++ b/lib/PublicInbox/IMAPD.pm @@ -38,13 +38,13 @@ sub imapd_refresh_ibx { # pi_config->each_inbox cb } $ibx->over or return; $ibx->{over} = undef; - my $mm = $ibx->mm or return; - $ibx->{mm} = undef; # RFC 3501 2.3.1.1 - "A good UIDVALIDITY value to use in # this case is a 32-bit representation of the creation # date/time of the mailbox" - defined($ibx->{uidvalidity} = $mm->created_at) or return; + eval { $ibx->uidvalidity }; + my $mm = delete($ibx->{mm}) or return; + defined($ibx->{uidvalidity}) or return; PublicInbox::IMAP::ensure_slices_exist($imapd, $ibx, $mm->max // 0); # preload to avoid fragmentation: diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index b0894a7d..cbb95b8d 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -428,4 +428,6 @@ sub on_unlock { } } +sub uidvalidity { $_[0]->{uidvalidity} //= $_[0]->mm->created_at } + 1; |