From 7dfac791260c54c3369e895d030a91b21ebdda43 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Sat, 26 Nov 2022 14:09:49 +0100 Subject: [PATCH] ending line count in limit range (prefix +) Similar to git log. --- barcat | 25 ++++++++++++------- t/t1506-limit_both_ways.out | 4 +++ ...et_#TODO.out => t1507-limit_backwards.out} | 0 3 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 t/t1506-limit_both_ways.out rename t/{t1506-limit_offset_#TODO.out => t1507-limit_backwards.out} (100%) diff --git a/barcat b/barcat index bf38f12..faabb3f 100755 --- a/barcat +++ b/barcat @@ -48,11 +48,13 @@ GetOptions(\%opt, my ($optname, $optval) = @_; $optval ||= 0; $optval =~ /\A-[0-9]+\z/ and $optval .= '-'; # tail shorthand + $optval =~ s/[+]/--/; ($opt{hidemin}, $opt{hidemax}) = - $optval =~ m/\A (?: (-? [0-9]+)? - )? ([0-9]+)? \z/ or die( + $optval =~ m/\A (?: (-? [0-9]+)? - )? (-? [0-9]+)? \z/ or die( "Value \"$optval\" invalid for option limit", " (range expected)\n" ); + s/\A-0*\z// and $_ ||= undef for $opt{hidemax} // (); }, 'log|e!', 'header!', @@ -221,7 +223,10 @@ state $nr = my $limit = $#lines; if (defined $opt{hidemax}) { - if ($opt{hidemin} and $opt{hidemin} < 0) { + if ($opt{hidemax} < 0) { + $limit = $nr - $opt{hidemax} - 1; + } + elsif ($opt{hidemin} and $opt{hidemin} < 0) { $limit -= $opt{hidemax} - 1; } elsif ($opt{hidemax} <= $limit) { @@ -440,8 +445,8 @@ Options: Output partial progress every given number of seconds or input lines -l, --length=[-]SIZE[%] Trim line contents (between number and bars) - -L, --limit[=(N|-LAST|START-[END])] - Stop output after a number of lines + -L, --limit=[N|[-]START(-[END]|+N)] + Select a range of lines to display -e, --log Logarithmic (exponential) scale instead of linear --graph-format=CHAR Glyph to repeat for the graph line -m, --markers=FORMAT Statistical positions to indicate on bars @@ -543,14 +548,16 @@ unless C<--length=0>. Prepend a dash (i.e. make negative) to enforce padding regardless of encountered contents. -=item -L, --limit[=( | - | -[])] +=item -L, --limit=[ | [-](-[] | +)] -Stop output after a number of lines. -A single value indicates the last line number (like C), +Select a range of lines to display. +A single integer indicates the last line number (like C), or first line counting from the bottom if negative (like C). -A specific range can be given by two values. -All input is still counted and analyzed for statistics, +A range consists of a starting line number followed by either +a dash C<-> to an optional end, or plus sign C<+> with count. + +All hidden input is still counted and analyzed for statistics, but disregarded for padding and bar size. =item -e, --log diff --git a/t/t1506-limit_both_ways.out b/t/t1506-limit_both_ways.out new file mode 100644 index 0000000..38fc7a8 --- /dev/null +++ b/t/t1506-limit_both_ways.out @@ -0,0 +1,4 @@ +barcat -L14+3 input/intsine.txt +9855 -----------------<----=-+----->---- +9975 -----------------<----=-+----->---- +9996 -----------------<----=-+----->---- diff --git a/t/t1506-limit_offset_#TODO.out b/t/t1507-limit_backwards.out similarity index 100% rename from t/t1506-limit_offset_#TODO.out rename to t/t1507-limit_backwards.out -- 2.30.0