From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/4] lei: automatic pager support
Date: Tue, 5 Jan 2021 09:04:35 +0000 [thread overview]
Message-ID: <20210105090437.22801-3-e@80x24.org> (raw)
In-Reply-To: <20210105090437.22801-1-e@80x24.org>
Just like git, we'll start a pager when outputting to a terminal
for user-friendliness when reading many messages.
---
lib/PublicInbox/LEI.pm | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 9a3b1ee3..6073a713 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -19,7 +19,7 @@ use PublicInbox::Config;
use PublicInbox::Syscall qw(SFD_NONBLOCK EPOLLIN EPOLLONESHOT);
use PublicInbox::Sigfd;
use PublicInbox::DS qw(now dwaitpid);
-use PublicInbox::Spawn qw(spawn run_die);
+use PublicInbox::Spawn qw(spawn run_die popen_rd);
use PublicInbox::OnDestroy;
use Text::Wrap qw(wrap);
use File::Path qw(mkpath);
@@ -619,6 +619,26 @@ sub lei_git { # support passing through random git commands
dwaitpid($pid, \&reap_exec, $self);
}
+# caller needs to "-t $self->{1}" to check if tty
+sub start_pager {
+ my ($self) = @_;
+ my $env = $self->{env};
+ my $fh = popen_rd([qw(git var GIT_PAGER)], $env);
+ chomp(my $pager = <$fh> // '');
+ close($fh) or warn "`git var PAGER' error: \$?=$?";
+ return if $pager eq 'cat' || $pager eq '';
+ $env->{LESS} //= 'FRX';
+ $env->{LV} //= '-c';
+ $env->{COLUMNS} //= 80; # TODO TIOCGWINSZ
+ $env->{MORE} //= 'FRX' if $^O eq 'freebsd';
+ pipe(my ($r, $w)) or return warn "pipe: $!";
+ my $rdr = { 0 => $r, 1 => $self->{1}, 2 => $self->{2} };
+ $self->{1} = $w;
+ $self->{2} = $w if -t $self->{2};
+ $self->{'pager.pid'} = spawn([$pager], $env, $rdr);
+ $env->{GIT_PAGER_IN_USE} = 'true'; # we may spawn git
+}
+
sub accept_dispatch { # Listener {post_accept} callback
my ($sock) = @_; # ignore other
$sock->blocking(1);
@@ -794,6 +814,12 @@ sub oneshot {
# ensures stdout hits the FS before sock disconnects so a client
# can immediately reread it
-sub DESTROY { $_[0]->{1}->autoflush(1) }
+sub DESTROY {
+ my ($self) = @_;
+ $self->{1}->autoflush(1);
+ if (my $pid = delete $self->{'pager.pid'}) {
+ dwaitpid($pid, undef, $self->{sock});
+ }
+}
1;
next prev parent reply other threads:[~2021-01-05 9:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 9:04 [PATCH 0/4] more lei usability stuff Eric Wong
2021-01-05 9:04 ` [PATCH 1/4] lei: completion: fix filename completion Eric Wong
2021-01-05 9:04 ` Eric Wong [this message]
2021-01-05 9:04 ` [PATCH 3/4] lei: use client env as-is, drop daemon-env command Eric Wong
2021-01-05 9:04 ` [PATCH 4/4] address: pairs: new helper for JMAP (and maybe lei) Eric Wong
2021-01-05 9:24 ` JSON pretty-printing [was: [4/4] ... (and maybe lei)] 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=20210105090437.22801-3-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).