keep ordered values, only resort on interval

[barcat.git] / barcat

diff --git a/barcat b/barcat
index 00a21739671c0a4d00df95517912299cdd472757..1114656f74c0cab9a0a69eb91f3599ca78ffea26 100755 (executable)
--- a/barcat
+++ b/barcat
@@ -47,6 +47,7 @@ GetOptions(\%opt,
                );
        },
        'markers|m=s',
+       'stat|s!',
        'unmodified|u!',
        'width|w=i',
        'usage|h' => sub { podexit() },
@@ -71,12 +72,13 @@ if (defined $opt{interval}) {
 
 $SIG{INT} = 'IGNORE';  # continue after assumed eof
 
-my (@lines, @values);
+my (@lines, @values, @order);
 my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)/x;
 while (readline) {
        s/\r?\n\z//;
        s/^\h*// unless $opt{unmodified};
        push @values, s/$valmatch/\n/ && $1;
+       push @order, $1 if length $1;
        if (defined $opt{trim}) {
                my $trimpos = abs $opt{trim};
                if ($trimpos <= 1) {
@@ -95,10 +97,12 @@ sub show_lines {
 
 state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0;
 @lines and @lines > $nr or return;
+@lines or return;
+@lines > $nr or return unless $opt{hidemin};
 
-my @order  = sort { $b <=> $a } grep { length } @values;
-my $maxval = $opt{hidemax} ? max @values[0 .. $opt{hidemax} - 1] : $order[0];
-my $minval = min $order[-1], 0;
+@order = sort { $b <=> $a } @order;
+my $maxval = ($opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] : $order[0]) // 0;
+my $minval = min $order[-1] // (), 0;
 my $lenval = $opt{'value-length'} // max map { length } @order;
 my $len    = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 :
        max map { length $values[$_] && length $lines[$_] }
@@ -130,6 +134,8 @@ if ($opt{markers} // 1 and $size > 0) {
        }
 }
 
+@lines > $nr or return if $opt{hidemin};
+
 sub sival {
        my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1));
        my $float = $_[0] !~ /^ (?: 0*\.)? [0-9]{1,3} $/x;
@@ -142,7 +148,7 @@ sub sival {
 }
 
 while ($nr <= $#lines) {
-       $nr >= $opt{hidemax} and last if $opt{hidemax};
+       $nr >= $opt{hidemax} and last if defined $opt{hidemax};
        my $val = $values[$nr];
        if (length $val) {
                my $color = !$opt{color} ? 0 :
@@ -163,6 +169,20 @@ while ($nr <= $#lines) {
 }
 show_lines();
 
+if ($opt{stat}) {
+       if ($opt{hidemin} or $opt{hidemax}) {
+               $opt{hidemin} ||= 1;
+               $opt{hidemax} ||= @lines;
+               printf '%s of ', sum(@values[$opt{hidemin} - 1 .. $opt{hidemax} - 1]) // 0;
+       }
+       my $total = sum @order;
+       printf '%s total', $total;
+       printf ' in %d values', scalar @values;
+       printf ' (%s min, %*.*f avg, %s max)',
+               $order[-1], 0, 2, $total / @order, $order[0];
+       say '';
+}
+
 __END__
 
 =head1 NAME
@@ -261,6 +281,10 @@ or 68% of all entries.
 
 =back
 
+=item -s, --stat
+
+Total statistics after all data.
+
 =item -u, --unmodified
 
 Do not strip leading whitespace.
@@ -332,9 +356,9 @@ Git statistics, such commit count by year:
 
     git log --pretty=%ci | cut -b-4 | uniq -c | barcat
 
-Or the most frequent authors:
+Or the top 3 most frequent authors with statistics over all:
 
-    git shortlog -sn | barcat -L3
+    git shortlog -sn | barcat -L3 -s
 
 Latency history: