X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/7234e799b9983646e36ea2d4c7735807120f5bcf..86f0baa047d92c961adb8dc8527e955d1254ad0b:/barcat diff --git a/barcat b/barcat index ab5c023..4d3205f 100755 --- a/barcat +++ b/barcat @@ -6,10 +6,12 @@ use List::Util qw( min max sum ); use open qw( :std :utf8 ); use re '/msx'; -our $VERSION = '1.07'; +our $VERSION = '1.08'; -use Getopt::Long '2.33', qw( :config gnu_getopt ); my %opt; +if (@ARGV) { +require Getopt::Long; +Getopt::Long->import('2.33', qw( :config gnu_getopt )); GetOptions(\%opt, 'ascii|a!', 'color|c!', @@ -51,34 +53,42 @@ 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', 'unmodified|u!', 'width|w=i', - 'version' => sub { - say "barcat version $VERSION"; + 'version|V' => sub { + my $mascot = $opt{ascii} ? '=^,^=' : 'ฅ^•ﻌ•^ฅ'; + say "barcat $mascot version $VERSION"; exit; }, 'usage|h' => sub { @@ -92,6 +102,7 @@ GetOptions(\%opt, ); }, ) or exit 64; # EX_USAGE +} $opt{width} ||= $ENV{COLUMNS} || qx(tput cols) || 80 unless $opt{spark}; $opt{color} //= -t *STDOUT; # enable on tty @@ -105,6 +116,9 @@ $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}; @@ -190,7 +204,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; @@ -199,7 +213,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; } } @@ -216,7 +230,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) { @@ -276,18 +290,19 @@ while ($nr <= $limit) { $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) : @@ -349,9 +364,9 @@ sub show_exit { show_exit(); __END__ -Usage: - barcat [OPTIONS] [FILES|NUMBERS] - +Usage: /\_/\ + barcat [OPTIONS] [FILES|NUMBERS] (=•.•=) + (u u) Options: -a, --[no-]ascii Restrict user interface to ASCII characters -c, --[no-]color Force colored output of values and bar markers @@ -371,20 +386,22 @@ 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 -w, --width=COLUMNS Override the maximum number of columns to use -h, --usage Overview of available options - --help Full documentation - --version Version information + --help Full pod documentation + -V, --version Version information =encoding utf8 =head1 NAME -barcat - graph to visualize input values +barcat - concatenate texts with graph to visualize values =head1 SYNOPSIS @@ -524,16 +541,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 @@ -560,10 +578,10 @@ Overview of available options. =item --help -Full documentation -rendered by perldoc. +Full pod documentation +as rendered by perldoc. -=item --version +=item -V, --version Version information. @@ -581,7 +599,7 @@ Compare file sizes (with human-readable numbers): 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: @@ -599,7 +617,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: @@ -608,7 +626,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: @@ -618,10 +636,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: @@ -632,13 +647,13 @@ 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 And of course various Git statistics, such commit count by year: @@ -648,16 +663,20 @@ Or the top 3 most frequent authors with statistics over all: git shortlog -sn | barcat -L3 -s -Sparkline graphics of simple input given as inline parameters: - - barcat --spark= 3 1 4 1 5 0 9 2 4 - Activity graph 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--' | barcat --spark +Sparkline graphics of simple input given as inline parameters: + + 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 Mischa POSLAWSKY