lei q: support mbox locking by default

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

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index c46aba3b122b5e9bf46f5fd705cdbeab09376f62..7ec696f4da52d16d26f2552047d1a0dd5f4eebd2 100644 (file)
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -66,6 +66,13 @@ sub remotes { @{$_[0]->{remotes} // []} }
 # called by PublicInbox::Search::xdb
 sub xdb_shards_flat { @{$_[0]->{shards_flat} // []} }
 
+sub mitem_kw ($$;$) {
+       my ($smsg, $mitem, $flagged) = @_;
+       my $kw = xap_terms('K', $mitem->get_document);
+       $kw->{flagged} = 1 if $flagged;
+       $smsg->{kw} = [ sort keys %$kw ];
+}
+
 # like over->get_art
 sub smsg_for {
        my ($self, $mitem) = @_;
@@ -76,10 +83,7 @@ sub smsg_for {
        my $num = int(($docid - 1) / $nshard) + 1;
        my $ibx = $self->{shard2ibx}->[$shard];
        my $smsg = $ibx->over->get_art($num);
-       if (ref($ibx->can('msg_keywords'))) {
-               my $kw = xap_terms('K', $mitem->get_document);
-               $smsg->{kw} = [ sort keys %$kw ];
-       }
+       mitem_kw($smsg, $mitem) if $ibx->can('msg_keywords');
        $smsg->{docid} = $docid;
        $smsg;
 }
@@ -143,6 +147,8 @@ sub query_thread_mset { # for --threads
        my $mo = { %{$lei->{mset_opt}} };
        my $mset;
        my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei, $ibxish);
+       my $can_kw = !!$ibxish->can('msg_keywords');
+       my $fl = $lei->{opt}->{threads} > 1;
        do {
                $mset = $srch->mset($mo->{qstr}, $mo);
                mset_progress($lei, $desc, $mset->size,
@@ -156,6 +162,13 @@ sub query_thread_mset { # for --threads
                                my $smsg = $over->get_art($n) or next;
                                wait_startq($lei);
                                my $mitem = delete $n2item{$smsg->{num}};
+                               if ($mitem) {
+                                       if ($can_kw) {
+                                               mitem_kw($smsg, $mitem, $fl);
+                                       } else {
+                                               $smsg->{kw} = [ 'flagged' ];
+                                       }
+                               }
                                $each_smsg->($smsg, $mitem);
                        }
                        @{$ctx->{xids}} = ();
@@ -189,8 +202,9 @@ sub query_mset { # non-parallel for non-"--threads" users
        $lei->{ovv}->ovv_atexit_child($lei);
 }
 
-sub each_eml { # callback for MboxReader->mboxrd
+sub each_remote_eml { # callback for MboxReader->mboxrd
        my ($eml, $self, $lei, $each_smsg) = @_;
+       $lei->{sto}->ipc_do('set_eml', $eml) if $lei->{sto}; # --import-remote
        my $smsg = bless {}, 'PublicInbox::Smsg';
        $smsg->populate($eml);
        $smsg->parse_references($eml, mids($eml));
@@ -244,14 +258,17 @@ sub query_remote_mboxrd {
                my ($fh, $pid) = popen_rd($cmd, undef, $rdr);
                $reap_curl = PublicInbox::OnDestroy->new($sigint_reap, $pid);
                $fh = IO::Uncompress::Gunzip->new($fh);
-               PublicInbox::MboxReader->mboxrd($fh, \&each_eml, $self,
+               PublicInbox::MboxReader->mboxrd($fh, \&each_remote_eml, $self,
                                                $lei, $each_smsg);
                my $err = waitpid($pid, 0) == $pid ? undef
                                                : "BUG: waitpid($cmd): $!";
                @$reap_curl = (); # cancel OnDestroy
                die $err if $err;
+               my $nr = $lei->{-nr_remote_eml};
+               if ($nr && $lei->{sto}) {
+                       my $wait = $lei->{sto}->ipc_do('done');
+               }
                if ($? == 0) {
-                       my $nr = $lei->{-nr_remote_eml};
                        mset_progress($lei, $lei->{-current_url}, $nr, $nr);
                        next;
                }
@@ -321,6 +338,7 @@ Error closing $lei->{ovv}->{dst}: $!
                        $l2m->poke_dst;
                        $lei->poke_mua;
                } else { # mbox users
+                       delete $l2m->{mbl}; # drop dotlock
                        $lei->start_mua;
                }
        }