lei: simplify common LeiInput users with ->wq1_start

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

diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index 69d63ab6b39756f96a89deb49422fb9eaadcb444..bbc0634e820e653f21dd35bacdca19817000d24f 100644 (file)
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -38,7 +38,7 @@ sub pmdir_cb { # called via wq_io_do from LeiPmdir->each_mdir_fn
        my $lse = $self->{lse} //= $self->{lei}->{sto}->search;
        my $lms = $self->{-lms_ro} //= $self->{lei}->lms; # may be 0 or undef
        my @oidbin = $lms ? $lms->name_oidbin($folder, $bn) : ();
-       @oidbin > 1 and $self->{lei}->err("W: $folder/*/$$bn not unique:\n",
+       @oidbin > 1 and warn("W: $folder/*/$$bn not unique:\n",
                                map { "\t".unpack('H*', $_)."\n" } @oidbin);
        my %seen;
        my @docids = sort { $a <=> $b } grep { !$seen{$_}++ }
@@ -100,17 +100,11 @@ sub do_import_index ($$@) {
                my $nproc = $self->detect_nproc;
                $j = $nproc if $j > $nproc;
        }
-       if ($lei->{opt}->{'new-only'} && (!$net || !$net->{imap_order})) {
-               $lei->err('# --new-only is only for IMAP');
-       }
-       my $ops = {};
-       $lei->{auth}->op_merge($ops, $self) if $lei->{auth};
+       ($lei->{opt}->{'new-only'} && (!$net || !$net->{imap_order})) and
+               warn "# --new-only is only for IMAP\n";
        $lei->{-eml_noisy} = 1;
-       (my $op_c, $ops) = $lei->workers_start($self, $j, $ops);
-       $lei->{wq1} = $self;
        $lei->{-err_type} = 'non-fatal';
-       net_merge_all_done($self) unless $lei->{auth};
-       $lei->wait_wq_events($op_c, $ops);
+       $lei->wq1_start($self, $j);
 }
 
 sub lei_import { # the main "lei import" method