git.shiar.nl
/
barcat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
retain unsubstituted line contents
[barcat.git]
/
graph
diff --git
a/graph
b/graph
index c069dd3d49d145f6b9f3b652dd2f23dd79667b55..d7c2834a20e24fb094a3d0f21546f632067e0336 100755
(executable)
--- a/
graph
+++ b/
graph
@@
-17,6
+17,7
@@
my %opt;
GetOptions(\%opt,
'color|c!',
'C' => sub { $opt{color} = 0 },
GetOptions(\%opt,
'color|c!',
'C' => sub { $opt{color} = 0 },
+ 'field|f=i',
'interval|t:i',
'trim|length|l=s' => sub {
my ($optname, $optval) = @_;
'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);
$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};
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) {
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 :
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 $values[$_] && length $lines[$_] } 0 .. $#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
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;
$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;
+ 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++;
}
say '';
$nr++;
}
@@
-138,7
+140,9
@@
B<graph> [<options>] [<input>]
=head1 DESCRIPTION
=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
=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.
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.
=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' |
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"]' - |
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:
Movies per year from prepared JSON data: