git.shiar.nl
/
barcat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regenerate test output on regress.t -G option
[barcat.git]
/
barcat
diff --git
a/barcat
b/barcat
index fe04246f8f8ae7ad8d58663b1fc1326baf3cf646..a4ed12faa8b248923be9990d22b8962d67764a66 100755
(executable)
--- a/
barcat
+++ b/
barcat
@@
-1,4
+1,4
@@
-#!/usr/bin/
env perl
+#!/usr/bin/
perl -CA
use 5.018;
use warnings;
use utf8;
use 5.018;
use warnings;
use utf8;
@@
-47,6
+47,9
@@
GetOptions(\%opt,
);
},
'markers|m=s',
);
},
'markers|m=s',
+ 'spark:s' => sub {
+ $opt{spark} = [split //, $_[1] || '⎽▁▂▃▄▅▆▇█'];
+ },
'stat|s!',
'unmodified|u!',
'width|w=i',
'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{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);
my (@lines, @values, @order);
@@
-77,7
+81,10
@@
if (defined $opt{interval}) {
} or warn $@, "Expect slowdown with large datasets!\n";
}
} 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) {
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};
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;
}
if ($trimpos <= 1) {
$_ = substr $_, 0, 1;
}
@@
-100,8
+108,9
@@
while (readline) {
$SIG{INT} = 'DEFAULT';
sub color {
$SIG{INT} = 'DEFAULT';
sub color {
- $opt{color} or return '';
- return "\e[$_[0]m";
+ $opt{color} and defined $_[0] or return '';
+ return "\e[$_[0]m" if defined wantarray;
+ $_ = color(@_) . $_ . color(0) if defined;
}
sub show_lines {
}
sub show_lines {
@@
-129,7
+138,7
@@
if ($opt{markers} // 1 and $size > 0) {
$barmark[ orderpos($#order * .68269) ] = '<';
$barmark[ orderpos($#order / 2) ] = '+'; # mean
$barmark[ -$minval * $size ] = '|' if $minval < 0; # zero
$barmark[ orderpos($#order * .68269) ] = '<';
$barmark[ orderpos($#order / 2) ] = '+'; # mean
$barmark[ -$minval * $size ] = '|' if $minval < 0; # zero
-
defined and $_ = color(36).$_.color(0
) for @barmark;
+
color(36
) for @barmark;
state $lastmax = $maxval;
if ($maxval > $lastmax) {
state $lastmax = $maxval;
if ($maxval > $lastmax) {
@@
-160,21
+169,29
@@
sub sival {
while ($nr <= $#lines) {
$nr >= $opt{hidemax} and last if defined $opt{hidemax};
my $val = $values[$nr];
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) {
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 == $order[0] ? 32 : # max
$val == $order[-1] ? 31 : # min
90;
$val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val;
-
$val = color($color).$val.color(0) 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 '';
}
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++;
}
$nr++;
}
+say '' if $opt{spark};
}
show_lines();
}
show_lines();
@@
-300,7
+317,7
@@
Total statistics after all data.
=item -u, --unmodified
=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=<size>
Keep original value alignment, which may be significant in some programs.
=item --value-length=<size>
@@
-351,6
+368,11
@@
Any kind of database query with counts, preserving returned alignment:
echo 'SELECT count(*),schemaname FROM pg_tables GROUP BY 2' |
psql -t | barcat -u
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 |
External datasets, like movies per year:
curl https://github.com/prust/wikipedia-movie-data/raw/master/movies.json |
@@
-385,6
+407,12
@@
Or the top 3 most frequent authors with statistics over all:
git shortlog -sn | barcat -L3 -s
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 <perl@shiar.org>
=head1 AUTHOR
Mischa POSLAWSKY <perl@shiar.org>