X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/17a26cb76ab04c0cdd33acca2d64b3d3397456e4..701244351a83cf31f3916758cde34625e96b8991:/graph

diff --git a/graph b/graph
index 8144868..fd49acf 100755
--- a/graph
+++ b/graph
@@ -17,6 +17,7 @@ my %opt;
 GetOptions(\%opt,
 	'color|c!',
 	'C' => sub { $opt{color} = 0 },
+	'field|f=i',
 	'interval|t:i',
 	'trim|length|l=s' => sub {
 		my ($optname, $optval) = @_;
@@ -50,10 +51,11 @@ if (defined $opt{interval}) {
 $SIG{INT} = 'IGNORE';  # continue after assumed eof
 
 my (@lines, @values);
+my $anchor = $opt{field} ? qr/(?:\S*\h+){$opt{field}}\K/ : qr/^/;
 while (readline) {
 	s/\r?\n\z//;
 	s/^\h*// unless $opt{unmodified};
-	push @values, s/^ ( \h* -? [0-9]* \.? [0-9]+ |)//x && $1;
+	push @values, s/$anchor ( \h* -? [0-9]* \.? [0-9]+ |)/\n/x && $1;
 	if (defined $opt{trim}) {
 		my $trimpos = abs $opt{trim};
 		if ($trimpos <= 1) {
@@ -78,7 +80,7 @@ my $maxval = $order[0];
 my $minval = min $order[-1], 0;
 my $lenval = max map { length } @order;
 my $len    = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 :
-	1 + max map { length } @lines;  # left padding
+	max map { length $values[$_] && length $lines[$_] } 0 .. $#lines;  # left padding
 my $size   = ($maxval - $minval) &&
 	($opt{width} - $lenval - $len) / ($maxval - $minval);  # bar multiplication
 
@@ -113,12 +115,12 @@ while ($nr <= $#lines) {
 			$val == $order[0] ? 32 : # max
 			$val == $order[-1] ? 31 : # min
 			90;
-		printf "\e[%sm", $color if $color;
-		printf "%*s", $lenval, $val;
-		print "\e[0m" if $color;
+		$val = sprintf "%*s", $lenval, $val;
+		$val = "\e[${color}m$val\e[0m" if $color;
 	}
-	printf '%-*s', $len, $lines[$nr];
-	print $barmark[$_] // '-' for 1 .. $size && (($val || 0) - $minval) * $size;
+	$lines[$nr] =~ s/\n/$val/;
+	printf '%-*s', $len + length($val), $lines[$nr];
+	print $barmark[$_] // '-' for 1 .. $size && (($values[$nr] || 0) - $minval) * $size;
 	say '';
 	$nr++;
 }
@@ -138,7 +140,9 @@ B<graph> [<options>] [<input>]
 
 =head1 DESCRIPTION
 
-Each line starting with a number is given a bar to visualise relative sizes.
+Visualizes relative sizes of values read from input (file(s) or STDIN).
+Contents are concatenated similar to I<cat>,
+but numbers are reformatted and a bar graph is appended to each line.
 
 =head1 OPTIONS
 
@@ -150,6 +154,12 @@ Force colored output of values and bar markers.
 Defaults on if output is a tty,
 disabled otherwise such as when piped or redirected.
 
+=item -f, --field=<number>
+
+Compare values after a given number of whitespace separators.
+Unspecified or I<-f0> means values are at the start of each line.
+With I<-f1> the second word is taken instead.
+
 =item -t, --interval[=<seconds>]
 
 Interval time to output partial progress.
@@ -242,13 +252,13 @@ Exchange rate USD/EUR history from CSV download provided by ECB:
 
     curl https://sdw.ecb.europa.eu/export.do \
          -Gd 'node=SEARCHRESULTS&q=EXR.D.USD.EUR.SP00.A&exportType=csv' |
-    awk -F, '{RS="\r\n"} /^[12]/{print $2,$1}' | graph
+    awk -F, '{RS="\r\n"} /^[12]/{print $1,$2}' | graph -f1
 
 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"]' - |
-    awk -F'<[^>]+>' 'BEGIN {RS="</wb:value>"} {print $4,$2}' | graph
+    sed -r 's,</wb:value>,\n,g; s,(<[^>]+>)+, ,g' | graph -f1
 
 Movies per year from prepared JSON data: