lei q: ensure wq workers shutdown on IMAP auth failures

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

diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index 785211bff14ef136445f76e8901de2db7a86d2ce..c269d841e1f835d8f61adaf0f2b5456ff5b1582d 100644 (file)
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -7,14 +7,14 @@ use strict;
 use v5.10.1;
 use parent qw(Exporter PublicInbox::IPC);
 use PublicInbox::Eml;
-
 our %IMAPflags2kw = map {; "\\\u$_" => $_ } qw(seen answered flagged draft);
 
-# TODO: trim this down, this is huge
-our @EXPORT = qw(uri_new uri_section
-               nn_new imap_uri nntp_uri
-               cfg_bool cfg_intvl imap_common_init nntp_common_init
-               );
+our @EXPORT = qw(uri_section imap_uri nntp_uri);
+
+sub ndump {
+       require Data::Dumper;
+       Data::Dumper->new(\@_)->Useqq(1)->Terse(1)->Dump;
+}
 
 # returns the git config section name, e.g [imap "imaps://user@example.com"]
 # without the mailbox, so we can share connections between different inboxes
@@ -94,15 +94,6 @@ sub mic_for { # mic = Mail::IMAPClient
        $mic;
 }
 
-sub uri_new {
-       my ($url) = @_;
-       require URI;
-
-       # URI::snews exists, URI::nntps does not, so use URI::snews
-       $url =~ s!\Anntps://!snews://!i;
-       URI->new($url);
-}
-
 # Net::NNTP doesn't support CAPABILITIES, yet
 sub try_starttls ($) {
        my ($host) = @_;
@@ -276,7 +267,7 @@ sub imap_common_init ($;$) {
                $mics->{$sec} //= mic_for($self, "$sec/", $mic_args, $lei);
                next unless $self->isa('PublicInbox::NetWriter');
                my $dst = $uri->mailbox // next;
-               my $mic = $mics->{$sec};
+               my $mic = $mics->{$sec} // die "Unable to continue\n";
                next if $mic->exists($dst); # already exists
                $mic->create($dst) or die "CREATE $dst failed <$uri>: $@";
        }
@@ -359,9 +350,16 @@ sub _imap_do_msg ($$$$$) {
        $$raw =~ s/\r\n/\n/sg;
        my $kw = [];
        for my $f (split(/ /, $flags)) {
-               my $k = $IMAPflags2kw{$f} // next; # TODO: X-Label?
-               push @$kw, $k;
+               if (my $k = $IMAPflags2kw{$f}) {
+                       push @$kw, $k;
+               } elsif ($f eq "\\Recent") { # not in JMAP
+               } elsif ($f eq "\\Deleted") { # not in JMAP
+                       return;
+               } elsif ($self->{verbose}) {
+                       warn "# unknown IMAP flag $f <$uri;uid=$uid>\n";
+               }
        }
+       @$kw = sort @$kw; # for all UI/UX purposes
        my ($eml_cb, @args) = @{$self->{eml_each}};
        $eml_cb->($uri, $uid, $kw, PublicInbox::Eml->new($raw), @args);
 }
@@ -536,7 +534,7 @@ sub _nntp_fetch_all ($$$) {
        my $sec = uri_section($uri);
        my ($nr, $beg, $end) = $nn->group($group);
        unless (defined($nr)) {
-               chomp(my $msg = $nn->message);
+               my $msg = ndump($nn->message);
                return "E: GROUP $group <$sec> $msg";
        }
 
@@ -556,11 +554,10 @@ sub _nntp_fetch_all ($$$) {
                return if $l_art >= $end; # nothing to do
                $beg = $l_art + 1;
        }
-       my ($err, $art);
+       my ($err, $art, $last_art, $kw); # kw stays undef, no keywords in NNTP
        unless ($self->{quiet}) {
                warn "# $uri fetching ARTICLE $beg..$end\n";
        }
-       my $last_art;
        my $n = $self->{max_batch};
        for ($beg..$end) {
                last if $self->{quit};
@@ -572,7 +569,7 @@ sub _nntp_fetch_all ($$$) {
                }
                my $raw = $nn->article($art);
                unless (defined($raw)) {
-                       my $msg = $nn->message;
+                       my $msg = ndump($nn->message);
                        if ($nn->code == 421) { # pseudo response from Net::Cmd
                                $err = "E: $msg";
                                last;
@@ -584,7 +581,7 @@ sub _nntp_fetch_all ($$$) {
                $raw = join('', @$raw);
                $raw =~ s/\r\n/\n/sg;
                my ($eml_cb, @args) = @{$self->{eml_each}};
-               $eml_cb->($uri, $art, [], PublicInbox::Eml->new(\$raw), @args);
+               $eml_cb->($uri, $art, $kw, PublicInbox::Eml->new(\$raw), @args);
                $last_art = $art;
        }
        run_commit_cb($self);