X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/2bf96f1ac810eeec505dd404d221fcc1041c8caf..db6fdbe0afecc171f9aba2cb140c9aab0b387afd:/barcat diff --git a/barcat b/barcat index 095ee93..e3d291b 100755 --- a/barcat +++ b/barcat @@ -14,15 +14,21 @@ require Getopt::Long; Getopt::Long->import('2.33', qw( :config gnu_getopt )); GetOptions(\%opt, 'ascii|a!', - 'color|c!', - 'C' => sub { $opt{color} = 0 }, + 'color|C!', + 'M' => sub { $opt{color} = 0 }, 'field|f=s' => sub { eval { local $_ = $_[1]; - $opt{anchor} = /\A[0-9]+\z/ ? qr/(?:\S*\h+){$_}\K/ : qr/$_/; + s/\A[0-9]+\z/(?:\\S*\\h+){$_}\\K/; + s{\A[+]([0-9]*)\z}{ + (!!$1 && '(?:\d+\D+\b){'.$1.'}\K') . '\s* (?=\d)' + }e; + $opt{anchor} = qr/$_/; } or die $@ =~ s/(?:\ at\ \N+)?\Z/ for option $_[0]/r; }, 'human-readable|H!', + 'sexagesimal!', + 'reformat!', 'interval|t:i', 'trim|length|l=s' => sub { my ($optname, $optval) = @_; @@ -53,27 +59,34 @@ GetOptions(\%opt, 'graph-format=s' => sub { $opt{'graph-format'} = substr $_[1], 0, 1; }, - 'spark:s' => sub { - $opt{spark} = [split //, - $_[1] || ($opt{ascii} ? ' ..oOO' : ' ▁▂▃▄▅▆▇█') - ]; - }, + 'spark|_!', + 'indicators:s', '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] ]; + greys => [map {"38;5;$_"} 0, 232..255, 15], + random => [map {"38;5;$_"} List::Util::shuffle(17..231)], + rainbow=> [map {"38;5;$_"} + 196, # r + (map { 196 + $_*6 } 0..4), # +g + (map { 226 - $_*6*6 } 0..4), # -r + (map { 46 + $_ } 0..4), # +b + (map { 51 - $_*6 } 0..4), # -g + (map { 21 + $_*6*6 } 0..4), # +r + (map { 201 - $_ } 0..4), # -b + 196, + ], + }->{$_[1]} // do { + my @vals = split /[^0-9;]/, $_[1] + or die "Empty palette resulting from \"$_[1]\"\n"; + \@vals; + }; }, 'stat|s!', 'signal-stat=s', @@ -98,24 +111,29 @@ GetOptions(\%opt, } $opt{width} ||= $ENV{COLUMNS} || qx(tput cols) || 80 unless $opt{spark}; -$opt{color} //= -t *STDOUT; # enable on tty +$opt{color} //= $ENV{NO_COLOR} ? 0 : -t *STDOUT; # enable on tty $opt{'graph-format'} //= '-'; $opt{trim} *= $opt{width} / 100 if $opt{trimpct}; $opt{units} = [split //, ' kMGTPEZYyzafpn'.($opt{ascii} ? 'u' : 'μ').'m'] if $opt{'human-readable'}; $opt{anchor} //= qr/\A/; -$opt{'value-length'} = 6 if $opt{units}; +$opt{'value-length'} = 4 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]; +$opt{indicators} = [split //, $opt{indicators} || + ($opt{ascii} ? ' .oO' : $opt{spark} ? ' ▁▂▃▄▅▆▇█' : ' ▏▎▍▌▋▊▉█') +] if defined $opt{indicators} or $opt{spark}; $opt{hidemin} = ($opt{hidemin} || 1) - 1; $opt{input} = (@ARGV && $ARGV[0] =~ m/\A[-0-9]/) ? \@ARGV : undef and undef $opt{interval}; -$opt{'sum-format'} = sub { sprintf '%.8g', $_[0] }; $opt{'calc-format'} = sub { sprintf '%*.*f', 0, 2, $_[0] }; -$opt{'value-format'} = $opt{units} && sub { +$opt{'value-format'} = $opt{sexagesimal} ? sub { + my $s = abs($_[0]) + .5; + sprintf('%s%d:%02d:%02d', $_[0] < 0 && '-', $s/3600, $s/60%60, $s%60); +} : $opt{units} && sub { my $unit = ( log(abs $_[0] || 1) / log(10) - 3 * (abs($_[0]) < .9995) # shift to smaller unit if below 1 @@ -132,7 +150,8 @@ $opt{'value-format'} = $opt{units} && sub { $#{$opt{units}} * 1.5 < abs $unit ? sprintf('e%d', $unit) : $opt{units}->[$unit/3] # suffix ); -}; +} and $opt{reformat}++; +$opt{'value-format'} ||= sub { sprintf '%.8g', $_[0] }; my (@lines, @values, @order); @@ -179,10 +198,6 @@ while (defined ($_ = $opt{input} ? shift @{ $opt{input} } : readline)) { and $. % $opt{interval} == 0; } -if ($opt{'zero-missing'}) { - push @values, (0) x 10; -} - $SIG{INT} = 'DEFAULT'; sub color { @@ -194,7 +209,7 @@ sub color { sub show_lines { state $nr = - $opt{hidemin} < 0 ? @lines + $opt{hidemin} + 1 : + $opt{hidemin} < 0 ? max(0, @lines + $opt{hidemin} + 1) : $opt{hidemin}; @lines > $nr or return; @@ -203,7 +218,7 @@ if (defined $opt{hidemax}) { if ($opt{hidemin} and $opt{hidemin} < 0) { $limit -= $opt{hidemax} - 1; } - else { + elsif ($opt{hidemax} <= $limit) { $limit = $opt{hidemax} - 1; } } @@ -220,7 +235,7 @@ my $len = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 : max map { length $values[$_] && length $lines[$_] } 0 .. min $#lines, $opt{hidemax} || (); # left padding my $size = defined $opt{width} && $range && - ($opt{width} - $lenval - $len) / $range; # bar multiplication + ($opt{width} - $lenval - $len - !!$opt{indicators}) / $range; # bar multiplication my @barmark; if ($opt{markers} and $size > 0) { @@ -275,27 +290,29 @@ say( while ($nr <= $limit) { my $val = $values[$nr]; - my $rel = length $val && $range && ($val - $minval) / $range; + my $rel = length $val && $range && min(1, ($val - $minval) / $range); 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 ]; + my $indicator = $opt{indicators} && $opt{indicators}->[ + !length($val) || !$#{$opt{indicators}} ? 0 : # blank + $#{$opt{indicators}} < 2 ? 1 : + $val >= $order[0] ? -1 : + $rel * ($#{$opt{indicators}} - 1e-14) + 1 + ]; if ($opt{spark}) { say '' if $opt{width} and $nr and $nr % $opt{width} == 0; - print color($color), $opt{spark}->[ - !$val || !$#{$opt{spark}} ? 0 : # blank - $val == $order[0] ? -1 : # max - $val == $order[-1] ? 1 : # min - $#{$opt{spark}} < 3 ? 1 : - $rel * ($#{$opt{spark}} - 3) + 2.5 - ]; + print color($color), $_ for $indicator; next; } + print $indicator if defined $indicator; if (length $val) { - $val = $opt{'value-format'} ? $opt{'value-format'}->($val) : - sprintf "%*s", $lenval, $val; + $val = sprintf("%*s", $lenval, + $opt{reformat} ? $opt{'value-format'}->($val) : $val + ); color($color) for $val; } my $line = $lines[$nr] =~ s/\n/$val/r; @@ -324,19 +341,19 @@ sub show_stat { $linemin += @lines; $linemax = @lines - $linemax; } - printf '%.8g of ', $opt{'sum-format'}->( + printf '%.8g of ', $opt{'value-format'}->( sum(grep {length} @values[$linemin .. $linemax]) // 0 ); } if (@order) { my $total = sum @order; - printf '%s total', color(1) . $opt{'sum-format'}->($total) . color(0); + printf '%s total', color(1) . $opt{'value-format'}->($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) . ($opt{'value-format'} || sub {$_[0]})->($order[-1]) . color(0), - color(36) . ($opt{'value-format'} || $opt{'calc-format'})->($total / @order) . color(0), - color(32) . ($opt{'value-format'} || sub {$_[0]})->($order[0]) . color(0), + color(31) . ($opt{reformat} ? $opt{'value-format'} : sub {$_[0]})->($order[-1]) . color(0), + color(36) . ($opt{reformat} ? $opt{'value-format'} : $opt{'calc-format'})->($total / @order) . color(0), + color(32) . ($opt{reformat} ? $opt{'value-format'} : sub {$_[0]})->($order[0]) . color(0), ); } say ''; @@ -358,12 +375,14 @@ Usage: /\_/\ (u u) Options: -a, --[no-]ascii Restrict user interface to ASCII characters - -c, --[no-]color Force colored output of values and bar markers - -f, --field=(N|REGEXP) Compare values after a given number of whitespace + -C, --[no-]color Force colored output of values and bar markers + -f, --field=([+]N|REGEXP) + Compare values after a given number of whitespace separators --header Prepend a chart axis with minimum and maximum values labeled -H, --human-readable Format values using SI unit prefixes + --sexagesimal Convert seconds to HH:MM:SS time format -t, --interval[=(N|-LINES)] Output partial progress every given number of seconds or input lines @@ -375,7 +394,9 @@ Options: --min=N, --max=N Bars extend from 0 or the minimum value if lower --palette=(PRESET|COLORS) Override colors of parsed numbers - --spark[=CHARS] Replace lines by sparklines + -_, --spark Replace lines by sparklines + --indicators[=CHARS] Prefix a unicode character corresponding to each + value -s, --stat Total statistics after all data -u, --unmodified Do not reformat values, keeping leading whitespace --value-length=SIZE Reserved space for numbers @@ -417,13 +438,15 @@ Restrict user interface to ASCII characters, replacing default UTF-8 by their closest approximation. Input is always interpreted as UTF-8 and shown as is. -=item -c, --[no-]color +=item -C, --[no-]color Force colored output of values and bar markers. Defaults on if output is a tty, disabled otherwise such as when piped or redirected. +Can also be disabled by setting I<-M> +or the I environment variable. -=item -f, --field=( | ) +=item -f, --field=([+] | ) Compare values after a given number of whitespace separators, or matching a regular expression. @@ -434,6 +457,7 @@ A string can indicate the starting position of a value (such as I<-f:> if preceded by colons), or capture the numbers itself, for example I<-f'(\d+)'> for the first digits anywhere. +A shorthand for this is I<+0>, or I<+N> to find the Nth number. =item --header @@ -446,6 +470,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 --sexagesimal + +Convert seconds to HH:MM:SS time format. + =item -t, --interval[=( | -)] Output partial progress every given number of seconds or input lines. @@ -528,16 +556,17 @@ relative to the size of values. Predefined color schemes are named I and I, or I and I for 256-color variants. -=item --spark[=] +=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. +single characters (configured by C<--indicators>) +corresponding to input values. + +=item --indicators[=] + +Prefix a unicode character corresponding to each value. +The first specified character will be used for non-values, +the remaining sequence will be distributed over the range of values. Unspecified, block fill glyphs U+2581-2588 will be used. =item -s, --stat @@ -583,9 +612,23 @@ Compare file sizes (with human-readable numbers): du -d0 -b * | barcat -H +Same from formatted results, selecting the first numeric value: + + tree -s --noreport | barcat -H -f+ + +Compare media metadata, like image size or play time: + + exiftool -T -p '$megapixels ($imagesize) $filename' * | barcat + + exiftool -T -p '$duration# $avgbitrate# $filename' * | barcat --sexagesimal + + find -type f -print0 | xargs -0 -L1 \ + ffprobe -show_format -of json -v error | + jq -r '.format|.duration+" "+.bit_rate+" "+.filename' | barcat --sex + Memory usage of user processes with long names truncated: - ps xo %mem,pid,cmd | barcat -l40 + ps xo rss,pid,cmd | barcat -l40 Monitor network latency from prefixed results: @@ -603,7 +646,7 @@ Letter frequencies in text files: Number of HTTP requests per day: - cat log/access.log | cut -d\ -f4 | cut -d: -f1 | uniq -c | barcat + cat httpd/access.log | cut -d\ -f4 | cut -d: -f1 | uniq -c | barcat Any kind of database query with counts, preserving returned alignment: @@ -612,7 +655,7 @@ Any kind of database query with counts, preserving returned alignment: In PostgreSQL from within the client: - postgres=> SELECT sin(generate_series(0, 3, .1)) \g |barcat + > SELECT sin(generate_series(0, 3, .1)) \g |barcat Earthquakes worldwide magnitude 1+ in the last 24 hours: @@ -622,10 +665,7 @@ Earthquakes worldwide magnitude 1+ in the last 24 hours: External datasets, like movies per year: curl https://github.com/prust/wikipedia-movie-data/raw/master/movies.json -L | - perl -054 -nlE 'say if s/^"year"://' | uniq -c | barcat - -But please get I to process JSON -and replace the manual selection by C<< jq '.[].year' >>. + jq .[].year | uniq -c | barcat Pokémon height comparison: @@ -636,13 +676,18 @@ USD/EUR exchange rate from CSV provided by the ECB: curl https://sdw.ecb.europa.eu/export.do \ -Gd 'node=SEARCHRESULTS&q=EXR.D.USD.EUR.SP00.A&exportType=csv' | - grep '^[12]' | barcat -f',\K' --value-length=7 + barcat -f',\K' --value-length=7 Total population history in XML from the World Bank: - curl http://api.worldbank.org/v2/country/1W/indicator/SP.POP.TOTL -L | - xmllint --xpath '//*[local-name()="date" or local-name()="value"]' - | - sed -r 's,,\n,g; s,(<[^>]+>)+, ,g' | barcat -f1 -H + curl http://api.worldbank.org/v2/country/1W/indicator/SP.POP.TOTL | + xmlstarlet sel -t -m '*/*' -v wb:date -o ' ' -v wb:value -n | + barcat -f1 -H + +Population and other information for all countries: + + curl http://download.geonames.org/export/dump/countryInfo.txt | + grep -v '^#\s' | column -tns$'\t' | barcat -f+2 -u -l150 -s And of course various Git statistics, such commit count by year: @@ -660,7 +705,11 @@ Activity graph of the last days (substitute date C<-v-{}d> on BSD): Sparkline graphics of simple input given as inline parameters: - barcat --spark= 3 1 4 1 5 0 9 2 4 + barcat -_ 3 1 4 1 5 0 9 2 4 + +Misusing the spark functionality to draw a lolcat line: + + seq $(tput cols) | barcat --spark --indicator=- --palette=rainbow =head1 AUTHOR