tree-wide: Fix typo likelyhood

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index ec2ece0514929660cd9139a569cbfd8bc1c3875c..c998e5c0ed7bbf07a09eeb7179857cfce789620c 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -18,26 +18,27 @@ sub _start_query { # used by "lei q" and "lei up"
        PublicInbox::LeiOverview->new($self) or return;
        my $opt = $self->{opt};
        my ($xj, $mj) = split(/,/, $opt->{jobs} // '');
-       if (defined($xj) && $xj ne '' && $xj !~ /\A[1-9][0-9]*\z/) {
-               return $self->fail("`$xj' search jobs must be >= 1");
-       }
+       (defined($xj) && $xj ne '' && $xj !~ /\A[1-9][0-9]*\z/) and
+               die "`$xj' search jobs must be >= 1\n";
        my $lxs = $self->{lxs};
        $xj ||= $lxs->concurrency($opt); # allow: "--jobs ,$WRITER_ONLY"
        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");
-       }
+       (defined($mj) && $mj !~ /\A[1-9][0-9]*\z/) and
+               die "`$mj' writer jobs must be >= 1\n";
        my $l2m = $self->{l2m};
        # 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);
+               if ($opt->{'mail-sync'}) {
+                       my $lms = $l2m->{-lms_rw} = $self->lms(1);
+                       $lms->lms_write_prepare->lms_pause; # just create
+               }
        }
-       $l2m and $l2m->{-wq_nr_workers} = $mj // do {
-               $mj = int($nproc * 0.75 + 0.5); # keep some CPU for git
-       };
+       $l2m and $l2m->{-wq_nr_workers} //= $mj //
+               int($nproc * 0.75 + 0.5); # keep some CPU for git
 
        # descending docid order is cheapest, MUA controls sorting order
        $self->{mset_opt}->{relevance} //= -2 if $l2m || $opt->{threads};
@@ -97,22 +98,15 @@ sub lxs_prepare {
                }
                # --external is enabled by default, but allow --no-external
                if ($opt->{external} //= 1) {
-                       my %x;
-                       for my $loc (@{$opt->{exclude} // []}) {
-                               my @l = $self->get_externals($loc, 1) or return;
-                               $x{$_} = 1 for @l;
-                       }
-                       my $ne = $self->externals_each(\&prep_ext, $lxs, \%x);
+                       my $ex = $self->canonicalize_excludes($opt->{exclude});
+                       $self->externals_each(\&prep_ext, $lxs, $ex);
                        $opt->{remote} //= !($lxs->locals - $opt->{'local'});
-                       if ($opt->{'local'}) {
-                               $lxs->{remotes} = \@iremotes if !$opt->{remote};
-                       } else {
-                               $lxs->{locals} = \@ilocals;
-                       }
+                       $lxs->{locals} = \@ilocals if !$opt->{'local'};
+                       $lxs->{remotes} = \@iremotes if !$opt->{remote};
                }
        }
        ($lxs->locals || $lxs->remotes) ? ($self->{lxs} = $lxs) :
-               $self->fail('no local or remote inboxes to search');
+               die("no local or remote inboxes to search\n");
 }
 
 # the main "lei q SEARCH_TERMS" method
@@ -147,6 +141,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);
@@ -190,7 +185,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