X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/d6b73c4dac60665037514ef16f458b7ab70940d8..807f1103d68263f10a65d8bf7640f1401121f8b2:/barcat diff --git a/barcat b/barcat index 54141ee..431ed40 100755 --- a/barcat +++ b/barcat @@ -6,7 +6,7 @@ use List::Util qw( min max sum ); use open qw( :std :utf8 ); use re '/msx'; -our $VERSION = '1.08'; +our $VERSION = '1.09'; my %opt; if (@ARGV) { @@ -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) = @_; @@ -48,6 +54,7 @@ GetOptions(\%opt, " (range expected)\n" ); }, + 'log|e!', 'header!', 'markers|m=s', 'graph-format=s' => sub { @@ -57,6 +64,7 @@ GetOptions(\%opt, 'indicators:s', 'palette=s' => sub { $opt{palette} = { + '' => [], fire => [qw( 90 31 91 33 93 97 96 )], fire256=> [map {"38;5;$_"} qw( 235 52 88 124 160 196 @@ -64,6 +72,7 @@ GetOptions(\%opt, )], whites => [qw( 1;30 0;37 1;37 )], 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 @@ -74,9 +83,14 @@ GetOptions(\%opt, (map { 201 - $_ } 0..4), # -b 196, ], - }->{$_[1]} // [ split /[^0-9;]/, $_[1] ]; + }->{$_[1]} // do { + my @vals = split /[^0-9;]/, $_[1] + or die "Empty palette resulting from \"$_[1]\"\n"; + \@vals; + }; }, 'stat|s!', + 'report=s', 'signal-stat=s', 'unmodified|u!', 'width|w=i', @@ -99,27 +113,34 @@ 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'] +$opt{units} = [split //, ' kMGTPEZYRQqryzafpn'.($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{report} //= join(', ', + '${min; color(31)} min', + '${avg; $opt{reformat} or $_ = sprintf "%0.2f", $_; color(36)} avg', + '${max; color(32)} max', +); $opt{palette} //= $opt{color} && [31, 90, 32]; -$opt{indicators} = [split //, - $opt{indicators} || ($opt{ascii} ? ' .oO' : ' ▁▂▃▄▅▆▇█') +$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 @@ -136,7 +157,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); @@ -158,9 +180,8 @@ if (defined $opt{interval}) { } or warn $@, "Expect slowdown with large datasets!\n"; } -my $valmatch = qr< - $opt{anchor} ( \h* -? [0-9]* [.]? [0-9]+ (?: e[+-]?[0-9]+ )? |) ->x; +my $float = qr<[0-9]* [.]? [0-9]+ (?: e[+-]?[0-9]+ )?>; # positive numberish +my $valmatch = qr< $opt{anchor} ( \h* -? $float |) >x; while (defined ($_ = $opt{input} ? shift @{ $opt{input} } : readline)) { s/\r?\n\z//; s/\A\h*// unless $opt{unmodified}; @@ -183,10 +204,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 { @@ -219,40 +236,54 @@ my $maxval = $opt{maxval} // ( ) // 0; my $minval = $opt{minval} // min $order[-1] // (), 0; my $range = $maxval - $minval; +$range &&= log $range if $opt{log}; 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[$_] } 0 .. min $#lines, $opt{hidemax} || (); # left padding my $size = defined $opt{width} && $range && - ($opt{width} - $lenval - $len - !!$opt{indicators}) / $range; # bar multiplication + ($opt{width} - $lenval - $len - !!$opt{indicators}); # bar multiplication my @barmark; if ($opt{markers} and $size > 0) { for my $markspec (split /\h/, $opt{markers}) { my ($char, $func) = split //, $markspec, 2; - my $pos = eval { + my @pos = eval { if ($func eq 'avg') { return sum(@order) / @order; } elsif ($func =~ /\A([0-9.]+)v\z/) { - die "Invalid marker $char: percentile $1 out of bounds\n" if $1 > 100; + $1 <= 100 or die( + "Invalid marker $char: percentile $1 out of bounds\n" + ); my $index = $#order * $1 / 100; return ($order[$index] + $order[$index + .5]) / 2; } elsif ($func =~ /\A-?[0-9.]+\z/) { return $func; } + elsif ($func =~ /\A\/($float)\z/) { + my @range = my $multiple = my $next = $1; + while ($next < $maxval) { + $multiple *= 10 if $opt{log}; + push @range, $next += $multiple; + } + return @range; + } else { die "Unknown marker $char: $func\n"; } }; - defined $pos or do { + @pos or do { warn $@ if $@; next; }; - $pos -= $minval; - $pos >= 0 or next; - color(36) for $barmark[$pos * $size] = $char; + for my $pos (@pos) { + $pos -= $minval; + $pos &&= log $pos if $opt{log}; + $pos >= 0 or next; + color(36) for $barmark[$pos / $range * $size] = $char; + } } state $lastmax = $maxval; @@ -260,10 +291,10 @@ if ($opt{markers} and $size > 0) { print ' ' x ($lenval + $len); printf color(90); printf '%-*s', - ($lastmax - $minval) * $size + .5, - '-' x (($values[$nr - 1] - $minval) * $size); + ($lastmax - $minval) * $size / $range + .5, + '-' x (($values[$nr - 1] - $minval) * $size / $range); print color(92); - say '+' x (($range - $lastmax) * $size + .5); + say '+' x (($range - $lastmax) * $size / $range + .5); print color(0); $lastmax = $maxval; } @@ -272,20 +303,25 @@ if ($opt{markers} and $size > 0) { say( color(31), sprintf('%*s', $lenval, $minval), color(90), '-', color(36), '+', - color(32), sprintf('%*s', $size * $range - 3, $maxval), + color(32), sprintf('%*s', $size - 3, $maxval), color(90), '-', color(36), '+', color(0), ) if $opt{header}; while ($nr <= $limit) { my $val = $values[$nr]; - my $rel = length $val && $range && ($val - $minval) / $range; + my $rel; + if (length $val) { + $rel = $val - $minval; + $rel &&= log $rel if $opt{log}; + $rel = min(1, $rel / $range) if $range; # 0..1 + } 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}->[ - !$val || !$#{$opt{indicators}} ? 0 : # blank + !length($val) || !$#{$opt{indicators}} ? 0 : # blank $#{$opt{indicators}} < 2 ? 1 : $val >= $order[0] ? -1 : $rel * ($#{$opt{indicators}} - 1e-14) + 1 @@ -299,8 +335,9 @@ while ($nr <= $limit) { 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; @@ -309,8 +346,10 @@ while ($nr <= $limit) { next; } printf '%-*s', $len + length($val), $line; - print $barmark[$_] // $opt{'graph-format'} - for 1 .. $size && (($values[$nr] || 0) - $minval) * $size + .5; + if ($rel and $size) { + print $barmark[$_] // $opt{'graph-format'} + for 1 .. $rel * $size + .5; + } say ''; } continue { @@ -329,25 +368,51 @@ sub show_stat { $linemin += @lines; $linemax = @lines - $linemax; } - printf '%.8g of ', $opt{'sum-format'}->( - sum(grep {length} @values[$linemin .. $linemax]) // 0 - ); + print varfmt('${sum+} of ', { + lines => $linemax - $linemin + 1, + sum => sum(0, grep {length} @values[$linemin .. $linemax]), + }); } if (@order) { my $total = sum @order; - printf '%s total', color(1) . $opt{'sum-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), - ); + my $fmt = '${sum+;color(1)} total in ${count#} values'; + $fmt .= ' over ${lines#} lines' if @order != @lines; + $fmt .= " ($_)" for $opt{report} || (); + print varfmt($fmt, { + sum => $total, + count => int @order, + lines => int @lines, + min => $order[-1], + max => $order[0], + avg => $total / @order, + }); } say ''; return 1; } +sub varfmt { + my ($fmt, $vars) = @_; + $fmt =~ s[\$\{ \h*+ ((?: [^{}]++ | \{(?1)\} )+) \}]{ + my ($name, $cmd) = split /\s*;/, $1, 2; + my $format = $name =~ s/\+// || $name !~ s/\#// && $opt{reformat}; + local $_ = $vars->{$name}; + if (defined) { + $_ = $opt{'value-format'}->($_) if $format; + if ($cmd) { + eval $cmd; + warn "Error in \$$name report: $@" if $@; + } + $_; + } + else { + warn "Unknown variable \$$name in report\n"; + "\$$name"; + } + }eg; + return $fmt; +} + sub show_exit { show_lines(); show_stat() if $opt{stat}; @@ -363,18 +428,21 @@ 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 -l, --length=[-]SIZE[%] Trim line contents (between number and bars) -L, --limit[=(N|-LAST|START-[END])] Stop output after a number of lines + -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 --min=N, --max=N Bars extend from 0 or the minimum value if lower @@ -424,13 +492,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. @@ -441,6 +511,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 @@ -453,6 +524,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. @@ -478,6 +553,11 @@ A specific range can be given by two values. All input is still counted and analyzed for statistics, but disregarded for padding and bar size. +=item -e, --log + +Logarithmic (Ixponential) scale instead of linear +to compare orders of magnitude. + =item --graph-format= Glyph to repeat for the graph line. @@ -495,7 +575,12 @@ A single indicator glyph precedes each position: 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. +For example I<π3.14> would locate pi. + +=item I + +Repeated at every multiple of a number. +For example I<:/1> for a grid at every integer. =item I @@ -564,7 +649,9 @@ Reserved space for numbers. =item -w, --width= Override the maximum number of columns to use. -Appended graphics will extend to fill up the entire screen. +Appended graphics will extend to fill up the entire screen, +otherwise determined by the environment variable I +or by running the C command. =item -h, --usage @@ -591,6 +678,20 @@ 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 rss,pid,cmd | barcat -l40 @@ -613,19 +714,26 @@ Number of HTTP requests per day: cat httpd/access.log | cut -d\ -f4 | cut -d: -f1 | uniq -c | barcat -Any kind of database query with counts, preserving returned alignment: +Any kind of database query results, preserving returned alignment: - echo 'SELECT count(*),schemaname FROM pg_tables GROUP BY 2' | + echo 'SELECT sin(value * .1) FROM generate_series(0, 30) value' | psql -t | barcat -u -In PostgreSQL from within the client: +In PostgreSQL from within the client; a fancy C<\dt+> perhaps: - > SELECT sin(generate_series(0, 3, .1)) \g |barcat + > SELECT schemaname, relname, pg_total_relation_size(relid) + FROM pg_statio_user_tables ORDER BY idx_blks_hit + \g |barcat -uHf+ + +Same thing in SQLite (requires the sqlite3 client): + + > .once |barcat -Hf+ + > SELECT name, sum(pgsize) FROM dbstat GROUP BY 1; Earthquakes worldwide magnitude 1+ in the last 24 hours: curl https://earthquake.usgs.gov/earthquakes/feed/v1.0/summary/1.0_day.csv | - column -tns, | barcat -f4 -u -l80% + column -ts, -n | barcat -f4 -u -l80% External datasets, like movies per year: @@ -647,7 +755,12 @@ Total population history in XML from the World Bank: 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 + barcat -f1 -H --markers=+/1e9 + +Population and other information for all countries: + + curl http://download.geonames.org/export/dump/countryInfo.txt | + grep -v '^#\s' | column -ts$'\t' -n | barcat -f+2 -e -u -l150 -s And of course various Git statistics, such commit count by year: