lei: always open mail_sync.sqlite3 R/W

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

diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index b0e7ba6bc490ef9d870e4c55f36a98a06e5b4597..b9865829e39d6e7f5c7131ee772f99d13e74928a 100644 (file)
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # front-end for the "lei import" sub-command
@@ -16,7 +16,7 @@ sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh
        if (my $all_vmd = $self->{all_vmd}) {
                @$vmd{keys %$all_vmd} = values %$all_vmd;
        }
-       $self->{lei}->{sto}->ipc_do('set_eml', $eml, $vmd, $xoids);
+       $self->{lei}->{sto}->wq_do('set_eml', $eml, $vmd, $xoids);
 }
 
 sub input_mbox_cb { # MboxReader callback
@@ -30,20 +30,22 @@ sub input_mbox_cb { # MboxReader callback
 }
 
 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 $oidbin = $lms ? $lms->name_oidbin($folder, $bn) : undef;
-       my @docids = defined($oidbin) ?
-                       $self->{over}->oidbin_exists($oidbin) : ();
+       my $lse = $self->{lse} //= $self->{lei}->{sto}->search;
+       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);
+       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) {
-               $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};
@@ -80,12 +82,14 @@ sub do_import_index ($$@) {
        $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} &&
+                       $net->{-lms_rw} = $lei->lms // 0;
+                       if ($self->{-import_kw} && $net->{-lms_rw} &&
+                                       !$lei->{opt}->{'new-only'} &&
                                        $net->{imap_order}) {
                                require PublicInbox::LeiImportKw;
                                $ikw = PublicInbox::LeiImportKw->new($lei);
@@ -96,15 +100,11 @@ sub do_import_index ($$@) {
                my $nproc = $self->detect_nproc;
                $j = $nproc if $j > $nproc;
        }
-       my $ops = {};
-       $lei->{auth}->op_merge($ops, $self) if $lei->{auth};
-       $self->{-wq_nr_workers} = $j // 1; # locked
+       ($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
@@ -115,16 +115,20 @@ sub lei_import { # the main "lei import" method
 
 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 ($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) {
+               @k = $lms->folders($argv[-1] // undef, 1);
+               @m = map { $match_cb->($_) } @k;
+               if (@m) { @f{@m} = @m } else { @f{@k} = @k }
+       }
+       keys %f;
 }
 
 no warnings 'once';
 *ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child;
 *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done;
 
-# the following works even when LeiAuth is lazy-loaded
-*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all;
 1;