X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/ff13359d0999d7b29d1326bc3bf63008821f53b6..edb313a940627abab92ecc67a953502043346b94:/browser.plp

diff --git a/browser.plp b/browser.plp
index ec7e368..9adf10e 100644
--- a/browser.plp
+++ b/browser.plp
@@ -65,7 +65,7 @@ my %CSTATUS = (
 	cr    => 'l4', # candidate
 	pr    => 'l4', # proposed
 	rec   => 'l5', # recommendation
-	other => 'l5', # non-w3
+	other => 'l2', # non-w3
 	ietf  => 'l5', # standard
 );
 my %versions;
@@ -142,7 +142,7 @@ sub featurescore {
 			while (my ($browser, $versions) = each %$row) {
 				ref $versions eq 'HASH' or next;
 				while (my ($version, $_) = each %$versions) {
-					$rank += $canihas->{$browser}->{$version} * $statspts->{$_};
+					$rank += ($canihas->{$browser}->{$version} || .001) * $statspts->{$_};
 				}
 			}
 			return $rank;
@@ -166,17 +166,15 @@ sub featurescore {
 	return $rank;
 }
 
-for my $id (sort {
-	    featurescore($caniuse->{data}->{$b}->{stats})
-	<=> featurescore($caniuse->{data}->{$a}->{stats})
-} keys %{ $caniuse->{data} }) {
+sub saytitlecol {
+	my ($id) = @_;
 	my $row = $caniuse->{data}->{$id};
-	my $data = $row->{stats} or next;  # skip metadata [summary]
-	printf '<tr id="%s">', $id;
+
 	for ($row->{categories}) {
 		my $cell = $_ ? lc $_->[0] : '-';
 		print '<th>', $cell;
 	}
+
 	print '<td>', map {
 		sprintf('<a href="%s" onclick="%s">%s</a>',
 			"#$id",
@@ -193,46 +191,69 @@ for my $id (sort {
 		map { qq(<a href="$_->{url}">$_->{title}</a>) } @$_
 	) for grep { @$_ } $row->{links} // ();
 	print '</div>';
+}
+
+sub saystatuscol {
+	my ($id) = @_;
+	my $row = $caniuse->{data}->{$id};
+
 	for ($row->{status}) {
 		my $cell = $_ // '-';
 		$cell = sprintf '<a href="%s">%s</a>', $_, $cell for $row->{spec} // ();
 		printf '<td title="%s" class="l %s">%s',
 			$caniuse->{statuses}->{$_}, $CSTATUS{$_} // '', $cell;
 	}
-	for my $browser (@browsers) {
-		my ($prev, @span);
-		for my $ver (@{ $versions{$browser} }, undef) {
-			unless (!defined $prev
-			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{
-							ref $data->{$browser} ne 'HASH' ? 'u' :
-								$data->{$browser}->{$prev} // 'u'
-						},
-						!$usage ? ('p0') : ('p',
-							sprintf('p%01d', $usage / 10),
-							sprintf('p%02d', $usage),
-						),
-						sprintf('pp%02d', $usage / $scorediv),
+}
+
+sub saybrowsercols {
+	my ($id, $browser) = @_;
+	my $data = $caniuse->{data}->{$id}->{stats}->{$browser};
+
+	my ($prev, @span);
+	for my $ver (@{ $versions{$browser} }, undef) {
+		unless (!defined $prev
+		or ref $data eq 'HASH' && $data->{$prev} ~~ $data->{$ver}) {
+			my $usage = sum(map { $canihas->{$browser}->{$_} } @span);
+			printf '<td class="%s" colspan="%d" title="%.1f%%">%s',
+				join(' ',
+					X => $CSTATS{ ref $data eq 'HASH' && $data->{$prev} || 'u' },
+					!$usage ? ('p0') : ('p',
+						sprintf('p%01d', $usage / 10),
+						sprintf('p%02d', $usage),
 					),
-					scalar @span,
-					$usage,
-					showversions(@span),
-				undef $prev;
-				@span = ();
-			}
-			push @span, $ver;
-			$prev = $ver;
+					sprintf('pp%02d', $usage / $scorediv),
+				),
+				scalar @span,
+				$usage,
+				showversions(@span),
+			undef $prev;
+			@span = ();
 		}
+		push @span, $ver;
+		$prev = $ver;
 	}
+}
+
+sub sayusagecol {
+	my ($id) = @_;
 	state $maxscore = featurescore({  # yes for every possible version
 		map { $_ => { map {$_ => 'y'} @{$versions{$_}} } } keys %versions
 	});
 	print '<td>', int featurescore($caniuse->{data}->{$id}->{stats}) / $maxscore * 100;
 }
+
+for my $id (sort {
+	    featurescore($caniuse->{data}->{$b}->{stats})
+	<=> featurescore($caniuse->{data}->{$a}->{stats})
+} keys %{ $caniuse->{data} }) {
+	$caniuse->{data}->{$id}->{stats} or next;  # skip metadata [summary]
+	printf '<tr id="%s">', $id;
+	saytitlecol($id);
+	saystatuscol($id);
+	saybrowsercols($id, $_) for @browsers;
+	sayusagecol($id);
+	say '</tr>';
+}
 print '<tfoot>', $header;
 print '</table>';
 
@@ -262,7 +283,7 @@ sub showversions {
 	<td class="X l2">external (js/plugin)
 	<td class="X l1">missing
 	<td class="X l0">unknown
-	<td class="X l0 ex">prefixed
+	<td class="X ex">prefixed
 	</table>
 
 	<p><: if ($usage) { :>