imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm
index 09bedf5ca9b42c7b74129a94bab7b50b5df0acc3..b24097a2453c10783aa334484ba3920d329d85b5 100644 (file)
--- a/lib/PublicInbox/IMAPD.pm
+++ b/lib/PublicInbox/IMAPD.pm
@@ -1,11 +1,13 @@
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # represents an IMAPD (currently a singleton),
 # 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;
 use PublicInbox::IMAP;
 use PublicInbox::DummyInbox;
@@ -18,33 +20,34 @@ sub new {
                err => \*STDERR,
                out => \*STDOUT,
                # accept_tls => { SSL_server => 1, ..., SSL_reuse_ctx => ... }
-               # pi_config => PublicInbox::Config
+               # pi_cfg => PublicInbox::Config
                # idler => PublicInbox::InboxIdle
        }, $class;
 }
 
-sub imapd_refresh_ibx { # pi_config->each_inbox cb
+sub imapd_refresh_ibx { # pi_cfg->each_inbox cb
        my ($ibx, $imapd) = @_;
        my $ngname = $ibx->{newsgroup} or return;
-       if (ref $ngname) {
-               warn 'multiple newsgroups not supported: '.
-                       join(', ', @$ngname). "\n";
-               return;
-       } elsif ($ngname =~ m![^a-z0-9/_\.\-\~\@\+\=:]! ||
-                $ngname =~ /\.[0-9]+\z/) {
+
+       # 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";
                return;
        }
        $ibx->over or return;
        $ibx->{over} = undef;
-       my $mm = $ibx->mm or return;
-       $ibx->{mm} = undef;
 
        # RFC 3501 2.3.1.1 -  "A good UIDVALIDITY value to use in
        # this case is a 32-bit representation of the creation
        # date/time of the mailbox"
-       defined($ibx->{uidvalidity} = $mm->created_at) or return;
-       PublicInbox::IMAP::ensure_slices_exist($imapd, $ibx, $mm->max // 0);
+       eval { $ibx->uidvalidity };
+       my $mm = delete($ibx->{mm}) or return;
+       defined($ibx->{uidvalidity}) or return;
+       PublicInbox::IMAP::ensure_slices_exist($imapd, $ibx, $mm->max);
 
        # preload to avoid fragmentation:
        $ibx->description;
@@ -58,7 +61,7 @@ sub imapd_refresh_ibx { # pi_config->each_inbox cb
 }
 
 sub imapd_refresh_finalize {
-       my ($imapd, $pi_config) = @_;
+       my ($imapd, $pi_cfg) = @_;
        my $mailboxes;
        if (my $next = delete $imapd->{imapd_next}) {
                $imapd->{mailboxes} = delete $next->{mailboxes};
@@ -68,47 +71,57 @@ 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_config} = $pi_config;
+       $imapd->{pi_cfg} = $pi_cfg;
        if (my $idler = $imapd->{idler}) {
-               $idler->refresh($pi_config);
+               $idler->refresh($pi_cfg);
        }
 }
 
-sub imapd_refresh_step { # pi_config->iterate_start cb
-       my ($pi_config, $section, $imapd) = @_;
+sub imapd_refresh_step { # PublicInbox::ConfigIter cb
+       my ($pi_cfg, $section, $imapd) = @_;
        if (defined($section)) {
                return if $section !~ m!\Apublicinbox\.([^/]+)\z!;
-               my $ibx = $pi_config->lookup_name($1) or return;
+               my $ibx = $pi_cfg->lookup_name($1) or return;
                imapd_refresh_ibx($ibx, $imapd->{imapd_next});
        } else { # undef == "EOF"
-               imapd_refresh_finalize($imapd, $pi_config);
+               imapd_refresh_finalize($imapd, $pi_cfg);
        }
 }
 
 sub refresh_groups {
        my ($self, $sig) = @_;
-       my $pi_config = PublicInbox::Config->new;
+       my $pi_cfg = PublicInbox::Config->new;
        if ($sig) { # SIGHUP is handled through the event loop
                $self->{imapd_next} = { dummies => {}, mailboxes => {} };
-               $pi_config->iterate_start(\&imapd_refresh_step, $self);
-               PublicInbox::DS::requeue($pi_config); # call event_step
+               my $iter = PublicInbox::ConfigIter->new($pi_cfg,
+                                               \&imapd_refresh_step, $self);
+               $iter->event_step;
        } else { # initial start is synchronous
                $self->{dummies} = {};
-               $pi_config->each_inbox(\&imapd_refresh_ibx, $self);
-               imapd_refresh_finalize($self, $pi_config);
+               $pi_cfg->each_inbox(\&imapd_refresh_ibx, $self);
+               imapd_refresh_finalize($self, $pi_cfg);
        }
 }
 
 sub idler_start {
-       $_[0]->{idler} //= PublicInbox::InboxIdle->new($_[0]->{pi_config});
+       $_[0]->{idler} //= PublicInbox::InboxIdle->new($_[0]->{pi_cfg});
 }
 
 1;