From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/3] lei: consolidate stdin slurp, fix warnings
Date: Tue, 17 Oct 2023 10:11:04 +0000 [thread overview]
Message-ID: <20231017101106.582556-2-e@80x24.org> (raw)
In-Reply-To: <20231017101106.582556-1-e@80x24.org>
We can share more code amongst stdin slurper (not streaming)
commands. This also fixes uninitialized variable warnings when
feeding an empty stdin to these commands.
---
lib/PublicInbox/LEI.pm | 13 +++++++++++++
lib/PublicInbox/LeiInspect.pm | 12 ++----------
lib/PublicInbox/LeiLcat.pm | 13 ++-----------
lib/PublicInbox/LeiQuery.pm | 14 +++-----------
t/lei.t | 5 +++++
5 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index b00be1a1..1ff6d67f 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -1573,4 +1573,17 @@ sub request_umask {
$u eq 'u' or warn "E: recv $v has no umask";
}
+sub _stdin_cb { # PublicInbox::InputPipe::consume callback for --stdin
+ my ($lei, $cb) = @_; # $_[-1] = $rbuf
+ $_[1] // return $lei->fail("error reading stdin: $!");
+ $lei->{stdin_buf} .= $_[-1];
+ do_env($lei, $cb) if $_[-1] eq '';
+}
+
+sub slurp_stdin {
+ my ($lei, $cb) = @_;
+ require PublicInbox::InputPipe;
+ PublicInbox::InputPipe::consume($lei->{0}, \&_stdin_cb, $lei, $cb);
+}
+
1;
diff --git a/lib/PublicInbox/LeiInspect.pm b/lib/PublicInbox/LeiInspect.pm
index 65c64cf2..d4ad03eb 100644
--- a/lib/PublicInbox/LeiInspect.pm
+++ b/lib/PublicInbox/LeiInspect.pm
@@ -253,20 +253,13 @@ sub inspect_start ($$) {
sub do_inspect { # lei->do_env cb
my ($lei) = @_;
- my $str = delete $lei->{istr};
+ my $str = delete $lei->{stdin_buf};
PublicInbox::Eml::strip_from($str);
my $eml = PublicInbox::Eml->new(\$str);
inspect_start($lei, [ 'blob:'.$lei->git_oid($eml)->hexdigest,
map { "mid:$_" } @{mids($eml)} ]);
}
-sub ins_add { # InputPipe->consume callback
- my ($lei) = @_; # $_[1] = $rbuf
- $_[1] // return $lei->fail("error reading stdin: $!");
- return $lei->{istr} .= $_[1] if $_[1] ne '';
- $lei->do_env(\&do_inspect);
-}
-
sub lei_inspect {
my ($lei, @argv) = @_;
$lei->{json} = ref(PublicInbox::Config::json())->new->utf8->canonical;
@@ -281,8 +274,7 @@ sub lei_inspect {
return $lei->fail(<<'') if @argv;
no args allowed on command-line with --stdin
- require PublicInbox::InputPipe;
- PublicInbox::InputPipe::consume($lei->{0}, \&ins_add, $lei);
+ $lei->slurp_stdin(\&do_inspect);
} else {
inspect_start($lei, \@argv);
}
diff --git a/lib/PublicInbox/LeiLcat.pm b/lib/PublicInbox/LeiLcat.pm
index 72875dc6..274a9605 100644
--- a/lib/PublicInbox/LeiLcat.pm
+++ b/lib/PublicInbox/LeiLcat.pm
@@ -124,18 +124,11 @@ could not extract Message-ID from $x
sub do_lcat { # lei->do_env cb
my ($lei) = @_;
- my @argv = split(/\s+/, $lei->{mset_opt}->{qstr});
+ my @argv = split(/\s+/, delete($lei->{stdin_buf}));
$lei->{mset_opt}->{qstr} = extract_all($lei, @argv) or return;
$lei->_start_query;
}
-sub _stdin { # PublicInbox::InputPipe::consume callback for --stdin
- my ($lei) = @_; # $_[1] = $rbuf
- $_[1] // return $lei->fail("error reading stdin: $!");
- return $lei->{mset_opt}->{qstr} .= $_[1] if $_[1] ne '';
- $lei->do_env(\&do_lcat);
-}
-
sub lei_lcat {
my ($lei, @argv) = @_;
my $lxs = $lei->lxs_prepare or return;
@@ -152,9 +145,7 @@ sub lei_lcat {
return $lei->fail(<<'') if @argv;
no args allowed on command-line with --stdin
- require PublicInbox::InputPipe;
- PublicInbox::InputPipe::consume($lei->{0}, \&_stdin, $lei);
- return;
+ return $lei->slurp_stdin(\&do_lcat);
}
$lei->{mset_opt}->{qstr} = extract_all($lei, @argv) or return;
$lei->_start_query;
diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index e2d8a096..eadf811f 100644
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -61,19 +61,13 @@ sub _start_query { # used by "lei q" and "lei up"
sub do_qry { # do_env cb
my ($lei) = @_;
- $lei->{mset_opt}->{q_raw} = $lei->{mset_opt}->{qstr};
+ $lei->{mset_opt}->{q_raw} = $lei->{mset_opt}->{qstr}
+ = delete $lei->{stdin_buf};
$lei->{lse}->query_approxidate($lei->{lse}->git,
$lei->{mset_opt}->{qstr});
_start_query($lei);
}
-sub qstr_add { # PublicInbox::InputPipe::consume callback for --stdin
- my ($lei) = @_; # $_[1] = $rbuf
- $_[1] // $lei->fail("error reading stdin: $!");
- return $lei->{mset_opt}->{qstr} .= $_[1] if $_[1] ne '';
- $lei->do_env(\&do_qry);
-}
-
# make the URI||PublicInbox::{Inbox,ExtSearch} a config-file friendly string
sub cfg_ext ($) {
my ($x) = @_;
@@ -159,9 +153,7 @@ sub lei_q {
return $self->fail(<<'') if @argv;
no query allowed on command-line with --stdin
- require PublicInbox::InputPipe;
- PublicInbox::InputPipe::consume($self->{0}, \&qstr_add, $self);
- return;
+ return $self->slurp_stdin(\&do_qry);
}
chomp(@argv) and $self->qerr("# trailing `\\n' removed");
$mset_opt{q_raw} = [ @argv ]; # copy
diff --git a/t/lei.t b/t/lei.t
index 3ac804a8..1dbc9d4c 100644
--- a/t/lei.t
+++ b/t/lei.t
@@ -182,6 +182,11 @@ my $test_fail = sub {
}
lei_ok('sucks', \'yes, but hopefully less every day');
like($lei_out, qr/loaded features/, 'loaded features shown');
+
+ lei_ok([qw(q --stdin -f text)], undef, { 0 => \'', %$lei_opt });
+ is($lei_err, '', 'no errors on empty stdin');
+ is($lei_out, '', 'no output on empty query');
+
SKIP: {
skip 'no curl', 3 unless require_cmd('curl', 1);
lei(qw(q --only http://127.0.0.1:99999/bogus/ t:m));
next prev parent reply other threads:[~2023-10-17 10:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-17 10:11 [PATCH 0/3] lei: stdin handling improvements Eric Wong
2023-10-17 10:11 ` Eric Wong [this message]
2023-10-17 10:11 ` [PATCH 2/3] input_pipe: improve error handling Eric Wong
2023-10-17 10:11 ` [RFC 3/3] input_pipe: handle noncanonical TTY Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231017101106.582556-2-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).