X-Git-Url: http://git.shiar.net/barcat.git/blobdiff_plain/4896a612b1c772c53350ef1ec612861f613343dc..b0d6f88a7fbd1e478b0b1892c5832229a99e252f:/barcat

diff --git a/barcat b/barcat
index fc4cb3c..3bc7ca0 100755
--- a/barcat
+++ b/barcat
@@ -101,7 +101,7 @@ GetOptions(\%opt,
 	},
 ) or exit 64;  # EX_USAGE
 
-$opt{width} ||= $ENV{COLUMNS} || qx(tput cols) || 80;
+$opt{width} ||= $ENV{COLUMNS} || qx(tput cols) || 80 unless $opt{spark};
 $opt{color} //= -t *STDOUT;  # enable on tty
 $opt{'graph-format'} //= '-';
 $opt{trim}   *= $opt{width} / 100 if $opt{trimpct};
@@ -154,6 +154,10 @@ while (defined ($_ = $opt{input} ? shift @{ $opt{input} } : readline)) {
 		and $. % $opt{interval} == 0;
 }
 
+if ($opt{'zero-missing'}) {
+	push @values, (0) x 10;
+}
+
 $SIG{INT} = 'DEFAULT';
 
 sub color {
@@ -243,6 +247,7 @@ while ($nr <= $#lines) {
 		$opt{palette}->[ $rel * ($#{$opt{palette}} - 1) + 1 ];
 
 	if ($opt{spark}) {
+		say '' if $opt{width} and $nr and $nr % $opt{width} == 0;
 		print color($color), $opt{spark}->[
 			!$val ? 0 : # blank
 			$val == $order[0] ? -1 : # max
@@ -273,12 +278,13 @@ sub show_stat {
 	if ($opt{hidemin} or $opt{hidemax}) {
 		$opt{hidemin} ||= 1;
 		$opt{hidemax} ||= @lines;
-		printf '%s of ', sum(@values[$opt{hidemin} - 1 .. $opt{hidemax} - 1]) // 0;
+		printf '%s of ', sum(grep {length} @values[$opt{hidemin} - 1 .. $opt{hidemax} - 1]) // 0;
 	}
 	if (@order) {
 		my $total = sum @order;
-		printf '%s total', color(1) . $total . color(0);
-		printf ' in %d values', scalar @values;
+		printf '%s total', color(1) . sprintf('%.8g', $total) . color(0);
+		printf ' in %d values', scalar @order;
+		printf ' over %d lines', scalar @lines if @order != @lines;
 		printf(' (%s min, %s avg, %s max)',
 			color(31) . $order[-1] . color(0),
 			color(36) . (sprintf '%*.*f', 0, 2, $total / @order) . color(0),