X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/e8e86ee4ef87d10f2ec46c09f2c7ccd51adb0cb2..cf2b124da358c7fb2e00c7b8e814b6b78bdfe004:/barcat diff --git a/barcat b/barcat index 9c4741a..a4ed12f 100755 --- a/barcat +++ b/barcat @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl -CA use 5.018; use warnings; use utf8; @@ -47,6 +47,9 @@ GetOptions(\%opt, ); }, 'markers|m=s', + 'spark:s' => sub { + $opt{spark} = [split //, $_[1] || '⎽▁▂▃▄▅▆▇█']; + }, 'stat|s!', 'unmodified|u!', 'width|w=i', @@ -60,6 +63,7 @@ $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}; my (@lines, @values, @order); @@ -77,7 +81,10 @@ if (defined $opt{interval}) { } or warn $@, "Expect slowdown with large datasets!\n"; } -$SIG{INT} = 'IGNORE'; # continue after assumed eof +$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) { @@ -87,6 +94,7 @@ while (readline) { push @order, $1 if length $1; if (defined $opt{trim} and defined $1) { my $trimpos = abs $opt{trim}; + $trimpos -= length $1 if $opt{unmodified}; if ($trimpos <= 1) { $_ = substr $_, 0, 1; } @@ -99,6 +107,12 @@ while (readline) { $SIG{INT} = 'DEFAULT'; +sub color { + $opt{color} and defined $_[0] or return ''; + return "\e[$_[0]m" if defined wantarray; + $_ = color(@_) . $_ . color(0) if defined; +} + sub show_lines { state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0; @@ -124,18 +138,18 @@ if ($opt{markers} // 1 and $size > 0) { $barmark[ orderpos($#order * .68269) ] = '<'; $barmark[ orderpos($#order / 2) ] = '+'; # mean $barmark[ -$minval * $size ] = '|' if $minval < 0; # zero - defined and $opt{color} and $_ = "\e[36m$_\e[0m" for @barmark; + color(36) for @barmark; state $lastmax = $maxval; if ($maxval > $lastmax) { print ' ' x ($lenval + $len); - printf "\e[90m" if $opt{color}; + printf color(90); printf '%-*s', ($lastmax - $minval) * $size + .5, '-' x (($values[$nr - 1] - $minval) * $size); - print "\e[92m" if $opt{color}; + print color(92); say '+' x (($maxval - $lastmax - $minval) * $size + .5); - print "\e[0m" if $opt{color}; + print color(0); $lastmax = $maxval; } } @@ -143,34 +157,41 @@ if ($opt{markers} // 1 and $size > 0) { @lines > $nr or return if $opt{hidemin}; sub sival { - my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1)); - my $float = $_[0] !~ /^ (?: 0*\.)? [0-9]{1,3} $/x; - sprintf('%*.*f%*s', - $float ? 5 : 3, $float, # length and tenths - $_[0] / 1000 ** $unit, # number - $float ? 0 : 3, # unit size - $#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit] + my $unit = int(log(abs $_[0] || 1) / log(10) - 3*($_[0] < 1) + 1e-15); + my $float = $_[0] !~ /^0*[-0-9]{1,3}$/; + sprintf('%3.*f%1s', + $float && ($unit % 3) == ($unit < 0), # tenths + $_[0] / 1000 ** int($unit/3), # number + $#{$opt{units}} * 1.5 < abs $unit ? "e$unit" : $opt{units}->[$unit/3] ); } while ($nr <= $#lines) { $nr >= $opt{hidemax} and last if defined $opt{hidemax}; my $val = $values[$nr]; + + if ($opt{spark}) { + print $opt{spark}->[ ($val - $minval) / $maxval * $#{$opt{spark}} ]; + next; + } + if (length $val) { - my $color = !$opt{color} ? 0 : + 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; - $val = "\e[${color}m$val\e[0m" if $color; + 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; say ''; - +} +continue { $nr++; } +say '' if $opt{spark}; } show_lines(); @@ -192,6 +213,7 @@ if ($opt{stat}) { } __END__ +=encoding utf8 =head1 NAME @@ -295,7 +317,7 @@ Total statistics after all data. =item -u, --unmodified -Do not strip leading whitespace. +Do not reformat values, keeping leading whitespace. Keep original value alignment, which may be significant in some programs. =item --value-length= @@ -315,15 +337,15 @@ Draw a sine wave: seq 30 | awk '{print sin($1/10)}' | barcat -Compare file sizes: +Compare file sizes (with human-readable numbers): - du -d0 -m * | barcat + du -d0 -b * | barcat -H -Memory usage of user processes: +Memory usage of user processes with long names truncated: ps xo %mem,pid,cmd | barcat -l40 -Monitor network latency: +Monitor network latency from prefixed results: ping google.com | barcat -f'time=\K' -t @@ -334,22 +356,30 @@ Commonly used after counting, for example users on the current server: Letter frequencies in text files: cat /usr/share/games/fortunes/*.u8 | - perl -CO -nE 'say for grep length, split /\PL*/, uc' | + perl -CS -nE 'say for grep length, split /\PL*/, uc' | sort | uniq -c | barcat Number of HTTP requests per day: cat log/access.log | cut -d\ -f4 | cut -d: -f1 | uniq -c | barcat -Any kind of database query with leading counts: +Any kind of database query with counts, preserving returned alignment: echo 'SELECT count(*),schemaname FROM pg_tables GROUP BY 2' | psql -t | barcat -u +Earthquakes worldwide magnitude 1+ in the last 24 hours: + + https://earthquake.usgs.gov/earthquakes/feed/v1.0/summary/1.0_day.csv | + column -tns, | graph -f4 -u -l80% + External datasets, like movies per year: curl https://github.com/prust/wikipedia-movie-data/raw/master/movies.json | - jq '.[].year' | uniq -c | barcat + 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' >>. Pokémon height comparison: @@ -377,6 +407,12 @@ Or the top 3 most frequent authors with statistics over all: git shortlog -sn | barcat -L3 -s +Activity of the last days (substitute date C<-v-{}d> on BSD): + + ( git log --pretty=%ci --since=30day | cut -b-10 + seq 0 30 | xargs -i date +%F -d-{}day ) | + sort | uniq -c | awk '$1--' | graph --spark + =head1 AUTHOR Mischa POSLAWSKY