lei ls-mail-source: list IMAP folders and NNTP groups

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

diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index b97444fded2870a28338534fd7aa1fef4fbfafdc..bcc6cbf084db58689e97f3ae15d6727367432265 100644 (file)
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -236,18 +236,19 @@ W: see https://rt.cpan.org/Ticket/Display.html?id=129967 for updates
 }
 
 sub imap_uri {
-       my ($url) = @_;
+       my ($url, $ls_ok) = @_;
        require PublicInbox::URIimap;
        my $uri = PublicInbox::URIimap->new($url);
-       $uri ? $uri->canonical : undef;
+       $uri && ($ls_ok || $uri->mailbox) ? $uri->canonical : undef;
 }
 
 my %IS_NNTP = (news => 1, snews => 1, nntp => 1, nntps => 1);
 sub nntp_uri {
-       my ($url) = @_;
+       my ($url, $ls_ok) = @_;
        require PublicInbox::URInntps;
        my $uri = PublicInbox::URInntps->new($url);
-       $uri && $IS_NNTP{$uri->scheme} && $uri->group ? $uri->canonical : undef;
+       $uri && $IS_NNTP{$uri->scheme} && ($ls_ok || $uri->group) ?
+               $uri->canonical : undef;
 }
 
 sub cfg_intvl ($$$) {
@@ -367,11 +368,11 @@ sub nntp_common_init ($;$) {
 }
 
 sub add_url {
-       my ($self, $arg) = @_;
+       my ($self, $arg, $ls_ok) = @_;
        my $uri;
-       if ($uri = imap_uri($arg)) {
+       if ($uri = imap_uri($arg, $ls_ok)) {
                push @{$self->{imap_order}}, $uri;
-       } elsif ($uri = nntp_uri($arg)) {
+       } elsif ($uri = nntp_uri($arg, $ls_ok)) {
                push @{$self->{nntp_order}}, $uri;
        } else {
                push @{$self->{unsupported_url}}, $arg;
@@ -409,7 +410,7 @@ sub flags2kw ($$$$) {
                        warn "# unknown IMAP flag $f <$uri/;UID=$uid>\n";
                }
        }
-       @$kw = sort @$kw; # for all UI/UX purposes
+       @$kw = sort @$kw; # for LeiSearch->kw_changed and UI/UX purposes
        $kw;
 }
 
@@ -471,6 +472,7 @@ sub each_old_flags ($$$$) {
                while (my ($uid, $per_uid) = each %$r) {
                        my $kw = flags2kw($self, $uri, $uid, $per_uid->{FLAGS})
                                // next;
+                       # LeiImport->input_net_cb
                        $eml_cb->($uri, $uid, $kw, undef, @args);
                }
        }
@@ -746,4 +748,23 @@ sub nntp_each {
 
 sub new { bless {}, shift };
 
+# updates $uri with UIDVALIDITY
+sub mic_for_folder {
+       my ($self, $uri) = @_;
+       my $mic = $self->mic_get($uri) or die "E: not connected: $@";
+       my $m = $self->isa('PublicInbox::NetWriter') ? 'select' : 'examine';
+       $mic->$m($uri->mailbox) or return;
+       my $uidval;
+       for ($mic->Results) {
+               /^\* OK \[UIDVALIDITY ([0-9]+)\].*/ or next;
+               $uidval = $1;
+               last;
+       }
+       $uidval //= $mic->uidvalidity($uri->mailbox) or
+               die "E: failed to get uidvalidity from <$uri>: $@";
+       $uri->uidvalidity($uidval);
+       $mic;
+}
+
+
 1;