use open qw( :std :utf8 );
use experimental qw( lexical_subs );
-our $VERSION = '1.05';
+our $VERSION = '1.06';
use Getopt::Long '2.33', qw( :config gnu_getopt );
my %opt;
" (range expected)\n"
);
},
+ 'header!',
'markers|m=s',
+ 'graph-format=s' => sub {
+ $opt{'graph-format'} = substr $_[1], 0, 1;
+ },
'spark:s' => sub {
- $opt{spark} = [split //, $_[1] || '⎽▁▂▃▄▅▆▇█'];
+ $opt{spark} = [split //, $_[1] || '▁▂▃▄▅▆▇█'];
+ },
+ 'palette:s' => sub {
+ $opt{palette} = [ split /\s/, $_[1] ];
},
'stat|s!',
+ 'signal-stat=s',
'unmodified|u!',
'width|w=i',
+ 'version' => sub {
+ say "barcat version $VERSION";
+ exit;
+ },
'usage|h' => sub {
local $/;
my $pod = readline *DATA;
$opt{width} ||= $ENV{COLUMNS} || 80;
$opt{color} //= -t *STDOUT; # enable on tty
+$opt{'graph-format'} //= '-';
$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};
+$opt{'signal-stat'} //= exists $SIG{INFO} ? 'INFO' : 'QUIT';
+$opt{palette} //= $opt{color} && [31, 90, 32];
my (@lines, @values, @order);
+$SIG{$_} = \&show_stat for $opt{'signal-stat'} || ();
$SIG{ALRM} = sub {
show_lines();
- alarm $opt{interval} if defined $opt{interval};
+ alarm $opt{interval} if defined $opt{interval} and $opt{interval} > 0;
};
+$SIG{INT} = \&show_exit;
if (defined $opt{interval}) {
$opt{interval} ||= 1;
- alarm $opt{interval};
+ alarm $opt{interval} if $opt{interval} > 0;
eval {
require Tie::Array::Sorted;
} or warn $@, "Expect slowdown with large datasets!\n";
}
-$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) {
s/\r?\n\z//;
}
}
push @lines, $_;
+ show_lines() if defined $opt{interval} and $opt{interval} < 0
+ and $. % $opt{interval} == 0;
}
$SIG{INT} = 'DEFAULT';
);
}
+say(
+ color(31), sprintf('%*s', $lenval, $minval),
+ color(90), '-', color(36), '+',
+ color(32), sprintf('%*s', $size * ($maxval - $minval) - 3, $maxval),
+ color(90), '-', color(36), '+',
+ color(0),
+) if $opt{header};
+
while ($nr <= $#lines) {
$nr >= $opt{hidemax} and last if defined $opt{hidemax};
my $val = $values[$nr];
}
if (length $val) {
- my $color = !$opt{color} ? undef :
- $val == $order[0] ? 32 : # max
- $val == $order[-1] ? 31 : # min
- 90;
+ my $color = !$opt{palette} ? undef :
+ $val == $order[0] ? $opt{palette}->[-1] : # max
+ $val == $order[-1] ? $opt{palette}->[0] : # min
+ $opt{palette}->[1] // $opt{palette}->[0];
$val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val;
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;
+ print $barmark[$_] // $opt{'graph-format'} for 1 .. $size && (($values[$nr] || 0) - $minval) * $size + .5;
say '';
}
continue {
say '' if $opt{spark};
}
-show_lines();
-if ($opt{stat}) {
+sub show_stat {
if ($opt{hidemin} or $opt{hidemax}) {
$opt{hidemin} ||= 1;
$opt{hidemax} ||= @lines;
say '';
}
+sub show_exit {
+ show_lines();
+ show_stat() if $opt{stat};
+ exit 130 if @_; # 0x80+signo
+ exit;
+}
+
+show_exit();
+
__END__
=encoding utf8
or capture the numbers itself,
for example I<-f'(\d+)'> for the first digits anywhere.
+=item --header
+
+Prepend a chart axis with minimum and maximum values labeled.
+
=item -H, --human-readable
Format values using SI unit prefixes,
Also changes an exponent I<1.602176634e-19> to I<160.2z>.
Short integers are aligned but kept without decimal point.
-=item -t, --interval[=<seconds>]
+=item -t, --interval[=(<seconds>|-<lines>)]
-Interval time to output partial progress.
+Output partial progress every given number of seconds or input lines.
An update can also be forced by sending a I<SIGALRM> alarm signal.
=item -l, --length=[-]<size>[%]
All input is still counted and analyzed for statistics,
but disregarded for padding and bar size.
+=item --graph-format=<character>
+
+Glyph to repeat for the graph line.
+Defaults to a dash C<->.
+
=item -m, --markers=
Statistical positions to indicate on bars.
=back
+=item --palette=<color>...
+
+Override colors of parsed numbers.
+Can be any CSI escape, such as I<90> for default dark grey,
+or alternatively I<1;30> for bold black.
+
+In case of additional colors,
+the last is used for values equal to the maximum, the first for minima.
+If unspecified, these are green and red respectively (I<31 90 32>).
+
+=item --spark[=<glyphs>]
+
+Replace lines by I<sparklines>,
+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.
+Unspecified, block fill glyphs U+2581-2588 will be used.
+
=item -s, --stat
Total statistics after all data.
git.shiar.nl / barcat.git / blobdiff