lei import: start rearranging code for IMAP support

More to come in a later commit; some error handling and failure
modes will be trickier with IMAP due to authentication.

diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index 8358d9d4b4e7ba899954fff301b48f98a5cf4be2..b25d7e97987286a3b3f43e8a3b16ca5a02a1b214 100644 (file)
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -29,26 +29,21 @@ sub import_done { # EOF callback for main daemon
        $imp->wq_wait_old(\&import_done_wait, $lei);
 }
 
-sub call { # the main "lei import" method
-       my ($cls, $lei, @argv) = @_;
-       my $sto = $lei->_lei_store(1);
-       $sto->write_prepare($lei);
-       $lei->{opt}->{kw} //= 1;
+sub check_fmt ($;$) {
+       my ($lei, $f) = @_;
        my $fmt = $lei->{opt}->{'format'};
-       my $self = $lei->{imp} = bless {}, $cls;
-       my @f;
-       for my $x (@argv) {
-               if (-f $x) { push @f, $x }
-               elsif (-d _) { require PublicInbox::MdirReader }
-       }
-       (@f && !$fmt) and
-               return $lei->fail("--format unset for regular file(s):\n@f");
-       if (@f && $fmt ne 'eml') {
-               require PublicInbox::MboxReader;
-               PublicInbox::MboxReader->can($fmt) or
-                       return $lei->fail( "--format=$fmt unrecognized\n");
+       if (!$fmt) {
+               my $err = $f ? "regular file(s):\n@$f" : '--stdin';
+               return $lei->fail("--format unset for $err");
        }
-       $self->{0} = $lei->{0} if $lei->{opt}->{stdin};
+       return 1 if $fmt eq 'eml';
+       require PublicInbox::MboxReader;
+       PublicInbox::MboxReader->can($fmt) ||
+                               $lei->fail( "--format=$fmt unrecognized\n");
+}
+
+sub do_import {
+       my ($lei) = @_;
        my $ops = {
                '!' => [ $lei->can('fail_handler'), $lei ],
                'x_it' => [ $lei->can('x_it'), $lei ],
@@ -56,14 +51,19 @@ sub call { # the main "lei import" method
                '' => [ \&import_done, $lei ],
        };
        ($lei->{pkt_op_c}, $lei->{pkt_op_p}) = PublicInbox::PktOp->pair($ops);
-       my $j = $lei->{opt}->{jobs} // scalar(@argv) || 1;
-       my $nproc = $self->detect_nproc;
-       $j = $nproc if $j > $nproc;
+       my $self = $lei->{imp};
+       my $j = $lei->{opt}->{jobs} // scalar(@{$self->{argv}}) || 1;
+       if (my $nrd = $lei->{nrd}) {
+               # $j = $nrd->net_concurrency($j); TODO
+       } else {
+               my $nproc = $self->detect_nproc;
+               $j = $nproc if $j > $nproc;
+       }
        $self->wq_workers_start('lei_import', $j, $lei->oldset, {lei => $lei});
        my $op = delete $lei->{pkt_op_c};
        delete $lei->{pkt_op_p};
        $self->wq_io_do('import_stdin', []) if $self->{0};
-       for my $x (@argv) {
+       for my $x (@{$self->{argv}}) {
                $self->wq_io_do('import_path_url', [], $x);
        }
        $self->wq_close(1);
@@ -73,6 +73,36 @@ sub call { # the main "lei import" method
        }
 }
 
+sub call { # the main "lei import" method
+       my ($cls, $lei, @argv) = @_;
+       my $sto = $lei->_lei_store(1);
+       $sto->write_prepare($lei);
+       $lei->{opt}->{kw} //= 1;
+       my $self = $lei->{imp} = bless { argv => \@argv }, $cls;
+       if ($lei->{opt}->{stdin}) {
+               @argv and return
+                       $lei->fail("--stdin and locations (@argv) do not mix");
+               check_fmt($lei) or return;
+               $self->{0} = $lei->{0};
+       } else {
+               my @f;
+               for my $x (@argv) {
+                       if (-f $x) { push @f, $x }
+                       elsif (-d _) { require PublicInbox::MdirReader }
+                       else {
+                               require PublicInbox::NetReader;
+                               $lei->{nrd} //= PublicInbox::NetReader->new;
+                               $lei->{nrd}->add_url($x);
+                       }
+               }
+               if (@f) { check_fmt($lei, \@f) or return }
+               if ($lei->{nrd} && (my @err = $lei->{nrd}->errors)) {
+                       return $lei->fail(@err);
+               }
+       }
+       do_import($lei);
+}
+
 sub ipc_atfork_child {
        my ($self) = @_;
        $self->{lei}->lei_atfork_child;

diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index fa337bcd879ce085c3b92ffa7dde2c76c726d2f5..1d0534254381d7a1b8e86c8fab476b6dbeff97c1 100644 (file)
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -280,4 +280,23 @@ sub imap_common_init ($) {
        $mics;
 }
 
+sub add_url {
+       my ($self, $arg) = @_;
+       if (my $url = imap_url($arg)) {
+               push @{$self->{imap_order}}, $url;
+       } else {
+               push @{$self->{unsupported_url}}, $arg;
+       }
+}
+
+sub errors {
+       my ($self) = @_;
+       if (my $u = $self->{unsupported_url}) {
+               return "Unsupported URL(s): @$u";
+       }
+       undef;
+}
+
+sub new { bless {}, shift };
+
 1;