lei: use standard warn() in more places

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

diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index 40530914ead73ba1847f73eeb096db46efa88d65..2f8fd6c64f69f4348a6bcb77335ba8bcdf32d85d 100644 (file)
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -37,8 +37,12 @@ sub pmdir_cb { # called via wq_io_do from LeiPmdir->each_mdir_fn
        substr($folder, 0, 0) = 'maildir:'; # add prefix
        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) : undef;
-       my @docids = defined($oidbin) ? $lse->over->oidbin_exists($oidbin) : ();
+       my @oidbin = $lms ? $lms->name_oidbin($folder, $bn) : ();
+       @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{$_}++ }
+                       map { $lse->over->oidbin_exists($_) } @oidbin;
        my $vmd = $self->{-import_kw} ? { kw => $kw } : undef;
        if (scalar @docids) {
                $lse->kw_changed(undef, $kw, \@docids) or return;
@@ -96,9 +100,8 @@ 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->{-eml_noisy} = 1;
@@ -117,12 +120,14 @@ sub lei_import { # the main "lei import" method
 
 sub _complete_import {
        my ($lei, @argv) = @_;
-       my $match_cb = $lei->complete_url_prepare(\@argv);
-       my @m = map { $match_cb->($_) } $lei->url_folder_cache->keys;
-       my %f = map { $_ => 1 } @m;
+       my ($re, $cur, $match_cb) = $lei->complete_url_prepare(\@argv);
+       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) {
-               @m = map { $match_cb->($_) } $lms->folders;
-               @f{@m} = @m;
+               @k = $lms->folders($argv[-1] // undef, 1);
+               @m = map { $match_cb->($_) } @k;
+               if (@m) { @f{@m} = @m } else { @f{@k} = @k }
        }
        keys %f;
 }