lei: more eval guards for die on failure

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index eb7b98d416fa20e2c323cad6d7d7eda2453c8a89..ec2ece0514929660cd9139a569cbfd8bc1c3875c 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -41,6 +41,12 @@ sub _start_query { # used by "lei q" and "lei up"
 
        # descending docid order is cheapest, MUA controls sorting order
        $self->{mset_opt}->{relevance} //= -2 if $l2m || $opt->{threads};
+
+       my $tot = $self->{mset_opt}->{total} //= $self->{opt}->{limit} // 10000;
+       $self->{mset_opt}->{limit} = $tot > 10000 ? 10000 : $tot;
+       $self->{mset_opt}->{offset} //= 0;
+       $self->{mset_opt}->{threads} //= $opt->{threads};
+
        if ($self->{net}) {
                require PublicInbox::LeiAuth;
                $self->{auth} = PublicInbox::LeiAuth->new
@@ -49,19 +55,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 {
@@ -73,7 +77,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});
@@ -116,11 +120,10 @@ 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);
+       my %mset_opt;
        $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;
-       $mset_opt{limit} //= 10000;
        if (defined(my $sort = $opt->{'sort'})) {
                if ($sort eq 'relevance') {
                        $mset_opt{relevance} = 1;
@@ -153,11 +156,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;
@@ -190,7 +193,7 @@ sub _complete_q {
 # analogues in git(1)? that would reduce likelyhood of conflicts with
 # our other CLI options
 # Note: some names are renamed to avoid potential conflicts,
-# see %lei2mail in lib/PublicInbox/LeiCurl.pm
+# see %lei2curl in lib/PublicInbox/LeiCurl.pm
 sub curl_opt { qw(
        curl-config=s@
        abstract-unix-socket=s anyauth basic cacert=s capath=s