X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/dd0fba64e720055cf4733f422efef687a16d49fa..e8e8d5a7167d69ba8ccc16dab1ab39c40899a5b8:/tools/mkusage-wikimedia

diff --git a/tools/mkusage-wikimedia b/tools/mkusage-wikimedia
index 901ec15..63cded2 100755
--- a/tools/mkusage-wikimedia
+++ b/tools/mkusage-wikimedia
@@ -1,9 +1,10 @@
 #!/usr/bin/perl -n
-use 5.010; use strict; use warnings;
+use 5.012;
+use warnings;
 our %count;
 our $mobile;
 
-our $VERSION = '1.01';
+our $VERSION = '1.02';
 
 if (m{<td class=hl>} .. m{</?td>}) {
 	$count{-source} = 'http://stats.wikimedia.org/archive/squid_reports/';
@@ -12,14 +13,44 @@ if (m{<td class=hl>} .. m{</?td>}) {
 	next;
 }
 
-# select relevant columns
-/>Browser versions(.*)/ ... m{</table>} && last or next;
-my ($tr, $id, $count2, $count) = split /(?:<[^>]*>)+/;
-$mobile = $count2 !~ /non mobile/ if $id ~~ '&nbsp;';
-next if $id ~~ ['Total', '&nbsp;'];
+# select relevant data
+/>In alphabetical order/ .. eof or next;  # second table
+my ($id, $count2, $count) = map { s/<[^>]*>//gr } split /<\/td>/;
+
+if (/>Browser engines/ ... m{</table>}) {
+	my $apple = $id =~ s/^AppleWebKit ?//;
+	$apple .. 1 or next;
+	my ($abs) = m/>showCount\((\d+),/;
+
+	state %version;
+	if (defined $count2) {
+		$version{$id} = $abs;
+		next;
+	}
+
+	# replace safari total percentage by individual version counts
+	# have to use combined distribution for multiple platforms :(
+	for my $browser (qw/ safari ios_saf /) {
+		my $multiplier = delete $count{$browser}{'0.0'} or next;
+		$multiplier /= $abs;  # total number
+		while (my ($verwebkit, $count) = each %version) {
+			my $ver = safariver($verwebkit, $browser eq 'ios_saf');
+			$count{$browser}{$ver} += $count * $multiplier;
+		}
+	}
+	last;
+}
+
+# select version data
+/>Browser versions(.*)/ ... !defined $count2 or next;
+unless (defined $count2) {
+	# header row if no td separator
+	$mobile = $id !~ /non mobile/;
+	next;
+}
 
 # convert to usable syntax
-my ($browser, $version) = split /\h+/, $id, 2;
+my ($browser, $version) = split /\h+/, $id || ' ', 2;
 $count =~ s/,//g;
 $count =~ s/%$//;
 $version //= 0;
@@ -46,32 +77,6 @@ given ($browser) {
 	}
 	when ('Safari') {
 		$browser = $mobile ? 'ios_saf' : 'safari';
-		my $numversion = join('.', map { sprintf '%03d', $_ } split /\./, $version);
-		$numversion =~ s/6(?=\d{3})//;  # incomparable 6532.22 → 523
-		for (
-			# http://en.wikipedia.org/wiki/Safari_version_history
-			$mobile ? (
-				[ '413'     => '1'   ],
-				[ '419'     => '1.1' ],
-				[ '525'     => '2'   ],
-				[ '528'     => '3'   ],
-				[ '531'     => '3.2' ],
-				[ '531.022' => '4'   ],
-				[ '533'     => '4.2' ],
-				[ '534'     => '4x' ],
-			) : (
-				[ '413'     => '2'   ],
-				[ '522'     => '3'   ],
-				[ '525.013' => '3.1' ],
-				[ '525.026' => '3.2' ],
-				[ '526'     => '4'   ],
-				[ '533'     => '5'   ],
-				[ '534'     => '5x'  ],
-			)
-		) {
-			last if $numversion lt $_->[0];
-			$version = $_->[1];
-		}
 	}
 	when ('Chrome') {
 		$browser = $mobile ? 'and_chr' : 'chrome';
@@ -96,6 +101,41 @@ END {
 	print pp(\%count);
 }
 
+sub safariver {
+	my ($webkitnum, $ios) = @_;
+	my $safarinum = '';
+	for (
+		$ios ? (
+			[ 413 => '1'   ],
+			[ 419 => '1.1' ],
+			[ 525 => '2'   ],
+			[ 528 => '3'   ],
+			[ 531 => '3.2' ], # or 4 from 531.022
+			[ 532 => '4'   ],
+			[ 533 => '4.2' ],
+			[ 534 => '5'   ],
+			[ 536 => '7'   ],
+			[ 537 => '8'   ],
+			[ 600 => '8.1' ],
+		) : (
+			# http://en.wikipedia.org/wiki/Safari_version_history
+			[ 412 => '2'   ],
+			[ 522 => '3'   ],
+			[ 525 => '3.1' ], # 3.2 from 525.026
+			[ 526 => '4'   ],
+			[ 533 => '5'   ], # or 4.1
+			[ 534 => '5.1' ],
+			[ 536 => '6'   ],
+			[ 537 => '7.1' ], # or 6.1 or 7.0
+			[ 538 => '8'   ],
+		)
+	) {
+		last if $webkitnum lt $_->[0];
+		$safarinum = $_->[1];
+	}
+	return $safarinum;
+}
+
 __END__
 
 =head1 USAGE