get rid of unnecessary bytes::length usage

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index efe328ccc3945a0af99c721af9549ed15eb67e11..962ad49ec9e0bb748c508f7edfedd6db4d828464 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -1,7 +1,8 @@
 # Copyright (C) 2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
-# handles lei <q|ls-query|rm-query|mv-query> commands
+# handles "lei q" command and provides internals for
+# several other sub-commands (up, lcat, ...)
 package PublicInbox::LeiQuery;
 use strict;
 use v5.10.1;
@@ -29,10 +30,9 @@ sub _start_query { # used by "lei q" and "lei up"
                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 {
@@ -52,9 +52,7 @@ 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->fchdir or return;
                        $self->{mset_opt}->{q_raw} = $self->{mset_opt}->{qstr};
                        $self->{lse}->query_approxidate($self->{lse}->git,
                                                $self->{mset_opt}->{qstr});
@@ -75,7 +73,7 @@ sub lxs_prepare {
        my @only = @{$opt->{only} // []};
        # --local is enabled by default unless --only is used
        # we'll allow "--only $LOCATION --local"
-       my $sto = $self->_lei_store(1); # FIXME: should not create
+       my $sto = $self->_lei_store(1);
        $self->{lse} = $sto->search;
        if ($opt->{'local'} //= scalar(@only) ? 0 : 1) {
                $lxs->prepare_external($self->{lse});
@@ -118,7 +116,7 @@ sub lei_q {
        my ($self, @argv) = @_;
        PublicInbox::Config->json; # preload before forking
        my $lxs = lxs_prepare($self) or return;
-       $self->ale->refresh_externals($lxs);
+       $self->ale->refresh_externals($lxs, $self);
        my $opt = $self->{opt};
        my %mset_opt = map { $_ => $opt->{$_} } qw(threads limit offset);
        $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;
@@ -133,6 +131,8 @@ sub lei_q {
                } else {
                        die "unrecognized --sort=$sort\n";
                }
+               $opt->{save} and return
+                       $self->fail('--save and --sort are incompatible');
        }
        $self->{mset_opt} = \%mset_opt;