browser: support new caniuse data

diff --git a/browser.plp b/browser.plp
index 75605fd1492e6570dcdb01fe349bc14b435c3f27..ea23d0afae18702ac0d47b3e0d9c63e9b95f9feb 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -109,6 +109,7 @@ sub featurescore {
        if (my $row = shift) {
                if ($canihas) {
                        while (my ($browser, $versions) = each %$row) {
+                               ref $versions eq 'HASH' or next;
                                while (my ($version, $_) = each %$versions) {
                                        $rank += $canihas->{$browser}->{$version} * $statspts->{$_};
                                }
@@ -151,7 +152,7 @@ for my $id (sort {
                $row->{description}, $row->{notes};
        printf 'Resources: %s.', join(', ',
                map { qq(<a href="$_->{url}">$_->{title}</a>) } @$_
-       ) for $row->{links} // ();
+       ) for grep { @$_ } $row->{links} // ();
        print '</div>';
        for ($row->{status}) {
                my $cell = $_ // '-';
@@ -163,11 +164,15 @@ for my $id (sort {
                my ($prev, @span);
                for my $ver (@{ $versions{$browser} }, undef) {
                        unless (!defined $prev
-                       or $data->{$browser}->{$prev} ~~ $data->{$browser}->{$ver}) {
+                       or ref $data->{$browser} eq 'HASH'
+                       && $data->{$browser}->{$prev} ~~ $data->{$browser}->{$ver}) {
                                my $usage = sum(map { $canihas->{$browser}->{$_} } @span);
                                printf '<td class="%s" colspan="%d" title="%.1f%%">%s',
                                        join(' ',
-                                               X => $CSTATS{ $data->{$browser}->{$prev} },
+                                               X => $CSTATS{
+                                                       ref $data->{$browser} ne 'HASH' ? 'u' :
+                                                               $data->{$browser}->{$prev} // 'u'
+                                               },
                                                !$usage ? ('p0') : ('p',
                                                        sprintf('p%01d', $usage / 10),
                                                        sprintf('p%02d', $usage),

diff --git a/tools/convert-caniuse.pl b/tools/convert-caniuse.pl
index 7006b18f99b371dbaef57005a524e6c6da214b11..467b9ba7b5405cdfc37304638332ea1960c89260 100755 (executable)
--- a/tools/convert-caniuse.pl
+++ b/tools/convert-caniuse.pl
@@ -12,14 +12,14 @@ my $source = readline;
 
 for ($source) { # cleanup
        # convert seperate variables to hash keys
-       s/\A/{/;
-       s/^caniuse\.(\w+) = /"$1":/gm;
+       s/\A/{\n/;
+       s/^caniuse\.(\w+) *= */"$1":/gm;
        s/;$/,/gm;
        s/,\s*\Z/\n}/;
        # fractions not supported by barekey
-       s/(?<=[,{]) (\d*\.\d) (?=:')/"$1"/gx;
+       s/(?<=[,{\n]) (\d*\.\d) (?=:['"])/"$1"/gx;
        # escapes not supported in singlequote
-       s{'((?:[^\\']+|\\.)*)'}{
+       s{: *\K'((?:[^\\']+|\\.)*)'}{
                my $_ = $1;
                s/"/\\"/g;
                s/\\'/'/g;