lei: use die for external and query handling

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index cb5ac8fb84a72a06907075c7a65c2a7d94c3aec6..56b82acc8b5b7da13cfc3dace4712e7d5f44b468 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
@@ -55,19 +53,17 @@ sub _start_query { # used by "lei q" and "lei up"
 }
 
 sub qstr_add { # PublicInbox::InputPipe::consume callback for --stdin
-       my ($self) = @_; # $_[1] = $rbuf
-       if (defined($_[1])) {
-               $_[1] eq '' and return eval {
-                       $self->fchdir or return;
-                       $self->{mset_opt}->{q_raw} = $self->{mset_opt}->{qstr};
-                       $self->{lse}->query_approxidate($self->{lse}->git,
-                                               $self->{mset_opt}->{qstr});
-                       _start_query($self);
-               };
-               $self->{mset_opt}->{qstr} .= $_[1];
-       } else {
-               $self->fail("error reading stdin: $!");
-       }
+       my ($lei) = @_; # $_[1] = $rbuf
+       $_[1] // $lei->fail("error reading stdin: $!");
+       return $lei->{mset_opt}->{qstr} .= $_[1] if $_[1] ne '';
+       eval {
+               $lei->fchdir;
+               $lei->{mset_opt}->{q_raw} = $lei->{mset_opt}->{qstr};
+               $lei->{lse}->query_approxidate($lei->{lse}->git,
+                                               $lei->{mset_opt}->{qstr});
+               _start_query($lei);
+       };
+       $lei->fail($@) if $@;
 }
 
 sub lxs_prepare {
@@ -114,7 +110,7 @@ sub lxs_prepare {
                }
        }
        ($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
@@ -158,11 +154,11 @@ no query allowed on command-line with --stdin
 # shell completion helper called by lei__complete
 sub _complete_q {
        my ($self, @argv) = @_;
-       my $ext = qr/\A(?:-I|(?:--(?:include|exclude|only)))\z/;
        my @cur;
+       my $cb = $self->lazy_cb(qw(forget-external _complete_));
        while (@argv) {
-               if ($argv[-1] =~ $ext) {
-                       my @c = $self->_complete_forget_external(@cur);
+               if ($argv[-1] =~ /\A(?:-I|(?:--(?:include|exclude|only)))\z/) {
+                       my @c = $cb->($self, @cur);
                        # try basename match:
                        if (scalar(@cur) == 1 && index($cur[0], '/') < 0) {
                                my $all = $self->externals_each;