X-Git-Url: http://git.shiar.net/barcat.git/blobdiff_plain/f97971592d3397bf91e4dc06f7eb50f68673db37..3eee37b010b7e1a9539750ba99800ac19333489c:/barcat

diff --git a/barcat b/barcat
index 1b780e6..fd110c5 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,13 +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] || '⎽▁▂▃▄▅▆▇█'];
 	},
 	'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,18 +84,22 @@ 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;
@@ -98,11 +111,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//;
@@ -185,6 +193,14 @@ sub sival {
 	);
 }
 
+say(
+	color(31), sprintf('%*s', $lenval, $minval),
+	color(90), '-', color(36), '+',
+	color(32), sprintf('%*s', $size * ($maxval - $minval) - 3, $maxval),
+	color(90), '-', color(36), '+',
+	color(0),
+) if $opt{header};
+
 while ($nr <= $#lines) {
 	$nr >= $opt{hidemax} and last if defined $opt{hidemax};
 	my $val = $values[$nr];
@@ -204,7 +220,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 {
@@ -213,9 +229,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;
@@ -234,6 +249,15 @@ if ($opt{stat}) {
 	say '';
 }
 
+sub show_exit {
+	show_lines();
+	show_stat() if $opt{stat};
+	exit 130 if @_;  # 0x80+signo
+	exit;
+}
+
+show_exit();
+
 __END__
 =encoding utf8
 
@@ -307,6 +331,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.