X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/9e1e2b150d99770d3b6dbe83e458c80a371ebcff..62a8af47251274908bf7a65a4c261d469eff1a41:/barcat

diff --git a/barcat b/barcat
index b75bf98..aec811b 100755
--- a/barcat
+++ b/barcat
@@ -47,6 +47,7 @@ GetOptions(\%opt,
 		);
 	},
 	'markers|m=s',
+	'stat|s!',
 	'unmodified|u!',
 	'width|w=i',
 	'usage|h' => sub { podexit() },
@@ -56,8 +57,9 @@ GetOptions(\%opt,
 $opt{width} ||= $ENV{COLUMNS} || 80;
 $opt{color} //= -t *STDOUT;  # enable on tty
 $opt{trim}   *= $opt{width} / 100 if $opt{trimpct};
-$opt{units}   = $opt{'human-readable'} && ['', qw( k M G T P E Z Y y z a f p n μ m )];
+$opt{units}   = [split //, ' kMGTPEZYyzafpnμm'] if $opt{'human-readable'};
 $opt{anchor} //= qr/\A/;
+$opt{'value-length'} = 6 if $opt{units};
 
 if (defined $opt{interval}) {
 	$opt{interval} ||= 1;
@@ -94,6 +96,8 @@ sub show_lines {
 
 state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0;
 @lines and @lines > $nr or return;
+@lines or return;
+@lines > $nr or return unless $opt{hidemin};
 
 my @order  = sort { $b <=> $a } grep { length } @values;
 my $maxval = $opt{hidemax} ? max @values[0 .. $opt{hidemax} - 1] : $order[0];
@@ -129,14 +133,21 @@ if ($opt{markers} // 1 and $size > 0) {
 	}
 }
 
+@lines > $nr or return if $opt{hidemin};
+
 sub sival {
 	my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1));
-	sprintf "%3.1f%1s", $_[0] / 1000 ** $unit,
-		$#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit];
+	my $float = $_[0] !~ /^ (?: 0*\.)? [0-9]{1,3} $/x;
+	sprintf('%*.*f%*s',
+		$float ? 5 : 3, $float,  # length and tenths
+		$_[0] / 1000 ** $unit,   # number
+		$float ? 0 : 3,          # unit size
+		$#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit]
+	);
 }
 
 while ($nr <= $#lines) {
-	$nr >= $opt{hidemax} and last if $opt{hidemax};
+	$nr >= $opt{hidemax} and last if defined $opt{hidemax};
 	my $val = $values[$nr];
 	if (length $val) {
 		my $color = !$opt{color} ? 0 :
@@ -157,6 +168,11 @@ while ($nr <= $#lines) {
 }
 show_lines();
 
+if ($opt{stat}) {
+	printf '%d values', scalar @values;
+	say '';
+}
+
 __END__
 
 =head1 NAME
@@ -200,6 +216,7 @@ for example I<-f'(\d+)'> for the first digits anywhere.
 Format values using SI unit prefixes,
 turning long numbers like I<12356789> into I<12.4M>.
 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>]
 
@@ -254,6 +271,10 @@ or 68% of all entries.
 
 =back
 
+=item -s, --stat
+
+Total statistics after all data.
+
 =item -u, --unmodified
 
 Do not strip leading whitespace.