X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/dc38ca198369f674b29911f761338aac420f2db6..43511a9c8cfbb436926aec1c4382003cdab87ee5:/barcat

diff --git a/barcat b/barcat
index 4cb2cd1..db0aefa 100755
--- a/barcat
+++ b/barcat
@@ -6,7 +6,7 @@ use List::Util qw( min max sum );
 use open qw( :std :utf8 );
 use experimental qw( lexical_subs );
 
-our $VERSION = '1.05';
+our $VERSION = '1.06';
 
 use Getopt::Long '2.33', qw( :config gnu_getopt );
 my %opt;
@@ -43,12 +43,20 @@ GetOptions(\%opt,
 		);
 	},
 	'markers|m=s',
+	'graph-format=s' => sub {
+		$opt{'graph-format'} = substr $_[1], 0, 1;
+	},
 	'spark:s' => sub {
-		$opt{spark} = [split //, $_[1] || '⎽▁▂▃▄▅▆▇█'];
+		$opt{spark} = [split //, $_[1] || '▁▂▃▄▅▆▇█'];
 	},
 	'stat|s!',
+	'signal-stat=s',
 	'unmodified|u!',
 	'width|w=i',
+	'version' => sub {
+		say "barcat version $VERSION";
+		exit;
+	},
 	'usage|h' => sub {
 		local $/;
 		my $pod = readline *DATA;
@@ -75,21 +83,26 @@ GetOptions(\%opt,
 
 $opt{width} ||= $ENV{COLUMNS} || 80;
 $opt{color} //= -t *STDOUT;  # enable on tty
+$opt{'graph-format'} //= '-';
 $opt{trim}   *= $opt{width} / 100 if $opt{trimpct};
 $opt{units}   = [split //, ' kMGTPEZYyzafpnμm'] if $opt{'human-readable'};
 $opt{anchor} //= qr/\A/;
 $opt{'value-length'} = 6 if $opt{units};
 $opt{'value-length'} = 1 if $opt{unmodified};
+$opt{'signal-stat'} //= exists $SIG{INFO} ? 'INFO' : 'QUIT';
 
 my (@lines, @values, @order);
 
+$SIG{$_} = \&show_stat for $opt{'signal-stat'} || ();
+$SIG{ALRM} = sub {
+	show_lines();
+	alarm $opt{interval} if defined $opt{interval} and $opt{interval} > 0;
+};
+$SIG{INT} = \&show_exit;
+
 if (defined $opt{interval}) {
 	$opt{interval} ||= 1;
-	$SIG{ALRM} = sub {
-		show_lines();
-		alarm $opt{interval};
-	};
-	alarm $opt{interval};
+	alarm $opt{interval} if $opt{interval} > 0;
 
 	eval {
 		require Tie::Array::Sorted;
@@ -97,11 +110,6 @@ if (defined $opt{interval}) {
 	} or warn $@, "Expect slowdown with large datasets!\n";
 }
 
-$SIG{INT} = sub {
-	$SIG{INT} = 'DEFAULT';  # reset for subsequent attempts
-	'IGNORE' # continue after assumed eof
-};
-
 my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)/x;
 while (readline) {
 	s/\r?\n\z//;
@@ -119,6 +127,8 @@ while (readline) {
 		}
 	}
 	push @lines, $_;
+	show_lines() if defined $opt{interval} and $opt{interval} < 0
+		and $. % $opt{interval} == 0;
 }
 
 $SIG{INT} = 'DEFAULT';
@@ -201,7 +211,7 @@ while ($nr <= $#lines) {
 	}
 	my $line = $lines[$nr] =~ s/\n/$val/r;
 	printf '%-*s', $len + length($val), $line;
-	print $barmark[$_] // '-' for 1 .. $size && (($values[$nr] || 0) - $minval) * $size + .5;
+	print $barmark[$_] // $opt{'graph-format'} for 1 .. $size && (($values[$nr] || 0) - $minval) * $size + .5;
 	say '';
 }
 continue {
@@ -210,9 +220,8 @@ continue {
 say '' if $opt{spark};
 
 }
-show_lines();
 
-if ($opt{stat}) {
+sub show_stat {
 	if ($opt{hidemin} or $opt{hidemax}) {
 		$opt{hidemin} ||= 1;
 		$opt{hidemax} ||= @lines;
@@ -220,14 +229,26 @@ if ($opt{stat}) {
 	}
 	if (@order) {
 		my $total = sum @order;
-		printf '%s total', $total;
+		printf '%s total', color(1) . $total . color(0);
 		printf ' in %d values', scalar @values;
-		printf ' (%s min, %*.*f avg, %s max)',
-			$order[-1], 0, 2, $total / @order, $order[0];
+		printf(' (%s min, %s avg, %s max)',
+			color(31) . $order[-1] . color(0),
+			color(36) . (sprintf '%*.*f', 0, 2, $total / @order) . color(0),
+			color(32) . $order[0] . color(0),
+		);
 	}
 	say '';
 }
 
+sub show_exit {
+	show_lines();
+	show_stat() if $opt{stat};
+	exit 130 if @_;  # 0x80+signo
+	exit;
+}
+
+show_exit();
+
 __END__
 =encoding utf8
 
@@ -280,9 +301,10 @@ turning long numbers like I<12356789> into I<12.4M>.
 Also changes an exponent I<1.602176634e-19> to I<160.2z>.
 Short integers are aligned but kept without decimal point.
 
-=item -t, --interval[=<seconds>]
+=item -t, --interval[=(<seconds>|-<lines>)]
 
-Interval time to output partial progress.
+Output partial progress every given number of seconds or input lines.
+An update can also be forced by sending a I<SIGALRM> alarm signal.
 
 =item -l, --length=[-]<size>[%]
 
@@ -300,6 +322,11 @@ Stop output after a number of lines.
 All input is still counted and analyzed for statistics,
 but disregarded for padding and bar size.
 
+=item --graph-format=<character>
+
+Glyph to repeat for the graph line.
+Defaults to a dash C<->.
+
 =item -m, --markers=
 
 Statistical positions to indicate on bars.
@@ -333,6 +360,18 @@ or 68% of all entries.
 
 =back
 
+=item --spark[=<glyphs>]
+
+Replace lines by I<sparklines>,
+single characters corresponding to input values.
+A specified sequence of unicode characters will be used for
+Of a specified sequence of unicode characters,
+the first one will be used for non-values,
+the last one for the maximum,
+the second (if any) for the minimum,
+and any remaining will be distributed over the range of values.
+Unspecified, block fill glyphs U+2581-2588 will be used.
+
 =item -s, --stat
 
 Total statistics after all data.