browser: precalculate row usage values

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index a78e0ecab8f37c178bfa300ecc6b9a58b7473879..a101d741e4fb2071e0499b9cd65b9c85601cae90 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -80,17 +80,18 @@ my %CSTATUS = (
        other => 'l0', # non-w3
 );
 my %versions;
-if (my ($somerow) = values %{ $caniuse->{data} }) {
-       while (my ($browser, $row) = each %{ $somerow->{stats} }) {
-               $versions{$browser} = [ sort { paddedver($a) cmp paddedver($b) } keys %$row ];
-       }
+while (my ($browser, $row) = each %{ $caniuse->{agents} }) {
+       $versions{$browser} = [
+               sort { paddedver($a) cmp paddedver($b) } grep { defined }
+               @{ $row->{versions} }
+       ];
 }
 
 print <<'';
 <p id="intro">Alternate rendition of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
 
 my ($canihas, $usage);
-my $minusage = $get{threshold} // .7;
+my $minusage = $get{threshold} // 1;
 given ($get{usage} // 'wm') {
        when (!$_) {
                # none
@@ -195,13 +196,14 @@ $canihas ||= {
                }
        } @browsers
 }; # fallback hash based on release semantics
-my $usagemax = (max(map { ref $_ eq 'HASH' && sum(values %$_) } values %$canihas) // 1) / 100;
 
 my $usagepct = 1;  # score multiplier for 0..100 result
 # normalise usage percentage to only include shown browsers
 $usagepct = 100.01 / featurescore({  # yes for every possible version
        map { $_ => { map {$_ => 'y'} map { @{$_} } @{$versions{$_}} } } keys %versions
 });
+$_->{usage} = featurescore($_->{stats}) * $usagepct
+       for values %{ $caniuse->{data} };
 
 print '<table class="mapped">';
 print '<col span="3">';  # should match first thead row
@@ -311,6 +313,15 @@ sub formatnotes {
        return @html;
 }
 
+sub notestotitle {
+       my @notes = @_;
+       for (@notes) {
+               EscapeHTML($_);
+               s{ \[ ([^]]*) \] \( [^)]* \) }{$1}gx;  # strip link urls
+       }
+       return @notes;
+}
+
 sub saytitlecol {
        my ($id) = @_;
        my $row = $caniuse->{data}->{$id};
@@ -396,7 +407,7 @@ sub saybrowsercols {
                                map { split / /, $_ }
                                $prev
                        ));
-                       $title .= "\n".EscapeHTML($_) for @notes;
+                       $title .= "\n$_" for notestotitle(@notes);
 
                        printf('<td class="%s" colspan="%d" title="%s">%s',
                                join(' ',
@@ -405,7 +416,6 @@ sub saybrowsercols {
                                                sprintf('p%01d', $usage * ($usagepct - .0001) / 10),
                                                sprintf('p%02d', $usage * ($usagepct - .0001)),
                                        ),
-                                       sprintf('pp%02d', $usage / $usagemax),
                                ),
                                scalar @span,
                                $title,
@@ -421,13 +431,12 @@ sub saybrowsercols {
 
 sub sayusagecol {
        my ($id) = @_;
-       print '<td>', int featurescore($caniuse->{data}->{$id}->{stats}) * $usagepct;
+       print '<td>', int $caniuse->{data}->{$id}->{usage};
 }
 
 say '<tbody>';
 for my $id (sort {
-           featurescore($caniuse->{data}->{$b}->{stats})
-       <=> featurescore($caniuse->{data}->{$a}->{stats})
+       $caniuse->{data}->{$b}->{usage} <=> $caniuse->{data}->{$a}->{usage}
 } keys %{ $caniuse->{data} }) {
        $caniuse->{data}->{$id}->{stats} or next;  # skip metadata [summary]
        printf '<tr id="%s">', $id;