X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/ba4406a60d218341b89196f2466459e4b2384996..bdd1d9ee2ace72d65caa8305d24ce341b77bf573:/barcat

diff --git a/barcat b/barcat
index a69bbe5..e6b22b6 100755
--- a/barcat
+++ b/barcat
@@ -17,7 +17,10 @@ my %opt;
 GetOptions(\%opt,
 	'color|c!',
 	'C' => sub { $opt{color} = 0 },
-	'field|f=s',
+	'field|f=s' => sub {
+		$opt{anchor} = /^[0-9]+$/ ? qr/(?:\S*\h+){$_}\K/ : $_ for $_[1];
+	},
+	'human-readable|H!',
 	'interval|t:i',
 	'trim|length|l=s' => sub {
 		my ($optname, $optval) = @_;
@@ -50,6 +53,8 @@ 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{anchor} //= qr/\A/;
 
 if (defined $opt{interval}) {
 	$opt{interval} ||= 1;
@@ -63,13 +68,11 @@ if (defined $opt{interval}) {
 $SIG{INT} = 'IGNORE';  # continue after assumed eof
 
 my (@lines, @values);
-my $anchor = !defined $opt{field} ? qr/\A/ :
-	$opt{field} =~ /^[0-9]+$/ ? qr/(?:\S*\h+){$opt{field}}\K/ :
-	$opt{field};
+my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ |)/x;
 while (readline) {
 	s/\r?\n\z//;
 	s/^\h*// unless $opt{unmodified};
-	push @values, s/$anchor ( \h* -? [0-9]* \.? [0-9]+ |)/\n/x && $1;
+	push @values, s/$valmatch/\n/ && $1;
 	if (defined $opt{trim}) {
 		my $trimpos = abs $opt{trim};
 		if ($trimpos <= 1) {
@@ -123,6 +126,12 @@ if ($opt{markers} // 1 and $size > 0) {
 	}
 }
 
+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];
+}
+
 while ($nr <= $#lines) {
 	$nr >= $opt{hidemax} and last if $opt{hidemax};
 	my $val = $values[$nr];
@@ -131,7 +140,7 @@ while ($nr <= $#lines) {
 			$val == $order[0] ? 32 : # max
 			$val == $order[-1] ? 31 : # min
 			90;
-		$val = sprintf "%*s", $lenval, $val;
+		$val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val;
 		$val = "\e[${color}m$val\e[0m" if $color;
 	}
 	my $line = $lines[$nr] =~ s/\n/$val/r;
@@ -183,6 +192,11 @@ A string can indicate the starting position of a value
 or capture the numbers itself,
 for example I<-f'(\d+)'> for the first digits anywhere.
 
+=item -H, --human-readable
+
+Format values using SI unit prefixes,
+turning long numbers like I<12356789> into I<12.4M>.
+
 =item -t, --interval[=<seconds>]
 
 Interval time to output partial progress.
@@ -291,7 +305,7 @@ Total population history from the World Bank dataset (XML):
 
     curl http://api.worldbank.org/v2/country/1W/indicator/SP.POP.TOTL |
     xmllint --xpath '//*[local-name()="date" or local-name()="value"]' - |
-    sed -r 's,</wb:value>,\n,g; s,(<[^>]+>)+, ,g' | barcat -f1
+    sed -r 's,</wb:value>,\n,g; s,(<[^>]+>)+, ,g' | barcat -f1 -H
 
 Movies per year from prepared JSON data: