X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/ca702a0a92ec32abe108dcdde6299f696362e3ab..b8ecf0c19b1c9f899933a067a6958edf859927f8:/barcat?ds=sidebyside diff --git a/barcat b/barcat index 48e47d1..aa18957 100755 --- a/barcat +++ b/barcat @@ -1,10 +1,9 @@ #!/usr/bin/perl -CA -use 5.018; +use 5.014; use warnings; use utf8; use List::Util qw( min max sum ); use open qw( :std :utf8 ); -use experimental qw( lexical_subs ); our $VERSION = '1.06'; @@ -33,7 +32,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}) = @@ -48,10 +49,24 @@ GetOptions(\%opt, $opt{'graph-format'} = substr $_[1], 0, 1; }, 'spark:s' => sub { - $opt{spark} = [split //, $_[1] || '▁▂▃▄▅▆▇█']; + $opt{spark} = [split //, $_[1] || ' ▁▂▃▄▅▆▇█']; }, - 'palette:s' => sub { - $opt{palette} = [ split /\s/, $_[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', @@ -85,7 +100,7 @@ GetOptions(\%opt, }, ) or exit 64; # EX_USAGE -$opt{width} ||= $ENV{COLUMNS} || 80; +$opt{width} ||= $ENV{COLUMNS} || qx(tput cols) || 80 unless $opt{spark}; $opt{color} //= -t *STDOUT; # enable on tty $opt{'graph-format'} //= '-'; $opt{trim} *= $opt{width} / 100 if $opt{trimpct}; @@ -96,6 +111,7 @@ $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]; +$opt{input} = @ARGV && $ARGV[0] =~ m/\A[-0-9]/ ? \@ARGV : undef; my (@lines, @values, @order); @@ -117,7 +133,7 @@ if (defined $opt{interval}) { } my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)/x; -while (readline) { +while (defined ($_ = $opt{input} ? shift @{ $opt{input} } : readline)) { s/\r?\n\z//; s/^\h*// unless $opt{unmodified}; push @values, s/$valmatch/\n/ && $1; @@ -137,6 +153,10 @@ while (readline) { and $. % $opt{interval} == 0; } +if ($opt{'zero-missing'}) { + push @values, (0) x 10; +} + $SIG{INT} = 'DEFAULT'; sub color { @@ -153,8 +173,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[$_] } @@ -177,8 +197,9 @@ if ($opt{markers} and $size > 0) { else { return $func; } - }; - color(36) for $barmark[($pos - $minval) * $size] = $char; + } - $minval; + $pos >= 0 or next; + color(36) for $barmark[$pos * $size] = $char; } state $lastmax = $maxval; @@ -218,17 +239,25 @@ say( 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}} ]; + say '' if $opt{width} and $nr and $nr % $opt{width} == 0; + 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{palette} ? undef : - $val == $order[0] ? $opt{palette}->[-1] : # max - $val == $order[-1] ? $opt{palette}->[0] : # min - $opt{palette}->[1] // $opt{palette}->[0]; $val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val; color($color) for $val; } @@ -240,7 +269,7 @@ while ($nr <= $#lines) { continue { $nr++; } -say '' if $opt{spark}; +say $opt{palette} ? color(0) : '' if $opt{spark}; } @@ -248,12 +277,13 @@ sub show_stat { if ($opt{hidemin} or $opt{hidemax}) { $opt{hidemin} ||= 1; $opt{hidemax} ||= @lines; - printf '%s of ', sum(@values[$opt{hidemin} - 1 .. $opt{hidemax} - 1]) // 0; + printf '%s of ', sum(grep {length} @values[$opt{hidemin} - 1 .. $opt{hidemax} - 1]) // 0; } if (@order) { my $total = sum @order; - printf '%s total', color(1) . $total . color(0); - printf ' in %d values', scalar @values; + printf '%s total', color(1) . sprintf('%.8g', $total) . color(0); + printf ' in %d values', scalar @order; + printf ' over %d lines', scalar @lines if @order != @lines; printf(' (%s min, %s avg, %s max)', color(31) . $order[-1] . color(0), color(36) . (sprintf '%*.*f', 0, 2, $total / @order) . color(0), @@ -281,11 +311,12 @@ barcat - graph to visualize input values =head1 SYNOPSIS -B [] [] +B [] [... | ] =head1 DESCRIPTION -Visualizes relative sizes of values read from input (file(s) or STDIN). +Visualizes relative sizes of values read from input +(parameters, file(s) or STDIN). Contents are concatenated similar to I, but numbers are reformatted and a bar graph is appended to each line. @@ -343,7 +374,7 @@ 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, @@ -385,7 +416,13 @@ Indicated by default as I<=>. =back -=item --palette=... +=item --min=, --max= + +Bars extend from 0 or the minimum value if lower, +to the largest value encountered. +These options can be set to customize this range. + +=item --palette=( | ...) Override colors of parsed numbers. Can be any CSI escape, such as I<90> for default dark grey, @@ -501,8 +538,7 @@ USD/EUR exchange rate from CSV provided by the ECB: -Gd 'node=SEARCHRESULTS&q=EXR.D.USD.EUR.SP00.A&exportType=csv' | grep '^[12]' | barcat -f',\K' --value-length=7 -Total population history from the World Bank dataset (XML): -External datasets, like total population in XML from the World Bank: +Total population history in XML from the World Bank: curl http://api.worldbank.org/v2/country/1W/indicator/SP.POP.TOTL | xmllint --xpath '//*[local-name()="date" or local-name()="value"]' - |