X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/52115de0b42272dd62f54f234590ae5b4d086565..69a605876ce089075ae4fe8ca76c85630a8c6897:/browser.plp

diff --git a/browser.plp b/browser.plp
index 151daeb..330b443 100644
--- a/browser.plp
+++ b/browser.plp
@@ -1,5 +1,6 @@
 <(common.inc.plp)><:
 use 5.010;
+use List::Util qw(sum max);
 
 Html({
 	title => 'browser compatibility cheat sheet',
@@ -14,7 +15,9 @@ Html({
 :>
 <h1>Browser compatibility</h1>
 
-<p>Alternate view of Fyrd's <a href="http://caniuse.com/">when can I use...</a> site.</p>
+<p>Alternate view of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
+with <a href="http://stats.wikimedia.org/archive/squid_reports/">Wikimedia</a>
+browser usage statistics.</p>
 
 <:
 use JSON;
@@ -44,9 +47,11 @@ my $caniuse = from_json($source, {
 my %CSTATS = (
 	n => 'di-b',
 	y => 'di-aa',
-	a => 'di-d',
-	j => 'di-prop',
-	p => 'di-prop',
+	a     => 'di-d',
+	'a x' => 'di-d',
+	j     => 'di-prop',
+	p     => 'di-prop',
+	'p j' => 'di-prop',
 	'y x' => 'di-a',
 );
 my %CSTATUS = (
@@ -65,6 +70,12 @@ if (my ($somerow) = values %{ $caniuse->{data} }) {
 	}
 }
 
+my $canihas = do 'browser-usage.inc.pl' or do {
+	printf "<p>Browser usage data not found: <em>%s</em>.</p>\n", $_
+		for $! || $@;
+};
+my $scorediv = (max(map { sum(values %$_) } values %$canihas) // 1) / 100;
+
 print '<table class="mapped">';
 print '<col>' x 3;
 printf '<colgroup span="%d">', scalar @{ $versions{$_} } for @browsers;
@@ -72,19 +83,39 @@ print "\n";
 
 print '<thead><tr>';
 print '<th colspan="3">feature';
-printf '<th colspan="%d">%s',
-	scalar @{ $versions{$_} }, $caniuse->{agents}->{$_}->{browser}
-		for @browsers;
+printf('<th colspan="%d">%s',
+	scalar @{ $versions{$_} },
+	do {
+		my $name = $caniuse->{agents}->{$_}->{browser};
+		length $name < 16 ? $name : $caniuse->{agents}->{$_}->{abbr};
+	},
+) for @browsers;
+print '<th>%';
 # preceding row without any colspan to work around gecko bug
-print '<tr>';
-print '<td>' x $_ for 3, (map { scalar @{ $versions{$_} } } @browsers), 1;
+print "\n<tr>";
+print '<td>' x 3;
+for my $browser (@browsers) {
+	printf('<td title="%.1f%%">%s',
+		$canihas->{$browser}->{$_}, showversions($_),
+	) for @{ $versions{$browser} };
+}
+print '<td>' x 1;
 print "</thead>\n";
 
 sub featurescore {
 	# relative amount of support for given feature
-	state $statspts = { y=>10, 'y x'=>9, a=>5, j=>2, p=>1 };
+	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;
@@ -126,10 +157,15 @@ for my $id (sort {
 		for my $ver (@{ $versions{$browser} }, undef) {
 			unless (!defined $prev
 			or $data->{$browser}->{$prev} ~~ $data->{$browser}->{$ver}) {
-				printf '<td class="%s" colspan="%d">%s',
-					$CSTATS{ $data->{$browser}->{$prev} },
+				my $usage = sum(map { $canihas->{$browser}->{$_} } @span);
+				printf '<td class="%s" colspan="%d" title="%.1f%%">%s',
+					join(' ',
+						$CSTATS{ $data->{$browser}->{$prev} },
+						sprintf('opacity%.0f', $usage / $scorediv),
+					),
 					scalar @span,
-					join('‒', $span[0], @span > 1 ? $span[-1] : ());
+					$usage,
+					showversions(@span),
 				undef $prev;
 				@span = ();
 			}
@@ -150,6 +186,15 @@ sub paddedver {
 	return sprintf('%02d', $1) . $2;
 }
 
+sub showversions {
+	my @span = ($_[0], @_>1 ? $_[-1] : ());
+	for (@span) {
+		s/^\./0./;
+		s/x$/.*/;
+	}
+	return join('‒', @span);
+}
+
 :>
 <hr>