X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/dc38ca198369f674b29911f761338aac420f2db6..9fad4d7ae54232c20df3ea2d874c2483aaca6c3c:/barcat diff --git a/barcat b/barcat index 4cb2cd1..9cfe3e3 100755 --- a/barcat +++ b/barcat @@ -6,7 +6,7 @@ use List::Util qw( min max sum ); use open qw( :std :utf8 ); use experimental qw( lexical_subs ); -our $VERSION = '1.05'; +our $VERSION = '1.06'; use Getopt::Long '2.33', qw( :config gnu_getopt ); my %opt; @@ -33,7 +33,9 @@ GetOptions(\%opt, 'value-length=i', 'hidemin=i', 'hidemax=i', - 'limit|L=s' => sub { + 'minval=f', + 'maxval=f', + 'limit|L:s' => sub { my ($optname, $optval) = @_; $optval ||= 0; ($opt{hidemin}, $opt{hidemax}) = @@ -42,13 +44,39 @@ GetOptions(\%opt, " (range expected)\n" ); }, + 'header!', 'markers|m=s', + 'graph-format=s' => sub { + $opt{'graph-format'} = substr $_[1], 0, 1; + }, 'spark:s' => sub { - $opt{spark} = [split //, $_[1] || '⎽▁▂▃▄▅▆▇█']; + $opt{spark} = [split //, $_[1] || ' ▁▂▃▄▅▆▇█']; + }, + 'palette=s' => sub { + $opt{palette} = { + fire => [qw( 90 31 91 33 93 97 96 )], + fire88 => [map {"38;5;$_"} qw( + 80 32 48 64 68 72 76 77 78 79 47 + )], + fire256=> [map {"38;5;$_"} qw( + 235 52 88 124 160 196 + 202 208 214 220 226 227 228 229 230 231 159 + )], + ramp88 => [map {"38;5;$_"} qw( + 64 65 66 67 51 35 39 23 22 26 25 28 + )], + whites => [qw( 1;30 0;37 1;37 )], + greys => [map {"38;5;$_"} 52, 235..255, 47], + }->{$_[1]} // [ split /[^0-9;]/, $_[1] ]; }, 'stat|s!', + 'signal-stat=s', 'unmodified|u!', 'width|w=i', + 'version' => sub { + say "barcat version $VERSION"; + exit; + }, 'usage|h' => sub { local $/; my $pod = readline *DATA; @@ -73,23 +101,30 @@ GetOptions(\%opt, }, ) or exit 64; # EX_USAGE -$opt{width} ||= $ENV{COLUMNS} || 80; +$opt{width} ||= $ENV{COLUMNS} || qx(tput cols) || 80; $opt{color} //= -t *STDOUT; # enable on tty +$opt{'graph-format'} //= '-'; $opt{trim} *= $opt{width} / 100 if $opt{trimpct}; $opt{units} = [split //, ' kMGTPEZYyzafpnμm'] if $opt{'human-readable'}; $opt{anchor} //= qr/\A/; $opt{'value-length'} = 6 if $opt{units}; $opt{'value-length'} = 1 if $opt{unmodified}; +$opt{'signal-stat'} //= exists $SIG{INFO} ? 'INFO' : 'QUIT'; +$opt{markers} //= '=avg >31.73v <68.27v +50v |0'; +$opt{palette} //= $opt{color} && [31, 90, 32]; my (@lines, @values, @order); +$SIG{$_} = \&show_stat for $opt{'signal-stat'} || (); +$SIG{ALRM} = sub { + show_lines(); + alarm $opt{interval} if defined $opt{interval} and $opt{interval} > 0; +}; +$SIG{INT} = \&show_exit; + if (defined $opt{interval}) { $opt{interval} ||= 1; - $SIG{ALRM} = sub { - show_lines(); - alarm $opt{interval}; - }; - alarm $opt{interval}; + alarm $opt{interval} if $opt{interval} > 0; eval { require Tie::Array::Sorted; @@ -97,11 +132,6 @@ if (defined $opt{interval}) { } or warn $@, "Expect slowdown with large datasets!\n"; } -$SIG{INT} = sub { - $SIG{INT} = 'DEFAULT'; # reset for subsequent attempts - 'IGNORE' # continue after assumed eof -}; - my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)/x; while (readline) { s/\r?\n\z//; @@ -119,6 +149,8 @@ while (readline) { } } push @lines, $_; + show_lines() if defined $opt{interval} and $opt{interval} < 0 + and $. % $opt{interval} == 0; } $SIG{INT} = 'DEFAULT'; @@ -137,8 +169,8 @@ state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0; @lines > $nr or return unless $opt{hidemin}; @order = sort { $b <=> $a } @order unless tied @order; -my $maxval = ($opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] : $order[0]) // 0; -my $minval = min $order[-1] // (), 0; +my $maxval = $opt{maxval} // ($opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] : $order[0]) // 0; +my $minval = $opt{minval} // min $order[-1] // (), 0; my $lenval = $opt{'value-length'} // max map { length } @order; my $len = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 : max map { length $values[$_] && length $lines[$_] } @@ -147,14 +179,24 @@ my $size = ($maxval - $minval) && ($opt{width} - $lenval - $len) / ($maxval - $minval); # bar multiplication my @barmark; -if ($opt{markers} // 1 and $size > 0) { - my sub orderpos { (($order[$_[0]] + $order[$_[0] + .5]) / 2 - $minval) * $size } - $barmark[ (sum(@order) / @order - $minval) * $size ] = '='; # average - $barmark[ orderpos($#order * .31731) ] = '>'; - $barmark[ orderpos($#order * .68269) ] = '<'; - $barmark[ orderpos($#order / 2) ] = '+'; # mean - $barmark[ -$minval * $size ] = '|' if $minval < 0; # zero - color(36) for @barmark; +if ($opt{markers} and $size > 0) { + for my $markspec (split /\h/, $opt{markers}) { + my ($char, $func) = split //, $markspec, 2; + my $pos = eval { + if ($func eq 'avg') { + return sum(@order) / @order; + } + elsif ($func =~ /\A([0-9.]+)v\z/) { + my $index = $#order * $1 / 100; + return ($order[$index] + $order[$index + .5]) / 2; + } + else { + return $func; + } + } - $minval; + $pos >= 0 or next; + color(36) for $barmark[$pos * $size] = $char; + } state $lastmax = $maxval; if ($maxval > $lastmax) { @@ -182,37 +224,51 @@ sub sival { ); } +say( + color(31), sprintf('%*s', $lenval, $minval), + color(90), '-', color(36), '+', + color(32), sprintf('%*s', $size * ($maxval - $minval) - 3, $maxval), + color(90), '-', color(36), '+', + color(0), +) if $opt{header}; + while ($nr <= $#lines) { $nr >= $opt{hidemax} and last if defined $opt{hidemax}; my $val = $values[$nr]; + my $rel = length $val && ($val - $minval) / ($maxval - $minval); + my $color = !length $val || !$opt{palette} ? undef : + $val == $order[0] ? $opt{palette}->[-1] : # max + $val == $order[-1] ? $opt{palette}->[0] : # min + $opt{palette}->[ $rel * ($#{$opt{palette}} - 1) + 1 ]; if ($opt{spark}) { - print $opt{spark}->[ ($val - $minval) / $maxval * $#{$opt{spark}} ]; + print color($color), $opt{spark}->[ + !$val ? 0 : # blank + $val == $order[0] ? -1 : # max + $val == $order[-1] ? 1 : # min + $#{$opt{spark}} < 3 ? 1 : + $rel * ($#{$opt{spark}} - 3) + 2.5 + ]; next; } if (length $val) { - my $color = !$opt{color} ? undef : - $val == $order[0] ? 32 : # max - $val == $order[-1] ? 31 : # min - 90; $val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val; color($color) for $val; } my $line = $lines[$nr] =~ s/\n/$val/r; printf '%-*s', $len + length($val), $line; - print $barmark[$_] // '-' for 1 .. $size && (($values[$nr] || 0) - $minval) * $size + .5; + print $barmark[$_] // $opt{'graph-format'} for 1 .. $size && (($values[$nr] || 0) - $minval) * $size + .5; say ''; } continue { $nr++; } -say '' if $opt{spark}; +say $opt{palette} ? color(0) : '' if $opt{spark}; } -show_lines(); -if ($opt{stat}) { +sub show_stat { if ($opt{hidemin} or $opt{hidemax}) { $opt{hidemin} ||= 1; $opt{hidemax} ||= @lines; @@ -220,14 +276,26 @@ if ($opt{stat}) { } if (@order) { my $total = sum @order; - printf '%s total', $total; + printf '%s total', color(1) . $total . color(0); printf ' in %d values', scalar @values; - printf ' (%s min, %*.*f avg, %s max)', - $order[-1], 0, 2, $total / @order, $order[0]; + printf(' (%s min, %s avg, %s max)', + color(31) . $order[-1] . color(0), + color(36) . (sprintf '%*.*f', 0, 2, $total / @order) . color(0), + color(32) . $order[0] . color(0), + ); } say ''; } +sub show_exit { + show_lines(); + show_stat() if $opt{stat}; + exit 130 if @_; # 0x80+signo + exit; +} + +show_exit(); + __END__ =encoding utf8 @@ -273,6 +341,10 @@ A string can indicate the starting position of a value or capture the numbers itself, for example I<-f'(\d+)'> for the first digits anywhere. +=item --header + +Prepend a chart axis with minimum and maximum values labeled. + =item -H, --human-readable Format values using SI unit prefixes, @@ -280,9 +352,10 @@ turning long numbers like I<12356789> into I<12.4M>. Also changes an exponent I<1.602176634e-19> to I<160.2z>. Short integers are aligned but kept without decimal point. -=item -t, --interval[=] +=item -t, --interval[=(|-)] -Interval time to output partial progress. +Output partial progress every given number of seconds or input lines. +An update can also be forced by sending a I alarm signal. =item -l, --length=[-][%] @@ -294,44 +367,75 @@ 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. All input is still counted and analyzed for statistics, but disregarded for padding and bar size. -=item -m, --markers= +=item --graph-format= -Statistical positions to indicate on bars. -Cannot be customized yet, -only disabled by providing an empty argument. +Glyph to repeat for the graph line. +Defaults to a dash C<->. -Any value enables all marker characters: +=item -m, --markers= + +Statistical positions to indicate on bars. +A single indicator glyph precedes each position: =over 2 -=item B<=> +=item -Average: -the sum of all values divided by the number of counted lines. +Exact value to match on the axis. +A vertical bar at the zero crossing is displayed by I<|0> +for negative values. +For example I<:3.14> would show a colon at pi. -=item B<+> +=item I -Mean, median: +Ranked value at the given percentile. +The default shows I<+> at I<50v> for the mean or median; the middle value or average between middle values. +One standard deviation right of the mean is at about I<68.3v>. +The default includes I<< >31.73v <68.27v >> +to encompass all I results, or 68% of all entries, by B<< <--> >>. + +=item I -=item B<<> +Matches the average; +the sum of all values divided by the number of counted lines. +Indicated by default as I<=>. + +=back -Standard deviation left of the mean. -Only 16% of all values are lower. +=item --min=, --max= -=item B<< > >> +Bars extend from 0 or the minimum value if lower, +to the largest value encountered. +These options can be set to customize this range. -Standard deviation right of the mean. -The part between B<< <--> >> encompass all I results, -or 68% of all entries. +=item --palette=( | ...) -=back +Override colors of parsed numbers. +Can be any CSI escape, such as I<90> for default dark grey, +or alternatively I<1;30> for bold black. + +In case of additional colors, +the last is used for values equal to the maximum, the first for minima. +If unspecified, these are green and red respectively (I<31 90 32>). + +=item --spark[=] + +Replace lines by I, +single characters corresponding to input values. +A specified sequence of unicode characters will be used for +Of a specified sequence of unicode characters, +the first one will be used for non-values, +the last one for the maximum, +the second (if any) for the minimum, +and any remaining will be distributed over the range of values. +Unspecified, block fill glyphs U+2581-2588 will be used. =item -s, --stat