X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/92c23f29d582b9776292bb186f20c3f4dba4c9f3..7eef0272a71f7610177d3a617f947758e415d565:/browser.plp?ds=inline
diff --git a/browser.plp b/browser.plp
index e82e69e..005ab16 100644
--- a/browser.plp
+++ b/browser.plp
@@ -1,5 +1,6 @@
<(common.inc.plp)><:
use 5.010;
+use utf8;
use List::Util qw(sum max);
Html({
@@ -9,7 +10,7 @@ Html({
"caniuse.",
keywords => [qw'html css browser feature'],
stylesheet => [qw'light dark circus mono red'],
- data => ['caniuse.js'],
+ data => ['browser-support.inc.pl'],
});
:>
@@ -20,29 +21,7 @@ with Wikimedia
browser usage statistics.
<:
-use JSON;
-use File::Slurp 'read_file';
-my $source = read_file('caniuse.js');
-for ($source) { # cleanup
- # convert seperate variables to hash keys
- s/\A/{/;
- s/^caniuse\.(\w+) = /"$1":/gm;
- s/;$/,/gm;
- s/,\s*\Z/\n}/;
- # fractions not supported by barekey
- s/(?<=[,{]) (\d*\.\d) (?=:')/"$1"/gx;
- # escapes not supported in singlequote
- s{'((?:[^\\']+|\\.)*)'}{
- my $_ = $1;
- s/"/\\"/g;
- s/\\'/'/g;
- qq("$_");
- }ge;
-}
-my $caniuse = from_json($source, {
-# allow_singlequote => 1,
- allow_barekey => 1,
-});
+my $caniuse = do 'browser-support.inc.pl' or die $! || $@;
my %CSTATS = (
n => 'di-b',
@@ -81,14 +60,31 @@ print '' x 3;
printf '', scalar @{ $versions{$_} } for @browsers;
print "\n";
-print '';
-print 'feature';
-printf ' | %s',
- scalar @{ $versions{$_} }, $caniuse->{agents}->{$_}->{browser}
- for @browsers;
+my $header = join('',
+ ' |
',
+ 'feature',
+ (map {
+ sprintf(' | %s',
+ scalar @{ $versions{$_} },
+ sum(values %{ $canihas->{$_} }),
+ do {
+ my $name = $caniuse->{agents}->{$_}->{browser};
+ length $name < 16 ? $name : $caniuse->{agents}->{$_}->{abbr};
+ },
+ )
+ } @browsers),
+ ' | %',
+);
+print '', $header;
# preceding row without any colspan to work around gecko bug
-print '';
-print '' x $_ for 3, (map { scalar @{ $versions{$_} } } @browsers), 1;
+print "\n | ";
+print '' x 3;
+for my $browser (@browsers) {
+ printf(' | %s',
+ $canihas->{$browser}->{$_}, showversions($_),
+ ) for @{ $versions{$browser} };
+}
+print ' | ' x 1;
print " | \n";
sub featurescore {
@@ -96,6 +92,15 @@ sub featurescore {
state $statspts = { y=>10, 'y x'=>9, a=>5, 'a x'=>5, j=>2, 'p j'=>2, p=>1 };
my $rank = 0;
if (my $row = shift) {
+ if ($canihas) {
+ while (my ($browser, $versions) = each %$row) {
+ while (my ($version, $_) = each %$versions) {
+ $rank += $canihas->{$browser}->{$version} * $statspts->{$_};
+ }
+ }
+ return $rank;
+ }
+
while (my ($browser, $vercols) = each %versions) {
my $div = 0; # multiplier exponent (decreased to lower value)
my @vers = map { $row->{$browser}->{$_} } @$vercols;
@@ -145,7 +150,7 @@ for my $id (sort {
),
scalar @span,
$usage,
- showversions(\@span),
+ showversions(@span),
undef $prev;
@span = ();
}
@@ -158,6 +163,7 @@ for my $id (sort {
});
print ' | ', int featurescore($caniuse->{data}->{$id}->{stats}) / $maxscore * 100;
}
+print ' |
', $header;
print '';
sub paddedver {
@@ -167,13 +173,12 @@ sub paddedver {
}
sub showversions {
- my ($span) = @_;
- splice @$span, 1, -1;
- for (@$span) {
+ my @span = ($_[0], @_>1 ? $_[-1] : ());
+ for (@span) {
s/^\./0./;
s/x$/.*/;
}
- return join('â', @$span);
+ return join('â', @span);
}
:>