diff options
Diffstat (limited to 'lib/PublicInbox/IMAPD.pm')
-rw-r--r-- | lib/PublicInbox/IMAPD.pm | 67 |
1 files changed, 37 insertions, 30 deletions
diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm index 5368ff04..42dc2a9f 100644 --- a/lib/PublicInbox/IMAPD.pm +++ b/lib/PublicInbox/IMAPD.pm @@ -23,17 +23,12 @@ 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; - # We require lower-case since IMAP mailbox names are - # case-insensitive (but -nntpd matches INN in being - # case-sensitive) - if ($ngname =~ m![^a-z0-9/_\.\-\~\@\+\=:]! || - # don't confuse with 50K slices - $ngname =~ /\.[0-9]+\z/) { - warn "mailbox name invalid: newsgroup=`$ngname'\n"; + if ($ngname =~ /\.[0-9]+\z/) { # don't confuse with 50K slices + warn "E: mailbox name invalid: newsgroup=`$ngname' (ignored)\n"; return; } my $ce = $cache->{$ngname}; @@ -44,7 +39,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 +50,33 @@ 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; + require PublicInbox::IMAPsearchqp; + $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 +87,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; |