X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/ef0556b2123644377182a9f43a4b2a753cb571a6..e8e00f42da0ae898ded80b3f79b2d9f2ebef7a44:/graph diff --git a/graph b/graph index d317df5..ea17d45 100755 --- a/graph +++ b/graph @@ -1,19 +1,36 @@ #!/usr/bin/env perl -use 5.014; +use 5.018; use warnings; use utf8; use List::Util qw( min max sum ); use open qw( :std :utf8 ); +use experimental qw( lexical_subs ); our $VERSION = '1.02'; use Getopt::Long '2.33', qw( :config gnu_getopt ); -sub podexit { require Pod::Usage; Pod::Usage::pod2usage(-exitval => 0, @_) } -GetOptions(\my %opt, +sub podexit { + require Pod::Usage; + Pod::Usage::pod2usage(-exitval => 0, -perldocopt => '-oman', @_); +} +my %opt; +GetOptions(\%opt, 'color|c!', - 'follow|f:i', - 'trim|length|l=i', + 'C' => sub { $opt{color} = 0 }, + 'field|f=s', + 'interval|t:i', + 'trim|length|l=s' => sub { + my ($optname, $optval) = @_; + $optval =~ s/%$// and $opt{trimpct}++; + $optval =~ m/^-?[0-9]+$/ or die( + "Value \"$optval\" invalid for option $optname", + " (number or percentage expected)\n" + ); + $opt{trim} = $optval; + }, + 'value-length=i', 'markers|m=s', + 'unmodified|u!', 'width|w=i', 'usage|h' => sub { podexit() }, 'help' => sub { podexit(-verbose => 2) }, @@ -21,22 +38,27 @@ GetOptions(\my %opt, $opt{width} ||= $ENV{COLUMNS} || 80; $opt{color} //= -t *STDOUT; # enable on tty +$opt{trim} *= $opt{width} / 100 if $opt{trimpct}; -if (defined $opt{follow}) { - $opt{follow} ||= 1; +if (defined $opt{interval}) { + $opt{interval} ||= 1; $SIG{ALRM} = sub { show_lines(); - alarm $opt{follow}; + alarm $opt{interval}; }; - alarm $opt{follow}; + alarm $opt{interval}; } $SIG{INT} = 'IGNORE'; # continue after assumed eof my (@lines, @values); +my $anchor = !defined $opt{field} ? qr/\A/ : + $opt{field} =~ /^[0-9]+$/ ? qr/(?:\S*\h+){$opt{field}}\K/ : + $opt{field}; while (readline) { - chomp; - push @values, s/^\h* ( -? [0-9]* (?:\.[0-9]+)? )//x && $1; + s/\r?\n\z//; + s/^\h*// unless $opt{unmodified}; + push @values, s/$anchor ( \h* -? [0-9]* \.? [0-9]+ |)/\n/x && $1; if (defined $opt{trim}) { my $trimpos = abs $opt{trim}; if ($trimpos <= 1) { @@ -48,18 +70,20 @@ while (readline) { } push @lines, $_; } -@lines or exit; $SIG{INT} = 'DEFAULT'; sub show_lines { +state $nr = 0; +@lines and @lines > $nr or return; + my @order = sort { $b <=> $a } grep { length } @values; my $maxval = $order[0]; my $minval = min $order[-1], 0; -my $lenval = max map { length } @order; +my $lenval = $opt{'value-length'} // max map { length } @order; my $len = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 : - 1 + max map { length } @lines; # left padding + max map { length $values[$_] && length $lines[$_] } 0 .. $#lines; # left padding my $size = ($maxval - $minval) && ($opt{width} - $lenval - $len) / ($maxval - $minval); # bar multiplication @@ -72,9 +96,21 @@ if ($opt{markers} // 1 and $size > 0) { $barmark[ orderpos($#order / 2) ] = '+'; # mean $barmark[ -$minval * $size ] = '|' if $minval < 0; # zero defined and $opt{color} and $_ = "\e[36m$_\e[0m" for @barmark; + + state $lastmax = $maxval; + if ($maxval > $lastmax) { + print ' ' x ($lenval + $len); + printf "\e[90m" if $opt{color}; + printf '%-*s', + ($lastmax - $minval) * $size + .5, + '-' x (($values[$nr - 1] - $minval) * $size); + print "\e[92m" if $opt{color}; + say '+' x (($maxval - $lastmax - $minval) * $size + .5); + print "\e[0m" if $opt{color}; + $lastmax = $maxval; + } } -state $nr = 0; while ($nr <= $#lines) { my $val = $values[$nr]; if (length $val) { @@ -82,12 +118,12 @@ while ($nr <= $#lines) { $val == $order[0] ? 32 : # max $val == $order[-1] ? 31 : # min 90; - printf "\e[%sm", $color if $color; - printf "%*s", $lenval, $val; - print "\e[0m" if $color; + $val = sprintf "%*s", $lenval, $val; + $val = "\e[${color}m$val\e[0m" if $color; } - printf '%-*s', $len, $lines[$nr]; - print $barmark[$_] // '-' for 1 .. $size && (($val || 0) - $minval) * $size; + my $line = $lines[$nr] =~ s/\n/$val/r; + printf '%-*s', $len + length($val), $line; + print $barmark[$_] // '-' for 1 .. $size && (($values[$nr] || 0) - $minval) * $size; say ''; $nr++; } @@ -107,7 +143,9 @@ B [] [] =head1 DESCRIPTION -Each line starting with a number is given a bar to visualise relative sizes. +Visualizes relative sizes of values read from input (file(s) or STDIN). +Contents are concatenated similar to I, +but numbers are reformatted and a bar graph is appended to each line. =head1 OPTIONS @@ -119,11 +157,23 @@ Force colored output of values and bar markers. Defaults on if output is a tty, disabled otherwise such as when piped or redirected. -=item -f, --follow[=] +=item -f, --field=(|) -Interval to output partial progress. +Compare values after a given number of whitespace separators, +or matching a regular expression. -=item -l, --length=[-] +Unspecified or I<-f0> means values are at the start of each line. +With I<-f1> the second word is taken instead. +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. + +=item -t, --interval[=] + +Interval time to output partial progress. + +=item -l, --length=[-][%] Trim line contents (between number and bars) to a maximum number of characters. @@ -166,6 +216,15 @@ or 68% of all entries. =back +=item -u, --unmodified + +Do not strip leading whitespace. +Keep original value alignment, which may be significant in some programs. + +=item --value-length= + +Reserved space for numbers. + =item -w, --width= Override the maximum number of columns to use. @@ -200,7 +259,29 @@ Number of HTTP requests per day: Any kind of database query with leading counts: echo 'SELECT count(*),schemaname FROM pg_tables GROUP BY 2' | - psql -t | graph + psql -t | graph -u + +Exchange rate USD/EUR history from CSV download provided by ECB: + + curl https://sdw.ecb.europa.eu/export.do \ + -Gd 'node=SEARCHRESULTS&q=EXR.D.USD.EUR.SP00.A&exportType=csv' | + grep '^[12]' | graph -f',\K' --value-length=7 + +Total population history from the World Bank dataset (XML): + + curl http://api.worldbank.org/v2/country/1W/indicator/SP.POP.TOTL | + xmllint --xpath '//*[local-name()="date" or local-name()="value"]' - | + sed -r 's,,\n,g; s,(<[^>]+>)+, ,g' | graph -f1 + +Movies per year from prepared JSON data: + + curl https://github.com/prust/wikipedia-movie-data/raw/master/movies.json | + jq '.[].year' | uniq -c | graph + +Pokémon height comparison: + + curl https://github.com/Biuni/PokemonGO-Pokedex/raw/master/pokedex.json | + jq -r '.pokemon[] | [.height,.num,.name] | join(" ")' | graph Git statistics, such commit count by year: @@ -212,8 +293,7 @@ Or the most frequent authors: Latency history: - ping google.com | - perl -pe '$|=1; print s/ time=(.*)// ? "$1 for " : "> "' | graph -f + ping google.com | graph -f'time=\K' -t =head1 AUTHOR