git.shiar.nl
/
barcat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unspecified field counts entire lines
[barcat.git]
/
barcat
diff --git
a/barcat
b/barcat
index 0f0cfb8d100aefe0a12665c8ffbd493d605b0050..bae7989b29dff616924f8b105073f085007f7651 100755
(executable)
--- a/
barcat
+++ b/
barcat
@@
-142,7
+142,6
@@
$opt{'graph-format'} //= '-';
$opt{trim} *= $opt{width} / 100 if $opt{trimpct};
$opt{units} = [split //, ' kMGTPEZYRQqryzafpn'.($opt{ascii} ? 'u' : 'μ').'m']
if $opt{'human-readable'};
$opt{trim} *= $opt{width} / 100 if $opt{trimpct};
$opt{units} = [split //, ' kMGTPEZYRQqryzafpn'.($opt{ascii} ? 'u' : 'μ').'m']
if $opt{'human-readable'};
-$opt{anchor} //= qr/\A/;
$opt{'value-length'} = 4 if $opt{units};
$opt{'value-length'} = 1 if $opt{unmodified};
$opt{'signal-stat'} //= exists $SIG{INFO} ? 'INFO' : 'QUIT';
$opt{'value-length'} = 4 if $opt{units};
$opt{'value-length'} = 1 if $opt{unmodified};
$opt{'signal-stat'} //= exists $SIG{INFO} ? 'INFO' : 'QUIT';
@@
-211,13
+210,15
@@
if (defined $opt{interval}) {
}
my $float = qr<[0-9]* [.]? [0-9]+ (?: e[+-]?[0-9]+ )?>; # positive numberish
}
my $float = qr<[0-9]* [.]? [0-9]+ (?: e[+-]?[0-9]+ )?>; # positive numberish
-my $valmatch = qr< $opt{anchor} ( \h* -? $float |) >;
+my $valmatch = $opt{anchor} // qr/\A/;
+$valmatch .= !$opt{count} ? qr/( \h* -? $float |)/ :
+ $opt{anchor} ? qr/(\S*)/ : qr/(.*)/;
+
while (defined ($_ = $opt{input} ? shift @{ $opt{input} } : readline)) {
s/\r?\n\z//;
my $valnum;
if ($opt{count}) {
while (defined ($_ = $opt{input} ? shift @{ $opt{input} } : readline)) {
s/\r?\n\z//;
my $valnum;
if ($opt{count}) {
- ($valnum) = m/$opt{anchor} (\S*)/;
- $valnum //= '';
+ $valnum = m/$valmatch/ && $1;
$uniq{$valnum}++ and next;
push @values, $valnum;
s/\A/\n /;
$uniq{$valnum}++ and next;
push @values, $valnum;
s/\A/\n /;
@@
-535,9
+536,13
@@
or the I<NO_COLOR> environment variable.
=item B<-c>, B<--count>
Omit repetitions and count the number of occurrences.
=item B<-c>, B<--count>
Omit repetitions and count the number of occurrences.
-Similar to piping input t
o
C<sort | uniq -c>
+Similar to piping input t
hrough
C<sort | uniq -c>
but keeping the order of first appearances.
but keeping the order of first appearances.
+Lines are omitted if they (or a specified field) are identical,
+and the amount of matches is prepended and used as values
+for bars and subsequent statistics.
+
=item B<-f>, B<--field>=([B<+>]I<number> | I<regexp>)
Compare values after a given number of whitespace separators,
=item B<-f>, B<--field>=([B<+>]I<number> | I<regexp>)
Compare values after a given number of whitespace separators,