From 52e864b5e7e45eafe559a28bad70b2f23fad7bf9 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 4 Feb 2021 00:59:24 -0900 Subject: lei q: only start pager if output is to stdout No need to be starting a pager if we're writing to a regular file. --- lib/PublicInbox/LeiOverview.pm | 3 +-- lib/PublicInbox/LeiXSearch.pm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm index e6bf4f2a..3125f015 100644 --- a/lib/PublicInbox/LeiOverview.pm +++ b/lib/PublicInbox/LeiOverview.pm @@ -78,9 +78,8 @@ sub new { if ($fmt =~ /\A($JSONL|(?:concat)?json)\z/) { $json = $self->{json} = ref(PublicInbox::Config->json); } - my ($isatty, $seekable); if ($dst eq '/dev/stdout') { - $isatty = -t $lei->{1}; + my $isatty = $lei->{need_pager} = -t $lei->{1}; $opt->{pretty} //= $isatty; if (!$isatty && -f _) { my $fl = fcntl($lei->{1}, F_GETFL, 0) // diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index e41d899e..0ca871ea 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -414,7 +414,7 @@ sub do_query { }; ($lei->{pkt_op_c}, $lei->{pkt_op_p}) = PublicInbox::PktOp->pair($ops); $lei->{1}->autoflush(1); - $lei->start_pager if -t $lei->{1}; + $lei->start_pager if delete $lei->{need_pager}; $lei->{ovv}->ovv_begin($lei); my $l2m = $lei->{l2m}; if ($l2m) { -- cgit v1.2.3-24-ge0c7