git.shiar.nl
/
barcat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up common value range calculation
[barcat.git]
/
barcat
diff --git
a/barcat
b/barcat
index 144b6244d0bd3970bdc1e36dbea987a330cb2566..b6d2f4da87a4e39fb2dcf813ae40c75bca217a30 100755
(executable)
--- a/
barcat
+++ b/
barcat
@@
-133,7
+133,9
@@
if (defined $opt{interval}) {
} or warn $@, "Expect slowdown with large datasets!\n";
}
} or warn $@, "Expect slowdown with large datasets!\n";
}
-my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)/x;
+my $valmatch = qr<
+ $opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)
+>x;
while (defined ($_ = $opt{input} ? shift @{ $opt{input} } : readline)) {
s/\r?\n\z//;
s/^\h*// unless $opt{unmodified};
while (defined ($_ = $opt{input} ? shift @{ $opt{input} } : readline)) {
s/\r?\n\z//;
s/^\h*// unless $opt{unmodified};
@@
-174,14
+176,18
@@
state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0;
@lines > $nr or return unless $opt{hidemin};
@order = sort { $b <=> $a } @order unless tied @order;
@lines > $nr or return unless $opt{hidemin};
@order = sort { $b <=> $a } @order unless tied @order;
-my $maxval = $opt{maxval} // ($opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] : $order[0]) // 0;
+my $maxval = $opt{maxval} // (
+ $opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] :
+ $order[0]
+) // 0;
my $minval = $opt{minval} // min $order[-1] // (), 0;
my $minval = $opt{minval} // min $order[-1] // (), 0;
+my $range = $maxval - $minval;
my $lenval = $opt{'value-length'} // max map { length } @order;
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 $lenval = $opt{'value-length'} // max map { length } @order;
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 =
($maxval - $minval)
&&
- ($opt{width} - $lenval - $len) /
($maxval - $minval)
; # bar multiplication
+my $size =
$range
&&
+ ($opt{width} - $lenval - $len) /
$range
; # bar multiplication
my @barmark;
if ($opt{markers} and $size > 0) {
my @barmark;
if ($opt{markers} and $size > 0) {
@@
-211,7
+217,7
@@
if ($opt{markers} and $size > 0) {
($lastmax - $minval) * $size + .5,
'-' x (($values[$nr - 1] - $minval) * $size);
print color(92);
($lastmax - $minval) * $size + .5,
'-' x (($values[$nr - 1] - $minval) * $size);
print color(92);
- say '+' x (($
maxval - $lastmax - $minval
) * $size + .5);
+ say '+' x (($
range - $lastmax
) * $size + .5);
print color(0);
$lastmax = $maxval;
}
print color(0);
$lastmax = $maxval;
}
@@
-232,7
+238,7
@@
sub sival {
say(
color(31), sprintf('%*s', $lenval, $minval),
color(90), '-', color(36), '+',
say(
color(31), sprintf('%*s', $lenval, $minval),
color(90), '-', color(36), '+',
- color(32), sprintf('%*s', $size *
($maxval - $minval)
- 3, $maxval),
+ color(32), sprintf('%*s', $size *
$range
- 3, $maxval),
color(90), '-', color(36), '+',
color(0),
) if $opt{header};
color(90), '-', color(36), '+',
color(0),
) if $opt{header};
@@
-240,7
+246,7
@@
say(
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];
- my $rel = length $val &&
($val - $minval) / ($maxval - $minval)
;
+ my $rel = length $val &&
$range && ($val - $minval) / $range
;
my $color = !length $val || !$opt{palette} ? undef :
$val == $order[0] ? $opt{palette}->[-1] : # max
$val == $order[-1] ? $opt{palette}->[0] : # min
my $color = !length $val || !$opt{palette} ? undef :
$val == $order[0] ? $opt{palette}->[-1] : # max
$val == $order[-1] ? $opt{palette}->[0] : # min
@@
-264,7
+270,8
@@
while ($nr <= $#lines) {
}
my $line = $lines[$nr] =~ s/\n/$val/r;
printf '%-*s', $len + length($val), $line;
}
my $line = $lines[$nr] =~ s/\n/$val/r;
printf '%-*s', $len + length($val), $line;
- print $barmark[$_] // $opt{'graph-format'} 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 '';
}
continue {
@@
-553,7
+560,11
@@
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):
+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 ) |
( git log --pretty=%ci --since=30day | cut -b-10
seq 0 30 | xargs -i date +%F -d-{}day ) |