X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/d6b73c4dac60665037514ef16f458b7ab70940d8..45f511dfa9c64725f7113a2a57a98435c3c1b09a:/barcat diff --git a/barcat b/barcat index 54141ee..2a931c6 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) = @_; @@ -57,6 +63,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 +71,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,7 +82,11 @@ 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!', 'signal-stat=s', @@ -99,27 +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{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 +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); @@ -183,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 { @@ -279,13 +290,13 @@ 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}->[ - !$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 +310,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; @@ -329,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 ''; @@ -363,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 @@ -424,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. @@ -441,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 @@ -453,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. @@ -564,7 +585,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 +614,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 @@ -625,7 +662,7 @@ In PostgreSQL from within the client: 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: @@ -649,6 +686,11 @@ Total population history in XML from the World Bank: 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 -ts$'\t' -n | barcat -f+2 -u -l150 -s + And of course various Git statistics, such commit count by year: git log --pretty=%ci | cut -b-4 | uniq -c | barcat