X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/e40f2d7b5bec7ae512a9e005786905d090cd5bfe..b85682a62247278da21404075bb39d030bdd6d64:/barcat

diff --git a/barcat b/barcat
index b0de950..69f4516 100755
--- a/barcat
+++ b/barcat
@@ -18,6 +18,7 @@ GetOptions(\%opt,
 	'color|c!',
 	'C' => sub { $opt{color} = 0 },
 	'field|f=s',
+	'human-readable|H!',
 	'interval|t:i',
 	'trim|length|l=s' => sub {
 		my ($optname, $optval) = @_;
@@ -29,7 +30,17 @@ GetOptions(\%opt,
 		$opt{trim} = $optval;
 	},
 	'value-length=i',
-	'limit|L=i',
+	'hidemin=i',
+	'hidemax=i',
+	'limit|L=s' => sub {
+		my ($optname, $optval) = @_;
+		$optval ||= 0;
+		($opt{hidemin}, $opt{hidemax}) =
+		$optval =~ m/\A (?: ([0-9]+)? - )? ([0-9]+)? \z/x or die(
+			"Value \"$optval\" invalid for option limit",
+			" (range expected)\n"
+		);
+	},
 	'markers|m=s',
 	'unmodified|u!',
 	'width|w=i',
@@ -40,6 +51,7 @@ 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 <> n μ m )];
 
 if (defined $opt{interval}) {
 	$opt{interval} ||= 1;
@@ -76,16 +88,16 @@ $SIG{INT} = 'DEFAULT';
 
 sub show_lines {
 
-state $nr = 0;
+state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0;
 @lines and @lines > $nr or return;
 
 my @order  = sort { $b <=> $a } grep { length } @values;
-my $maxval = $opt{limit} ? max @values[0 .. $opt{limit} - 1] : $order[0];
+my $maxval = $opt{hidemax} ? max @values[0 .. $opt{hidemax} - 1] : $order[0];
 my $minval = min $order[-1], 0;
 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{limit} || ();  # left padding
+		0 .. min $#lines, $opt{hidemax} || ();  # left padding
 my $size   = ($maxval - $minval) &&
 	($opt{width} - $lenval - $len) / ($maxval - $minval);  # bar multiplication
 
@@ -113,14 +125,20 @@ 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}->[$unit];
+}
+
 while ($nr <= $#lines) {
+	$nr >= $opt{hidemax} and last if $opt{hidemax};
 	my $val = $values[$nr];
 	if (length $val) {
 		my $color = !$opt{color} ? 0 :
 			$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;
@@ -129,7 +147,6 @@ while ($nr <= $#lines) {
 	say '';
 
 	$nr++;
-	$nr >= $opt{limit} and last if $opt{limit};
 }
 
 }
@@ -173,6 +190,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.
@@ -187,7 +209,7 @@ unless C<--length=0>.
 Prepend a dash (i.e. make negative) to enforce padding
 regardless of encountered contents.
 
-=item -L, --limit=<count>
+=item -L, --limit=(<count>|<start>-[<end>])
 
 Stop output after a number of lines.
 All input is still counted and analyzed for statistics,
@@ -281,7 +303,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: