No ext_urls

[public-inbox.git] / lib / PublicInbox / IMAPD.pm

diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm
index 5368ff040edd457111cdb3984f722ebd67b5904f..78323e57c851ac664120109f9eb4c0a1ee9b85e9 100644 (file)
--- a/lib/PublicInbox/IMAPD.pm
+++ b/lib/PublicInbox/IMAPD.pm
@@ -23,7 +23,7 @@ sub new {
        }, $class;
 }
 
-sub imapd_refresh_ibx { # pi_cfg->each_inbox cb
+sub _refresh_ibx { # pi_cfg->each_inbox cb
        my ($ibx, $imapd, $cache, $dummies) = @_;
        my $ngname = $ibx->{newsgroup} // return;
 
@@ -44,7 +44,6 @@ sub imapd_refresh_ibx { # pi_cfg->each_inbox cb
                PublicInbox::IMAP::ensure_slices_exist($imapd, $ibx);
                # preload to avoid fragmentation:
                $ibx->description;
-               $ibx->base_url;
                # ensure dummies are selectable:
                do {
                        $dummies->{$ngname} = $dummy;
@@ -56,27 +55,32 @@ sub imapd_refresh_ibx { # pi_cfg->each_inbox cb
 sub refresh_groups {
        my ($self, $sig) = @_;
        my $pi_cfg = PublicInbox::Config->new;
-       my $mailboxes = $self->{mailboxes} = {};
-       my $cache = eval { $pi_cfg->ALL->misc->nntpd_cache_load } // {};
-       my $dummies = {};
-       $pi_cfg->each_inbox(\&imapd_refresh_ibx, $self, $cache, $dummies);
-       %$dummies = (%$dummies, %$mailboxes);
-       $mailboxes = $self->{mailboxes} = $dummies;
-       @{$self->{mailboxlist}} = map { $_->[2] }
-               sort { $a->[0] cmp $b->[0] || $a->[1] <=> $b->[1] }
-               map {
-                       my $u = $_; # capitalize "INBOX" for user-familiarity
-                       $u =~ s/\Ainbox(\.|\z)/INBOX$1/i;
-                       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;
+       $self->{mailboxes} = $pi_cfg->{-imap_mailboxes} // do {
+               my $mailboxes = $self->{mailboxes} = {};
+               my $cache = eval { $pi_cfg->ALL->misc->nntpd_cache_load } // {};
+               my $dummies = {};
+               $pi_cfg->each_inbox(\&_refresh_ibx, $self, $cache, $dummies);
+               %$mailboxes = (%$dummies, %$mailboxes);
+               @{$pi_cfg->{-imap_mailboxlist}} = map { $_->[2] }
+                       sort { $a->[0] cmp $b->[0] || $a->[1] <=> $b->[1] }
+                       map {
+                               # capitalize "INBOX" for user-familiarity
+                               my $u = $_;
+                               $u =~ s/\Ainbox(\.|\z)/INBOX$1/i;
+                               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, '* LIST '.
+                                         qq[(\\HasNoChildren) "." $u\r\n] ]
+                               }
+                       } keys %$mailboxes;
+               $pi_cfg->{-imap_mailboxes} = $mailboxes;
+       };
+       $self->{mailboxlist} = $pi_cfg->{-imap_mailboxlist} //
+                       die 'BUG: no mailboxlist';
        $self->{pi_cfg} = $pi_cfg;
        if (my $idler = $self->{idler}) {
                $idler->refresh($pi_cfg);
@@ -87,4 +91,11 @@ sub idler_start {
        $_[0]->{idler} //= PublicInbox::InboxIdle->new($_[0]->{pi_cfg});
 }
 
+sub event_step { # called vai requeue for low-priority IMAP clients
+       my ($self) = @_;
+       my $imap = shift(@{$self->{-authed_q}}) // return;
+       PublicInbox::DS::requeue($self) if scalar(@{$self->{-authed_q}});
+       $imap->event_step; # PublicInbox::IMAP::event_step
+}
+
 1;