From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 17 Dec 2010 19:33:48 +0000 (+0100)
Subject: browser: renamed agent keys
X-Git-Tag: v1.5~104
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/7affe2df7fee946f49e1561a5f58240bd0309b4f

browser: renamed agent keys

Data uses more appropriate browser names instead of layout engine since
2010-12-17, as per my suggestion.
---

diff --git a/browser.plp b/browser.plp
index 53be344..8c6b5ed 100644
--- a/browser.plp
+++ b/browser.plp
@@ -69,7 +69,7 @@ if (my ($somerow) = values %{ $caniuse->{data} }) {
 	}
 }
 my @browsers = grep { $versions{$_} }
-	qw(trident gecko webkit_saf ios_saf webkit_chr android presto op_mob op_mini);
+	qw(trident ie gecko firefox webkit_saf safari ios_saf webkit_chr chrome android presto opera op_mob op_mini);
 
 print <<'';
 <p id="intro">Alternate rendition of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
diff --git a/tools/convert-stats-gs.pl b/tools/convert-stats-gs.pl
index 7514659..c01691d 100644
--- a/tools/convert-stats-gs.pl
+++ b/tools/convert-stats-gs.pl
@@ -7,12 +7,12 @@ use Data::Dump 'pp';
 use Text::CSV;
 
 my %BROWSERID = qw(
-	IE          trident
-	Firefox     gecko
-	Safari      webkit_saf
+	IE          ie
+	Firefox     firefox
+	Safari      safari
 	Safari-iPad ios_saf
-	Chrome      webkit_chr
-	Opera       presto
+	Chrome      chrome
+	Opera       opera
 
 	Android     android
 	iPhone      ios_saf
@@ -61,7 +61,7 @@ if (@ARGV) {
 			ref $_ eq 'HASH' or next;
 			$_ *= $mult{Desktop} / $mult{Mobile} for values %$_;
 		}
-		$count{Opera} = delete $count{presto};  # preserve
+		$count{Opera} = delete $count{opera};  # preserve
 
 		$url = $site.'mobile_browser';
 		$download = LWP::Simple::get($url) or warn "No data from $url\n";
@@ -73,8 +73,8 @@ if (@ARGV) {
 			ref $_ eq 'HASH' or next;
 			$_ *= $mult{Mobile} for values %$_;
 		}
-		$count{op_mini} = delete $count{presto}; # mobile distinction
-		$count{presto}  = delete $count{Opera};  # restore desktop
+		$count{op_mini} = delete $count{opera};  # mobile distinction
+		$count{opera}   = delete $count{Opera};  # restore desktop
 	}
 }
 else {
diff --git a/tools/convert-stats-wikimedia.pl b/tools/convert-stats-wikimedia.pl
index 382fe0c..1e9b1c3 100755
--- a/tools/convert-stats-wikimedia.pl
+++ b/tools/convert-stats-wikimedia.pl
@@ -23,15 +23,15 @@ $count =~ s/%$//;
 $version //= 0;
 given ($browser) {
 	when (['Firefox', 'Iceweasel']) {
-		$browser = 'gecko';
+		$browser = 'firefox';
 		continue;
 	}
 	when ('MSIE') {
-		$browser = 'trident';
+		$browser = 'ie';
 		continue;
 	}
 	when ('Opera') {
-		$browser = $mobile ? 'op_mob' : 'presto';
+		$browser = $mobile ? 'op_mob' : 'opera';
 		for ($version) {
 			if (m{\(Mini(.*)\)$}) {
 				$browser = 'op_mini';
@@ -43,7 +43,7 @@ given ($browser) {
 		continue;
 	}
 	when ('Safari') {
-		$browser = $mobile ? 'ios_saf' : 'webkit_saf';
+		$browser = $mobile ? 'ios_saf' : 'safari';
 		my $numversion = join('.', map { sprintf '%03d', $_ } split /\./, $version);
 		$numversion =~ s/6(?=\d{3})//;  # incomparable 6532.22 → 523
 		for (
@@ -72,7 +72,7 @@ given ($browser) {
 		}
 	}
 	when ('Chrome') {
-		$browser = 'webkit_chr';
+		$browser = 'chrome';
 		s/\.\d+$// for $version;
 	}
 	when ('Android') {