lei q: import flags when clobbering/augmenting Maildirs

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index f71beae605aade29db986c514689f9684af0b73e..c630d62809a38fa1184cdcb71b7f8cd0e4d87b80 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -5,20 +5,30 @@
 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 qstr_add { # for --stdin
+sub _start_query {
+       my ($self) = @_;
+       if ($self->{net}) {
+               require PublicInbox::LeiAuth;
+               $self->{auth} = PublicInbox::LeiAuth->new
+       }
+       $self->{lxs}->do_query($self);
+}
+
+sub qstr_add { # PublicInbox::InputPipe::consume callback for --stdin
        my ($self) = @_; # $_[1] = $rbuf
        if (defined($_[1])) {
                $_[1] eq '' and return eval {
                        my $lse = delete $self->{lse};
                        $lse->query_approxidate($lse->git,
                                                $self->{mset_opt}->{qstr});
-                       $self->{lxs}->do_query($self);
+                       _start_query($self);
                };
                $self->{mset_opt}->{qstr} .= $_[1];
        } else {
@@ -41,6 +51,10 @@ sub lei_q {
        # we'll allow "--only $LOCATION --local"
        my $sto = $self->_lei_store(1);
        my $lse = $sto->search;
+       if (($opt->{'import-remote'} //= 1) |
+                       ($opt->{'import-augment'} //= 1)) {
+               $sto->write_prepare($self);
+       }
        if ($opt->{'local'} //= scalar(@only) ? 0 : 1) {
                $lxs->prepare_external($lse);
        }
@@ -78,14 +92,17 @@ sub lei_q {
                return $self->fail("`$xj' search jobs must be >= 1");
        }
        $xj ||= $lxs->concurrency($opt); # allow: "--jobs ,$WRITER_ONLY"
-       my $nproc = $lxs->detect_nproc; # don't memoize, schedtool(1) exists
+       my $nproc = $lxs->detect_nproc // 1; # don't memoize, schedtool(1) exists
        $xj = $nproc if $xj > $nproc;
-       $lxs->{jobs} = $xj;
+       $lxs->{-wq_nr_workers} = $xj;
        if (defined($mj) && $mj !~ /\A[1-9][0-9]*\z/) {
                return $self->fail("`$mj' writer jobs must be >= 1");
        }
-       $self->{l2m}->{jobs} = ($mj // $nproc) if $self->{l2m};
        PublicInbox::LeiOverview->new($self) or return;
+       $self->{l2m} and $self->{l2m}->{-wq_nr_workers} = $mj // do {
+               $mj = POSIX::lround($nproc * 3 / 4); # keep some CPU for git
+               $mj <= 0 ? 1 : $mj;
+       };
 
        my %mset_opt = map { $_ => $opt->{$_} } qw(threads limit offset);
        $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;
@@ -115,7 +132,7 @@ no query allowed on command-line with --stdin
                return;
        }
        $mset_opt{qstr} = $lse->query_argv_to_string($lse->git, \@argv);
-       $lxs->do_query($self);
+       _start_query($self);
 }
 
 # shell completion helper called by lei__complete