}
sub pmdir_cb { # called via wq_io_do from LeiPmdir->each_mdir_fn
- my ($self, $f, @args) = @_;
+ my ($self, $f, $fl) = @_;
my ($folder, $bn) = ($f =~ m!\A(.+?)/(?:new|cur)/([^/]+)\z!) or
die "BUG: $f was not from a Maildir?\n";
- my $fl = PublicInbox::MdirReader::maildir_basename_flags($bn);
- return if index($fl, 'T') >= 0; # no Trashed messages
my $kw = PublicInbox::MdirReader::flags2kw($fl);
substr($folder, 0, 0) = 'maildir:'; # add prefix
- my $lms = $self->{-lms_ro};
+ my $lse = $self->{lse} //= $self->{lei}->{sto}->search;
+ my $lms = $self->{-lms_ro} //= $lse->lms; # may be 0 or undef
my $oidbin = $lms ? $lms->name_oidbin($folder, $bn) : undef;
- my @docids = defined($oidbin) ?
- $self->{over}->oidbin_exists($oidbin) : ();
+ my @docids = defined($oidbin) ? $lse->over->oidbin_exists($oidbin) : ();
my $vmd = $self->{-import_kw} ? { kw => $kw } : undef;
if (scalar @docids) {
- $self->{lse}->kw_changed(undef, $kw, \@docids) or return;
+ $lse->kw_changed(undef, $kw, \@docids) or return;
}
if (my $eml = eml_from_path($f)) {
$vmd->{sync_info} = [ $folder, \$bn ] if $self->{-mail_sync};
$j =~ /\A([0-9]+),[0-9]+\z/ and $j = $1 + 0;
$j ||= scalar(@{$self->{inputs}}) || 1;
my $ikw;
- if (my $net = $lei->{net}) {
+ my $net = $lei->{net};
+ if ($net) {
# $j = $net->net_concurrency($j); TODO
if ($lei->{opt}->{incremental} // 1) {
$net->{incremental} = 1;
$net->{-lms_ro} = $sto->search->lms // 0;
if ($self->{-import_kw} && $net->{-lms_ro} &&
+ !$lei->{opt}->{'new-only'} &&
$net->{imap_order}) {
require PublicInbox::LeiImportKw;
$ikw = PublicInbox::LeiImportKw->new($lei);
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};
$self->{-wq_nr_workers} = $j // 1; # locked
sub _complete_import {
my ($lei, @argv) = @_;
- my $sto = $lei->_lei_store or return;
- my $lms = $sto->search->lms or return;
my $match_cb = $lei->complete_url_prepare(\@argv);
- map { $match_cb->($_) } $lms->folders;
+ my @m = map { $match_cb->($_) } $lei->url_folder_cache->keys;
+ my %f = map { $_ => 1 } @m;
+ my $sto = $lei->_lei_store;
+ if (my $lms = $sto ? $sto->search->lms : undef) {
+ @m = map { $match_cb->($_) } $lms->folders;
+ @f{@m} = @m;
+ }
+ keys %f;
}
no warnings 'once';