X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/fdfa9b67c2e09cafbd06b20c23b51b48d99b9021..30fb51a784dd9314c6776f18b7189b197be12df3:/barcat

diff --git a/barcat b/barcat
index d7361a1..268c993 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;
@@ -42,17 +42,22 @@ GetOptions(\%opt,
 			" (range expected)\n"
 		);
 	},
+	'header!',
 	'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;
@@ -94,6 +99,7 @@ $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;
@@ -105,12 +111,6 @@ if (defined $opt{interval}) {
 	} or warn $@, "Expect slowdown with large datasets!\n";
 }
 
-$SIG{INT} = sub {
-	$SIG{INT} = 'DEFAULT';  # reset for subsequent attempts
-	exit if !$.;
-	'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//;
@@ -193,6 +193,8 @@ sub sival {
 	);
 }
 
+say sprintf '%*s-+%*s-+', $lenval, $minval, $size * ($maxval - $minval) - 3, $maxval if $opt{header};
+
 while ($nr <= $#lines) {
 	$nr >= $opt{hidemax} and last if defined $opt{hidemax};
 	my $val = $values[$nr];
@@ -221,7 +223,6 @@ continue {
 say '' if $opt{spark};
 
 }
-show_lines();
 
 sub show_stat {
 	if ($opt{hidemin} or $opt{hidemax}) {
@@ -241,7 +242,15 @@ sub show_stat {
 	}
 	say '';
 }
-show_stat() if $opt{stat};
+
+sub show_exit {
+	show_lines();
+	show_stat() if $opt{stat};
+	exit 130 if @_;  # 0x80+signo
+	exit;
+}
+
+show_exit();
 
 __END__
 =encoding utf8
@@ -288,6 +297,10 @@ A string can indicate the starting position of a value
 or capture the numbers itself,
 for example I<-f'(\d+)'> for the first digits anywhere.
 
+=item --header
+
+Prepend a chart axis with minimum and maximum values labeled.
+
 =item -H, --human-readable
 
 Format values using SI unit prefixes,
@@ -354,6 +367,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.