imapd: sort LIST response

While RFC 3501 doesn't require LIST responses be sorted,
it makes reading protocol dumps easier and we memoize it
once per-refresh, so it shouldn't be too expensive even
with thousands of folders.

diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index 37e07daedeefe0edc510d215e5aa8df35a071e75..27013ea563c1148eee7be0dfc531f978e54c62bd 100644 (file)
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -384,7 +384,7 @@ sub ensure_slices_exist ($$$) {
                push @created, $sub_mailbox;
        }
        return unless @created;
-       my $l = $imapd->{inboxlist} or return;
+       my $l = $imapd->{mailboxlist} or return;
        push @$l, map { qq[* LIST (\\HasNoChildren) "." $_\r\n] } @created;
 }
 
@@ -850,7 +850,7 @@ sub cmd_status ($$$;@) {
 my %patmap = ('*' => '.*', '%' => '[^\.]*');
 sub cmd_list ($$$$) {
        my ($self, $tag, $refname, $wildcard) = @_;
-       my $l = $self->{imapd}->{inboxlist};
+       my $l = $self->{imapd}->{mailboxlist};
        if ($refname eq '' && $wildcard eq '') {
                # request for hierarchy delimiter
                $l = [ qq[* LIST (\\Noselect) "." ""\r\n] ];

diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm
index 7425409d3594ebbd1b985c3ca1c323e534a8857a..6aa3d12fa1e76eb4a2ab20008e281a9dfad03ec8 100644 (file)
--- a/lib/PublicInbox/IMAPD.pm
+++ b/lib/PublicInbox/IMAPD.pm
@@ -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;