X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/58630a8d85739e139af830d0cef81beb0510fc60..843b8a4b9817d4d7d59f279ca2e74d2ae374fc78:/barcat diff --git a/barcat b/barcat index dfe6a10..35ef3b3 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.07'; +our $VERSION = '1.08'; my %opt; if (@ARGV) { @@ -53,11 +53,8 @@ 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 )], @@ -79,8 +76,9 @@ GetOptions(\%opt, '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 { @@ -108,6 +106,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' : ' ▁▂▃▄▅▆▇█') +] 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}; @@ -193,7 +194,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; @@ -202,7 +203,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; } } @@ -219,7 +220,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) { @@ -279,18 +280,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}->[ + !$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) : @@ -352,9 +354,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 @@ -374,20 +376,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 @@ -527,16 +531,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 @@ -563,10 +568,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. @@ -659,7 +664,7 @@ Activity graph of the last days (substitute date C<-v-{}d> on BSD): Sparkline graphics of simple input given as inline parameters: - barcat --spark= 3 1 4 1 5 0 9 2 4 + barcat -_ 3 1 4 1 5 0 9 2 4 =head1 AUTHOR