X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiImport.pm;h=2d91e4c4aa25e1d428a595712efc1bd6a0cb1256;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=bbc0634e820e653f21dd35bacdca19817000d24f;hpb=0054246c2d03fcc91bc899da5ef41a68f505e542;p=public-inbox.git diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index bbc0634e..2d91e4c4 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # front-end for the "lei import" sub-command @@ -36,7 +36,7 @@ sub pmdir_cb { # called via wq_io_do from LeiPmdir->each_mdir_fn my $kw = PublicInbox::MdirReader::flags2kw($fl); 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 $lms = $self->{-lms_rw} //= $self->{lei}->lms; # may be 0 or undef my @oidbin = $lms ? $lms->name_oidbin($folder, $bn) : (); @oidbin > 1 and warn("W: $folder/*/$$bn not unique:\n", map { "\t".unpack('H*', $_)."\n" } @oidbin); @@ -87,8 +87,8 @@ sub do_import_index ($$@) { # $j = $net->net_concurrency($j); TODO if ($lei->{opt}->{incremental} // 1) { $net->{incremental} = 1; - $net->{-lms_ro} = $lei->lms // 0; - if ($self->{-import_kw} && $net->{-lms_ro} && + $net->{-lms_rw} = $lei->lms // 0; + if ($self->{-import_kw} && $net->{-lms_rw} && !$lei->{opt}->{'new-only'} && $net->{imap_order}) { require PublicInbox::LeiImportKw; @@ -117,6 +117,8 @@ 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] // undef, 1); + my @L = eval { $lei->_lei_store->search->all_terms('L') }; + push(@k, map { "+L:$_" } @L); my @m = map { $match_cb->($_) } @k; my %f = map { $_ => 1 } (@m ? @m : @k); if (my $lms = $lei->lms) {