treewide: update to v3 Tor onions

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 224eba69393152870ca77c475e77591049d24789..1999a5344885f22799b666459579d04d88aa9831 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -5,15 +5,15 @@
 package PublicInbox::LeiQuery;
 use strict;
 use v5.10.1;
-use POSIX ();
 
 sub prep_ext { # externals_each callback
        my ($lxs, $exclude, $loc) = @_;
        $lxs->prepare_external($loc) unless $exclude->{$loc};
 }
 
-sub _start_query {
+sub _start_query { # used by "lei q" and "lei up"
        my ($self) = @_;
+       require PublicInbox::LeiOverview;
        PublicInbox::LeiOverview->new($self) or return;
        my $opt = $self->{opt};
        my ($xj, $mj) = split(/,/, $opt->{jobs} // '');
@@ -22,22 +22,20 @@ sub _start_query {
        }
        my $lxs = $self->{lxs};
        $xj ||= $lxs->concurrency($opt); # allow: "--jobs ,$WRITER_ONLY"
-       my $nproc = $lxs->detect_nproc // 1; # don't memoize, schedtool(1) exists
+       my $nproc = $lxs->detect_nproc || 1; # don't memoize, schedtool(1) exists
        $xj = $nproc if $xj > $nproc;
        $lxs->{-wq_nr_workers} = $xj;
        if (defined($mj) && $mj !~ /\A[1-9][0-9]*\z/) {
                return $self->fail("`$mj' writer jobs must be >= 1");
        }
        my $l2m = $self->{l2m};
-       if ($l2m && ($opt->{'import-remote'} //= 1) |
-                               # we use \1 (a ref) to distinguish between
-                               # user-supplied and default value
-                               (($opt->{'import-before'} //= \1) ? 1 : 0)) {
+       # we use \1 (a ref) to distinguish between default vs. user-supplied
+       if ($l2m && grep { $opt->{$_} //= \1 } (qw(mail-sync import-remote
+                                                       import-before))) {
                $self->_lei_store(1)->write_prepare($self);
        }
        $l2m and $l2m->{-wq_nr_workers} = $mj // do {
-               $mj = POSIX::lround($nproc * 3 / 4); # keep some CPU for git
-               $mj <= 0 ? 1 : $mj;
+               $mj = int($nproc * 0.75 + 0.5); # keep some CPU for git
        };
 
        # descending docid order is cheapest, MUA controls sorting order
@@ -53,6 +51,10 @@ sub qstr_add { # PublicInbox::InputPipe::consume callback for --stdin
        my ($self) = @_; # $_[1] = $rbuf
        if (defined($_[1])) {
                $_[1] eq '' and return eval {
+                       if (my $dfd = $self->{3}) {
+                               chdir($dfd) or return $self->fail("fchdir: $!");
+                       }
+                       $self->{mset_opt}->{q_raw} = $self->{mset_opt}->{qstr};
                        $self->{lse}->query_approxidate($self->{lse}->git,
                                                $self->{mset_opt}->{qstr});
                        _start_query($self);
@@ -113,7 +115,6 @@ sub lxs_prepare {
 # the main "lei q SEARCH_TERMS" method
 sub lei_q {
        my ($self, @argv) = @_;
-       require PublicInbox::LeiOverview;
        PublicInbox::Config->json; # preload before forking
        my $lxs = lxs_prepare($self) or return;
        $self->ale->refresh_externals($lxs);
@@ -142,6 +143,7 @@ no query allowed on command-line with --stdin
                PublicInbox::InputPipe::consume($self->{0}, \&qstr_add, $self);
                return;
        }
+       $mset_opt{q_raw} = [ @argv ]; # copy
        $mset_opt{qstr} =
                $self->{lse}->query_argv_to_string($self->{lse}->git, \@argv);
        _start_query($self);