lei up: support --exclude=, --no-(external|remote|local)

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index ec2ece0514929660cd9139a569cbfd8bc1c3875c..effc572f6aaf45e658b1434537081342e29efe7e 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -18,17 +18,15 @@ 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
@@ -97,22 +95,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