lei q: do not leave temporary files after oneshot exit

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 953d1fc22076f4ac77069d1c0769bf7a2107e34d..ca214ca19230c149b1b5b49833cd6283bf8e5e59 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -7,6 +7,11 @@ use strict;
 use v5.10.1;
 use PublicInbox::DS qw(dwaitpid);
 
+sub prep_ext { # externals_each callback
+       my ($lxs, $exclude, $loc) = @_;
+       $lxs->prepare_external($loc) unless $exclude->{$loc};
+}
+
 # the main "lei q SEARCH_TERMS" method
 sub lei_q {
        my ($self, @argv) = @_;
@@ -14,29 +19,42 @@ sub lei_q {
        require PublicInbox::LeiOverview;
        PublicInbox::Config->json; # preload before forking
        my $opt = $self->{opt};
+       # prepare any number of LeiXSearch || LeiSearch || Inbox || URL
        my $lxs = $self->{lxs} = PublicInbox::LeiXSearch->new;
-       # any number of LeiXSearch || LeiSearch || Inbox
-       if ($opt->{'local'} //= 1) { # --local is enabled by default
+       my @only = @{$opt->{only} // []};
+       # --local is enabled by default unless --only is used
+       # we'll allow "--only $LOCATION --local"
+       if ($opt->{'local'} //= scalar(@only) ? 0 : 1) {
                my $sto = $self->_lei_store(1);
                $lxs->prepare_external($sto->search);
        }
-
-       # --external is enabled by default, but allow --no-external
-       if ($opt->{external} //= 1) {
-               my $cb = $lxs->can('prepare_external');
-               my $ne = $self->_externals_each($cb, $lxs);
-               $opt->{remote} //= $ne == $lxs->remotes;
-               if ($opt->{'local'}) {
-                       delete($lxs->{remotes}) if !$opt->{remote};
-               } else {
-                       delete($lxs->{locals});
+       if (@only) {
+               for my $loc (@only) {
+                       $lxs->prepare_external($self->ext_canonicalize($loc));
+               }
+       } else {
+               for my $loc (@{$opt->{include} // []}) {
+                       $lxs->prepare_external($self->ext_canonicalize($loc));
+               }
+               # --external is enabled by default, but allow --no-external
+               if ($opt->{external} //= 1) {
+                       my %x = map {;
+                               ($self->ext_canonicalize($_), 1)
+                       } @{$self->{exclude} // []};
+                       my $ne = $self->externals_each(\&prep_ext, $lxs, \%x);
+                       $opt->{remote} //= !($lxs->locals - $opt->{'local'});
+                       if ($opt->{'local'}) {
+                               delete($lxs->{remotes}) if !$opt->{remote};
+                       } else {
+                               delete($lxs->{locals});
+                       }
                }
        }
        unless ($lxs->locals || $lxs->remotes) {
                return $self->fail('no local or remote inboxes to search');
        }
        my $xj = $lxs->concurrency($opt);
-       my $ovv = PublicInbox::LeiOverview->new($self) or return;
+       PublicInbox::LeiOverview->new($self) or return;
        $self->atfork_prepare_wq($lxs);
        $lxs->wq_workers_start('lei_xsearch', $xj, $self->oldset);
        delete $lxs->{-ipc_atfork_child_close};
@@ -51,6 +69,7 @@ sub lei_q {
 
        my %mset_opt = map { $_ => $opt->{$_} } qw(thread limit offset);
        $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;
+       $mset_opt{limit} //= 10000;
        $mset_opt{qstr} = join(' ', map {;
                # Consider spaces in argv to be for phrase search in Xapian.
                # In other words, the users should need only care about
@@ -71,10 +90,26 @@ sub lei_q {
        # descending docid order
        $mset_opt{relevance} //= -2 if $opt->{thread};
        $self->{mset_opt} = \%mset_opt;
-       $ovv->ovv_begin($self);
+       $self->{ovv}->ovv_begin($self);
        $lxs->do_query($self);
 }
 
+# shell completion helper called by lei__complete
+sub _complete_q {
+       my ($self, @argv) = @_;
+       my $ext = qr/\A(?:-I|(?:--(?:include|exclude|only)))\z/;
+       # $argv[-1] =~ $ext and return $self->_complete_forget_external;
+       my @cur;
+       while (@argv) {
+               if ($argv[-1] =~ $ext) {
+                       my @c = $self->_complete_forget_external(@cur);
+                       return @c if @c;
+               }
+               unshift(@cur, pop @argv);
+       }
+       ();
+}
+
 # Stuff we may pass through to curl (as of 7.64.0), see curl manpage for
 # details, so most options which make sense for HTTP/HTTPS (including proxy
 # support for Tor and other methods of getting past weird networks).