diff options
| -rw-r--r-- | lib/PublicInbox/IMAP.pm | 15 | ||||
| -rw-r--r-- | lib/PublicInbox/IMAPD.pm | 2 | ||||
| -rw-r--r-- | t/imapd.t | 2 | ||||
| -rw-r--r-- | xt/imapd-mbsync-oimap.t | 2 | ||||
| -rw-r--r-- | xt/imapd-validate.t | 2 |
5 files changed, 10 insertions, 13 deletions
diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm index 6f64dff9..5865822f 100644 --- a/lib/PublicInbox/IMAP.pm +++ b/lib/PublicInbox/IMAP.pm @@ -197,14 +197,10 @@ sub ensure_ranges_exist ($$$) { my $mailboxes = $imapd->{mailboxes}; my $mb_top = $ibx->{newsgroup}; my @created; - my $uid_min = UID_BLOCK * int($max/UID_BLOCK) + 1; - my $uid_end = $uid_min + UID_BLOCK - 1; - while ($uid_min > 0) { - my $sub_mailbox = "$mb_top.$uid_min-$uid_end"; + for (my $i = int($max/UID_BLOCK); $i >= 0; --$i) { + my $sub_mailbox = "$mb_top.$i"; last if exists $mailboxes->{$sub_mailbox}; $mailboxes->{$sub_mailbox} = $ibx; - $uid_end -= UID_BLOCK; - $uid_min -= UID_BLOCK; push @created, $sub_mailbox; } return unless @created; @@ -216,9 +212,9 @@ sub cmd_examine ($$$) { my ($self, $tag, $mailbox) = @_; my ($ibx, $mm, $max); - if ($mailbox =~ /\A(.+)\.([0-9]+)-([0-9]+)\z/) { - # old mail: inbox.comp.foo.$uid_min-$uid_end - my ($mb_top, $uid_min, $uid_end) = ($1, $2 + 0, $3 + 0); + if ($mailbox =~ /\A(.+)\.([0-9]+)\z/) { + # old mail: inbox.comp.foo.$uid_block_idx + my ($mb_top, $uid_min) = ($1, $2 * UID_BLOCK + 1); $ibx = $self->{imapd}->{mailboxes}->{lc $mailbox} or return "$tag NO Mailbox doesn't exist: $mailbox\r\n"; @@ -227,6 +223,7 @@ sub cmd_examine ($$$) { $max = $mm->max // 0; $self->{uid_min} = $uid_min; ensure_ranges_exist($self->{imapd}, $ibx, $max); + my $uid_end = $uid_min + UID_BLOCK - 1; $max = $uid_end if $max > $uid_end; } else { # check for dummy inboxes $ibx = $self->{imapd}->{mailboxes}->{lc $mailbox} or diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm index 6488dc0f..261d7560 100644 --- a/lib/PublicInbox/IMAPD.pm +++ b/lib/PublicInbox/IMAPD.pm @@ -31,7 +31,7 @@ sub imapd_refresh_ibx { # pi_config->each_inbox cb join(', ', @$ngname). "\n"; return; } elsif ($ngname =~ m![^a-z0-9/_\.\-\~\@\+\=:]! || - $ngname =~ /\.[0-9]+-[0-9]+\z/) { + $ngname =~ /\.[0-9]+\z/) { warn "mailbox name invalid: newsgroup=`$ngname'\n"; return; } @@ -17,7 +17,7 @@ if ($can_compress) { # hope this gets fixed upstream, soon } require_ok 'PublicInbox::IMAP'; -my $first_range = '1-'.PublicInbox::IMAP::UID_BLOCK(); +my $first_range = '0'; my $level = '-Lbasic'; SKIP: { diff --git a/xt/imapd-mbsync-oimap.t b/xt/imapd-mbsync-oimap.t index b2cb8737..fdaa22aa 100644 --- a/xt/imapd-mbsync-oimap.t +++ b/xt/imapd-mbsync-oimap.t @@ -14,7 +14,7 @@ plan skip_all => "bad characters in $inboxdir" if $inboxdir =~ m![^\w\.\-/]!; my ($tmpdir, $for_destroy) = tmpdir(); my $cfg = "$tmpdir/cfg"; my $newsgroup = 'inbox.test'; -my $mailbox = "$newsgroup.1-50000"; +my $mailbox = "$newsgroup.0"; { open my $fh, '>', $cfg or BAIL_OUT "open: $!"; print $fh <<EOF or BAIL_OUT "print: $!"; diff --git a/xt/imapd-validate.t b/xt/imapd-validate.t index b7b66d05..aeeb43b9 100644 --- a/xt/imapd-validate.t +++ b/xt/imapd-validate.t @@ -39,7 +39,7 @@ if (($ENV{IMAP_TEST_URL} // '') =~ m!\Aimap://([^/]+)/(.+)\z!) { } else { require_mods(qw(DBD::SQLite)); $make_local_server->(); - $mailbox = "$newsgroup.1-50000"; + $mailbox = "$newsgroup.0"; } my %opts = (imap => \%OPT, 'imap+compress' => { %OPT, Compress => 1 }); |