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

diff --git a/graph b/graph
index fd49acf..ea17d45 100755
--- a/graph
+++ b/graph
@@ -17,7 +17,7 @@ my %opt;
 GetOptions(\%opt,
 	'color|c!',
 	'C' => sub { $opt{color} = 0 },
-	'field|f=i',
+	'field|f=s',
 	'interval|t:i',
 	'trim|length|l=s' => sub {
 		my ($optname, $optval) = @_;
@@ -28,6 +28,7 @@ GetOptions(\%opt,
 		);
 		$opt{trim} = $optval;
 	},
+	'value-length=i',
 	'markers|m=s',
 	'unmodified|u!',
 	'width|w=i',
@@ -51,7 +52,9 @@ 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/^/;
+my $anchor = !defined $opt{field} ? qr/\A/ :
+	$opt{field} =~ /^[0-9]+$/ ? qr/(?:\S*\h+){$opt{field}}\K/ :
+	$opt{field};
 while (readline) {
 	s/\r?\n\z//;
 	s/^\h*// unless $opt{unmodified};
@@ -78,7 +81,7 @@ state $nr = 0;
 my @order  = sort { $b <=> $a } grep { length } @values;
 my $maxval = $order[0];
 my $minval = min $order[-1], 0;
-my $lenval = max map { length } @order;
+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 .. $#lines;  # left padding
 my $size   = ($maxval - $minval) &&
@@ -118,8 +121,8 @@ while ($nr <= $#lines) {
 		$val = sprintf "%*s", $lenval, $val;
 		$val = "\e[${color}m$val\e[0m" if $color;
 	}
-	$lines[$nr] =~ s/\n/$val/;
-	printf '%-*s', $len + length($val), $lines[$nr];
+	my $line = $lines[$nr] =~ s/\n/$val/r;
+	printf '%-*s', $len + length($val), $line;
 	print $barmark[$_] // '-' for 1 .. $size && (($values[$nr] || 0) - $minval) * $size;
 	say '';
 	$nr++;
@@ -154,11 +157,17 @@ 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>
+=item -f, --field=(<number>|<regexp>)
+
+Compare values after a given number of whitespace separators,
+or matching a regular expression.
 
-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.
+A string can indicate the starting position of a value
+(such as I<-f:> if preceded by colons),
+or capture the numbers itself,
+for example I<-f'(\d+)'> for the first digits anywhere.
 
 =item -t, --interval[=<seconds>]
 
@@ -212,6 +221,10 @@ or 68% of all entries.
 Do not strip leading whitespace.
 Keep original value alignment, which may be significant in some programs.
 
+=item --value-length=<size>
+
+Reserved space for numbers.
+
 =item -w, --width=<columns>
 
 Override the maximum number of columns to use.
@@ -252,7 +265,7 @@ 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 $1,$2}' | graph -f1
+    grep '^[12]' | graph -f',\K' --value-length=7
 
 Total population history from the World Bank dataset (XML):
 
@@ -280,8 +293,7 @@ Or the most frequent authors:
 
 Latency history:
 
-    ping google.com |
-    perl -pe '$|=1; print s/ time=(.*)// ? "$1 for " : "> "' | graph -t
+    ping google.com | graph -f'time=\K' -t
 
 =head1 AUTHOR