X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/09716a4fe69eb9e6a6197196d6f290db9be1a6d2..5c6226f7284e7b0ce87825f4a90d083d03f94388:/browser.plp

diff --git a/browser.plp b/browser.plp
index 6c06a2e..da50b2d 100644
--- a/browser.plp
+++ b/browser.plp
@@ -68,8 +68,7 @@ if (my ($somerow) = values %{ $caniuse->{data} }) {
 		$versions{$browser} = [ sort { paddedver($a) cmp paddedver($b) } keys %$row ];
 	}
 }
-my @browsers = grep { $versions{$_} }
-	qw(trident gecko webkit_saf ios_saf webkit_chr android presto op_mob op_mini);
+my @browsers = keys %versions;
 
 print <<'';
 <p id="intro">Alternate rendition of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
@@ -79,7 +78,7 @@ given ($get{usage} // 'wm') {
 	when (!$_) {
 		# none
 	}
-	when (!/^\w+$/) {
+	when (!/^[a-z][\w-]+$/) {
 		printf "<p>Invalid browser usage data request: <em>%s</em>",
 			'identifier must be alphanumeric name or <q>0</q>';
 	}
@@ -94,11 +93,14 @@ given ($get{usage} // 'wm') {
 	$ref .= " $_" for $canihas->{-date} || ();
 	print "\nwith $ref browser usage statistics";
 }
-if ($usage) {
-	# first() does not work inside given >:(
+if ($usage) { # first() does not work inside given >:(
+	# adapt version usage to actual support data
+	my %engineuse;  # prefix => usage sum
 	while (my ($browser, $row) = each %$canihas) {
 		my $verlist = $versions{$browser} or next;
 		my %supported = map { $_ => 1 } @$verlist;
+
+		# cascade unknown versions
 		$row->{$_} //= undef for @$verlist;  # ensure stable keys during iteration
 		while (my ($version, $usage) = each %$row) {
 			next if defined $supported{$version};
@@ -107,7 +109,28 @@ if ($usage) {
 			$row->{$next} += $usage;
 			$row->{$version} = 0;  # balance browser total
 		}
+
+		# reusable aggregates (grouped by prefix (engine) and browser)
+		$engineuse{ $caniuse->{agents}->{$browser}->{prefix} } +=
+		$row->{-total} = sum(values %$row);
 	}
+
+	# order browser columns by usage grouped by engine
+	@browsers = sort {
+		$engineuse{ $caniuse->{agents}->{$b}->{prefix} } <=>
+		$engineuse{ $caniuse->{agents}->{$a}->{prefix} }
+			||
+		$canihas->{$b}->{-total} <=> $canihas->{$a}->{-total}
+	} @browsers;
+}
+else {
+	# order browser columns by name grouped by engine
+	@browsers = sort {
+		$caniuse->{agents}->{$b}->{prefix} cmp
+		$caniuse->{agents}->{$a}->{prefix}
+			||
+		$a cmp $b
+	} @browsers;
 }
 :>.
 </p>
@@ -131,7 +154,7 @@ my $usagemax = (max(map { ref $_ eq 'HASH' && sum(values %$_) } values %$canihas
 
 my $usagepct = 1;  # score multiplier for 0..100 result
 # normalise usage percentage to only include shown browsers
-$usagepct = 100 / featurescore({  # yes for every possible version
+$usagepct = 100.01 / featurescore({  # yes for every possible version
 	map { $_ => { map {$_ => 'y'} @{$versions{$_}} } } keys %versions
 });
 
@@ -151,7 +174,7 @@ my $header = join('',
 				$_, @{ $caniuse->{agents}->{$_} }{'prefix', 'type'},
 			),
 			join(' ',
-				sprintf('%.1f%%', sum(values %{ $canihas->{$_} }) * $usagepct),
+				sprintf('%.1f%%', $canihas->{$_}->{-total} * $usagepct),
 				$name,
 			),
 			do {
@@ -265,15 +288,29 @@ sub saystatuscol {
 sub saybrowsercols {
 	my ($id, $browser) = @_;
 	my $data = $caniuse->{data}->{$id}->{stats}->{$browser};
+	if (ref $data eq 'ARRAY') {
+		# special case for unsupported
+		my $release = $caniuse->{agents}->{$browser}->{verrelease};
+		$data = {
+			map { $_ => defined $release->{$_} ? 'u' : 'n' } keys %$release
+		};
+	}
 
 	my ($prev, @span);
 	for my $ver (@{ $versions{$browser} }, undef) {
-		unless (!defined $prev
-		or ref $data eq 'HASH' && $data->{$prev} ~~ $data->{$ver}) {
+		my $compare = (
+			!defined $ver ? undef :      # last column if nameless
+			ref $data ne 'HASH' ? '' :   # unclassified if no support hash
+			$data->{$ver} // $prev       # known or inherit from predecessor
+			// (grep { defined } @{$data}{ @{ $versions{$browser} } })[0]
+			   ~~ 'n' && 'n'             # first known version is unsupported
+			|| 'u'                       # unsure
+		);
+		unless (!defined $prev or $prev ~~ $compare) {
 			my $usage = sum(map { $canihas->{$browser}->{$_} } @span);
 			printf '<td class="%s" colspan="%d" title="%s">%s',
 				join(' ',
-					X => $CSTATS{ ref $data eq 'HASH' && $data->{$prev} || 'u' },
+					X => $CSTATS{$prev},
 					!$usage ? ('p0') : ('p',
 						sprintf('p%01d', $usage * ($usagepct - .0001) / 10),
 						sprintf('p%02d', $usage * ($usagepct - .0001)),
@@ -285,14 +322,14 @@ sub saybrowsercols {
 					map { ref $_ eq 'CODE' ? $_->($browser) : $_ }
 					map { $DSTATS{$_} // () }
 					map { split / /, $_ }
-					ref $data eq 'HASH' && $data->{$prev} || 'u'
+					$prev
 				)),
 				showversions(@span),
 			undef $prev;
 			@span = ();
 		}
 		push @span, $ver;
-		$prev = $ver;
+		$prev = $compare;
 	}
 }