lei: always pass $lei to LeiAuth->op_merge

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

diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index 397292d4c7878e4192aa5766a2fa7188166352bd..d8f39fdf171bfcd99ac507b02acc0887fec12b96 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,11 +100,10 @@ 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');
-       }
+       ($lei->{opt}->{'new-only'} && (!$net || !$net->{imap_order})) and
+               warn "# --new-only is only for IMAP\n";
        my $ops = {};
-       $lei->{auth}->op_merge($ops, $self) if $lei->{auth};
+       $lei->{auth}->op_merge($ops, $self, $lei) if $lei->{auth};
        $lei->{-eml_noisy} = 1;
        (my $op_c, $ops) = $lei->workers_start($self, $j, $ops);
        $lei->{wq1} = $self;
@@ -122,11 +121,11 @@ sub lei_import { # the main "lei import" method
 sub _complete_import {
        my ($lei, @argv) = @_;
        my ($re, $cur, $match_cb) = $lei->complete_url_prepare(\@argv);
-       my @k = $lei->url_folder_cache->keys($argv[-1], 1);
+       my @k = $lei->url_folder_cache->keys($argv[-1] // undef, 1);
        my @m = map { $match_cb->($_) } @k;
        my %f = map { $_ => 1 } (@m ? @m : @k);
        if (my $lms = $lei->lms) {
-               @k = $lms->folders($argv[-1], 1);
+               @k = $lms->folders($argv[-1] // undef, 1);
                @m = map { $match_cb->($_) } @k;
                if (@m) { @f{@m} = @m } else { @f{@k} = @k }
        }