From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 14 Nov 2022 23:19:41 +0000 (+0100)
Subject: prefix + to select numeric fields in -f
X-Git-Tag: v1.09~18
X-Git-Url: http://git.shiar.nl/barcat.git/commitdiff_plain/3de553c8b0f2b2f8776c94ac0bc31231ad2402d3

prefix + to select numeric fields in -f

Possible using regular expressions, but needlessly complex for such a common
use or desire.
---

diff --git a/barcat b/barcat
index c029225..5181143 100755
--- a/barcat
+++ b/barcat
@@ -19,7 +19,9 @@ GetOptions(\%opt,
 	'field|f=s' => sub {
 		eval {
 			local $_ = $_[1];
-			$opt{anchor} = /\A[0-9]+\z/ ? qr/(?:\S*\h+){$_}\K/ : qr/$_/;
+			s/\A[0-9]+\z/(?:\\S*\\h+){$_}\\K/;
+			s/\A[+]([0-9]*)\z/(?:\\d+\\D+\\b){$1}\\K \\s* (?=\\d)/;
+			$opt{anchor} = qr/$_/;
 		} or die $@ =~ s/(?:\ at\ \N+)?\Z/ for option $_[0]/r;
 	},
 	'human-readable|H!',
@@ -370,7 +372,8 @@ Usage:                                               /\_/\
 Options:
   -a, --[no-]ascii         Restrict user interface to ASCII characters
   -C, --[no-]color         Force colored output of values and bar markers
-  -f, --field=(N|REGEXP)   Compare values after a given number of whitespace
+  -f, --field=([+]N|REGEXP)
+                           Compare values after a given number of whitespace
                            separators
       --header             Prepend a chart axis with minimum and maximum
                            values labeled
@@ -438,7 +441,7 @@ disabled otherwise such as when piped or redirected.
 Can also be disabled by setting I<-M>
 or the I<NO_COLOR> environment variable.
 
-=item -f, --field=(<number> | <regexp>)
+=item -f, --field=([+]<number> | <regexp>)
 
 Compare values after a given number of whitespace separators,
 or matching a regular expression.
@@ -449,6 +452,7 @@ 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.
+A shorthand for this is I<+0>, or I<+N> to find the Nth number.
 
 =item --header
 
@@ -599,6 +603,10 @@ Compare file sizes (with human-readable numbers):
 
     du -d0 -b * | barcat -H
 
+Same from formatted results, selecting the first numeric value:
+
+    tree -s --noreport | barcat -H -f+0
+
 Memory usage of user processes with long names truncated:
 
     ps xo rss,pid,cmd | barcat -l40
@@ -657,6 +665,11 @@ Total population history in XML from the World Bank:
     xmlstarlet sel -t -m '*/*' -v wb:date -o ' ' -v wb:value -n |
     barcat -f1 -H
 
+Population and other information for all countries:
+
+    curl http://download.geonames.org/export/dump/countryInfo.txt |
+    grep -v '^#\s' | column -tns$'\t' | barcat -f+2 -u -l150 -s
+
 And of course various Git statistics, such commit count by year:
 
     git log --pretty=%ci | cut -b-4 | uniq -c | barcat
diff --git a/t/t0002-usage_-h_|wc_-l.out b/t/t0002-usage_-h_|wc_-l.out
index bb95160..a787364 100644
--- a/t/t0002-usage_-h_|wc_-l.out
+++ b/t/t0002-usage_-h_|wc_-l.out
@@ -1 +1 @@
-33
+34
diff --git a/t/t1305-numeric_field.in b/t/t1305-numeric_field.in
new file mode 100644
index 0000000..3e83ee9
--- /dev/null
+++ b/t/t1305-numeric_field.in
@@ -0,0 +1,8 @@
+1
+numeric 1 2 3
+         -1      -2-3
+ more numeric 1 with text 2 3
+
+0 0 0 0 0
+non-numeric text column
+111 2e0...
diff --git a/t/t1305-numeric_field_-f+1.out b/t/t1305-numeric_field_-f+1.out
new file mode 100644
index 0000000..10d10df
--- /dev/null
+++ b/t/t1305-numeric_field_-f+1.out
@@ -0,0 +1,8 @@
+1
+numeric 1   2 3                ------=-+
+-1      -  2-3                 ------=-+
+more numeric 1 with text   2 3 ------=-+
+
+0   0 0 0 0                    
+non-numeric text column
+111 2e0...                     ------=-+