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

diff --git a/tools/mkusage-wikimedia b/tools/mkusage-wikimedia
index c775a4a..901ec15 100755
--- a/tools/mkusage-wikimedia
+++ b/tools/mkusage-wikimedia
@@ -3,6 +3,8 @@ use 5.010; use strict; use warnings;
 our %count;
 our $mobile;
 
+our $VERSION = '1.01';
+
 if (m{<td class=hl>} .. m{</?td>}) {
 	$count{-source} = 'http://stats.wikimedia.org/archive/squid_reports/';
 	$count{-title } = 'Wikimedia';
@@ -13,7 +15,7 @@ if (m{<td class=hl>} .. m{</?td>}) {
 # select relevant columns
 />Browser versions(.*)/ ... m{</table>} && last or next;
 my ($tr, $id, $count2, $count) = split /(?:<[^>]*>)+/;
-$mobile = $count2 =~ /(?<!non) mobile/ if $id ~~ '&nbsp;';
+$mobile = $count2 !~ /non mobile/ if $id ~~ '&nbsp;';
 next if $id ~~ ['Total', '&nbsp;'];
 
 # convert to usable syntax
@@ -23,11 +25,11 @@ $count =~ s/%$//;
 $version //= 0;
 given ($browser) {
 	when (['Firefox', 'Iceweasel']) {
-		$browser = 'firefox';
+		$browser = $mobile ? 'and_ff' : 'firefox';
 		continue;
 	}
 	when ('MSIE') {
-		$browser = 'ie';
+		$browser = $mobile ? 'ie_mob' : 'ie';
 		continue;
 	}
 	when ('Opera') {
@@ -72,12 +74,18 @@ given ($browser) {
 		}
 	}
 	when ('Chrome') {
-		$browser = 'chrome';
+		$browser = $mobile ? 'and_chr' : 'chrome';
 		s/\.\d+$// for $version;
 	}
 	when ('Android') {
 		$browser = 'android';
 	}
+	when ('BlackBerry') {
+		$browser = 'bb';
+	}
+	when ('UCWEB') {
+		$browser = 'and_uc';
+	}
 	s/\.0$// for $version;
 }