browser: additional footer row with browser families

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index beff4a9a99a251344883eb8d660de8f713541def..322fa36d42d31b206302b1070c5a7a79e37bf3cd 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -23,8 +23,11 @@ say "<h1>Browser compatibility</h1>\n";
 
 my $caniuse = do 'browser-support.inc.pl' or die $! || $@;
 $_->{verrelease} = {
-       # mark last two (future) versions as unreleased, ensure current isn't
-       map { $_->[-1] => 0, $_->[-2] => 0, $_->[-3] => undef } $_->{versions}
+       # mark last three (future) versions as unreleased, ensure current isn't
+       map {
+               $_->[-1] => 0, $_->[-2] => 0, $_->[-3] => 0,
+               $_->[-4] => undef,
+       } $_->{versions}
 } for values %{ $caniuse->{agents} };
 
 my %CSTATS = (
@@ -73,12 +76,12 @@ if (my ($somerow) = values %{ $caniuse->{data} }) {
                $versions{$browser} = [ sort { paddedver($a) cmp paddedver($b) } keys %$row ];
        }
 }
-my @browsers = keys %versions;
 
 print <<'';
 <p id="intro">Alternate rendition of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
 
-my ($canihas, $usage, $minusage);
+my ($canihas, $usage);
+my $minusage = $get{threshold} // .5;
 given ($get{usage} // 'wm') {
        when (!$_) {
                # none
@@ -98,12 +101,18 @@ given ($get{usage} // 'wm') {
        $ref .= " $_" for $canihas->{-date} || ();
        print "\nwith $ref browser usage statistics";
 }
+
+my @browsers;
 if ($usage) { # first() does not work inside given >:(
        # adapt version usage to actual support data
        my %engineuse;  # prefix => usage sum
        for my $browser (keys %versions) {
                my $row = $canihas->{$browser} // {};
                my $verlist = $versions{$browser} or next;
+               if ($minusage and sum(values %$row) < $minusage) {
+                       delete $versions{$browser};
+                       next;
+               }
                my %supported = map { $_ => 1 } @$verlist;
 
                # cascade unknown versions
@@ -117,7 +126,7 @@ if ($usage) { # first() does not work inside given >:(
                }
 
                # build row list for each version
-               if ($minusage = $get{threshold} // .5) {
+               if ($minusage) {
                        my @vershown;  # $verlist replacement
                        my ($rowusage, @verrow) = (0);  # replacement row tracking
                        for (@$verlist) {
@@ -145,7 +154,7 @@ if ($usage) { # first() does not work inside given >:(
                $engineuse{ $caniuse->{agents}->{$a}->{prefix} }
                        ||
                $canihas->{$b}->{-total} <=> $canihas->{$a}->{-total}
-       } @browsers;
+       } keys %versions;
 }
 else {
        # order browser columns by name grouped by engine
@@ -154,7 +163,7 @@ else {
                $caniuse->{agents}->{$a}->{prefix}
                        ||
                $a cmp $b
-       } @browsers;
+       } keys %versions;
 }
 :>.
 </p>
@@ -231,7 +240,22 @@ for my $browser (@browsers) {
 }
 print '<td>' x 1;
 say '</thead>';
-say '<tfoot>', $header, '</tfoot>';
+say '<tfoot>', $header;
+{
+       # prefix indicates browser family; count adjacent families
+       my (@families, %familycount);
+       for my $browser (@browsers) {
+               my $family = $caniuse->{agents}->{$browser}->{prefix};
+               push @families, $family unless $familycount{$family};
+               $familycount{$family} += @{ $versions{$browser} };
+       }
+
+       print "\n", '<tr class="cat">';
+       print '<td>' x 3;
+       printf '<th colspan="%d">%s', $familycount{$_}, $_ for @families;
+       print '<td>';
+}
+say '</tfoot>';
 
 sub featurescore {
        # relative amount of support for given feature
@@ -395,7 +419,7 @@ sub paddedver {
        # normalised version number comparable as string (cmp)
        shift =~ /(?:.*-|^)(\d*)(.*)/;
        # matched (major)(.minor) of last value in range (a-B)
-       return sprintf('%02d', $1 || 0) . $2;
+       return sprintf('%02d', $1 || 99) . $2;
 }
 
 sub showversions {