X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiQuery.pm;h=358574eac255e8b3f218c11ee4bc0a39e4457ea6;hb=refs%2Fheads%2Fmaster;hp=df9c32b301d5be97c07eb4e4543267826f376bb2;hpb=fa04201baae9d1043e37cf8ef4e5a33fdd0498ff;p=public-inbox.git

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index df9c32b3..358574ea 100644
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -39,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};
@@ -71,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;
@@ -86,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'};