No ext_urls

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 3d0e5b144d3a9c939cc036e525283adc020c8a2c..358574eac255e8b3f218c11ee4bc0a39e4457ea6 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.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>
 
 # handles "lei q" command and provides internals for
@@ -6,6 +6,7 @@
 package PublicInbox::LeiQuery;
 use strict;
 use v5.10.1;
+use PublicInbox::OverIdx;
 
 sub prep_ext { # externals_each callback
        my ($lxs, $exclude, $loc) = @_;
@@ -17,6 +18,7 @@ sub _start_query { # used by "lei q" and "lei up"
        require PublicInbox::LeiOverview;
        PublicInbox::LeiOverview->new($self) or return;
        my $opt = $self->{opt};
+       PublicInbox::OverIdx::fork_ok($opt);
        my ($xj, $mj) = split(/,/, $opt->{jobs} // '');
        (defined($xj) && $xj ne '' && $xj !~ /\A[1-9][0-9]*\z/) and
                die "`$xj' search jobs must be >= 1\n";
@@ -37,8 +39,11 @@ sub _start_query { # used by "lei q" and "lei up"
                        $lms->lms_write_prepare->lms_pause; # just create
                }
        }
-       $l2m and $l2m->{-wq_nr_workers} = $mj //
-               int($nproc * 0.75 + 0.5); # keep some CPU for git
+       $l2m and $l2m->{-wq_nr_workers} //= $mj // do {
+               # keep some CPU for git, and don't overload IMAP destinations
+               my $n = int($nproc * 0.75 + 0.5);
+               $self->{net} && $n > 4 ? 4 : $n;
+       };
 
        # descending docid order is cheapest, MUA controls sorting order
        $self->{mset_opt}->{relevance} //= -2 if $l2m || $opt->{threads};
@@ -69,6 +74,12 @@ sub qstr_add { # PublicInbox::InputPipe::consume callback for --stdin
        $lei->fail($@) if $@;
 }
 
+# make the URI||PublicInbox::{Inbox,ExtSearch} a config-file friendly string
+sub cfg_ext ($) {
+       my ($x) = @_;
+       $x->isa('URI') ? "$x" : ($x->{inboxdir} // $x->{topdir});
+}
+
 sub lxs_prepare {
        my ($self) = @_;
        require PublicInbox::LeiXSearch;
@@ -84,21 +95,32 @@ sub lxs_prepare {
                $lxs->prepare_external($self->{lse});
        }
        if (@only) {
+               my $only;
                for my $loc (@only) {
                        my @loc = $self->get_externals($loc) or return;
-                       $lxs->prepare_external($_) for @loc;
+                       for (@loc) {
+                               my $x = $lxs->prepare_external($_);
+                               push(@$only, cfg_ext($x)) if $x;
+                       }
                }
+               $opt->{only} = $only if $only;
        } else {
-               my (@ilocals, @iremotes);
+               my (@ilocals, @iremotes, $incl);
                for my $loc (@{$opt->{include} // []}) {
                        my @loc = $self->get_externals($loc) or return;
-                       $lxs->prepare_external($_) for @loc;
+                       for (@loc) {
+                               my $x = $lxs->prepare_external($_);
+                               push(@$incl, cfg_ext($x)) if $x;
+                       }
                        @ilocals = @{$lxs->{locals} // []};
                        @iremotes = @{$lxs->{remotes} // []};
                }
+               $opt->{include} = $incl if $incl;
                # --external is enabled by default, but allow --no-external
                if ($opt->{external} //= 1) {
                        my $ex = $self->canonicalize_excludes($opt->{exclude});
+                       my @excl = keys %$ex;
+                       $opt->{exclude} = \@excl if scalar(@excl);
                        $self->externals_each(\&prep_ext, $lxs, $ex);
                        $opt->{remote} //= !($lxs->locals - $opt->{'local'});
                        $lxs->{locals} = \@ilocals if !$opt->{'local'};
@@ -141,6 +163,7 @@ no query allowed on command-line with --stdin
                PublicInbox::InputPipe::consume($self->{0}, \&qstr_add, $self);
                return;
        }
+       chomp(@argv) and $self->qerr("# trailing `\\n' removed");
        $mset_opt{q_raw} = [ @argv ]; # copy
        $mset_opt{qstr} =
                $self->{lse}->query_argv_to_string($self->{lse}->git, \@argv);
@@ -184,7 +207,7 @@ sub _complete_q {
 # FIXME: Getopt::Long doesn't easily let us support support options with
 # '.' in them (e.g. --http1.1)
 # TODO: should we depend on "-c http.*" options for things which have
-# analogues in git(1)? that would reduce likelyhood of conflicts with
+# analogues in git(1)? that would reduce likelihood of conflicts with
 # our other CLI options
 # Note: some names are renamed to avoid potential conflicts,
 # see %lei2curl in lib/PublicInbox/LeiCurl.pm