font: file ids and os grouping

[sheet.git] / tools / convert-stats-wikimedia.pl

diff --git a/tools/convert-stats-wikimedia.pl b/tools/convert-stats-wikimedia.pl
index 5c6a8bf32770c50977104cf2a53af3157e1d38ae..1e9b1c3d1afee4db72e763b5756365282dcfc48b 100755 (executable)
--- a/tools/convert-stats-wikimedia.pl
+++ b/tools/convert-stats-wikimedia.pl
@@ -4,8 +4,8 @@ our %count;
 our $mobile;
 
 if (m{<td class=hl>} .. m{</?td>}) {
-       $count{-url} = 'http://stats.wikimedia.org/archive/squid_reports/';
-       $count{-source} = 'Wikimedia';
+       $count{-source} = 'http://stats.wikimedia.org/archive/squid_reports/';
+       $count{-title } = 'Wikimedia';
        $count{-date} = $1 if m{ period: (?:\d+ )?(\w+ \d+) };
        next;
 }
@@ -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') {