X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FIMAPD.pm;h=9a5bdcfe6b891c600976c952710390778f513f00;hb=c38111d6f3877cf31d28b0a0339d063df0fa58f6;hp=7425409d3594ebbd1b985c3ca1c323e534a8857a;hpb=9dfc0b670fc634b54998c3020f173b82de1915ac;p=public-inbox.git
diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm
index 7425409d..9a5bdcfe 100644
--- a/lib/PublicInbox/IMAPD.pm
+++ b/lib/PublicInbox/IMAPD.pm
@@ -1,10 +1,10 @@
-# Copyright (C) 2020-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
-# represents an IMAPD (currently a singleton),
-# see script/public-inbox-imapd for how it is used
+# represents an IMAPD, see script/public-inbox-imapd for how it is used
package PublicInbox::IMAPD;
use strict;
+use v5.10.1;
use PublicInbox::Config;
use PublicInbox::ConfigIter;
use PublicInbox::InboxIdle;
@@ -70,12 +70,21 @@ sub imapd_refresh_finalize {
}
%$mailboxes = (%$mailboxes, %{$imapd->{mailboxes}});
$imapd->{mailboxes} = $mailboxes;
- $imapd->{inboxlist} = [
+ $imapd->{mailboxlist} = [
+ map { $_->[2] }
+ sort { $a->[0] cmp $b->[0] || $a->[1] <=> $b->[1] }
map {
- my $no = $mailboxes->{$_} == $dummy ? '' : 'No';
my $u = $_; # capitalize "INBOX" for user-familiarity
$u =~ s/\Ainbox(\.|\z)/INBOX$1/i;
- qq[* LIST (\\Has${no}Children) "." $u\r\n]
+ if ($mailboxes->{$_} == $dummy) {
+ [ $u, -1,
+ qq[* LIST (\\HasChildren) "." $u\r\n]]
+ } else {
+ $u =~ /\A(.+)\.([0-9]+)\z/ or
+ die "BUG: `$u' has no slice digit(s)";
+ [ $1, $2 + 0,
+ qq[* LIST (\\HasNoChildren) "." $u\r\n] ]
+ }
} keys %$mailboxes
];
$imapd->{pi_cfg} = $pi_cfg;
@@ -84,7 +93,7 @@ sub imapd_refresh_finalize {
}
}
-sub imapd_refresh_step { # pi_cfg->iterate_start cb
+sub imapd_refresh_step { # PublicInbox::ConfigIter cb
my ($pi_cfg, $section, $imapd) = @_;
if (defined($section)) {
return if $section !~ m!\Apublicinbox\.([^/]+)\z!;