X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/ffee0c08773a4a5c4c8848193b6992a9fad4c824..0fdebc22a878aa9bd791103c8878eeb82e006b2d:/tools/convert-stats-wikimedia.pl

diff --git a/tools/convert-stats-wikimedia.pl b/tools/convert-stats-wikimedia.pl
old mode 100644
new mode 100755
index 42faf20..5c6a8bf
--- a/tools/convert-stats-wikimedia.pl
+++ b/tools/convert-stats-wikimedia.pl
@@ -1,8 +1,15 @@
-#!perl -n
+#!/usr/bin/perl -n
 use 5.010; use strict; use warnings;
 our %count;
 our $mobile;
 
+if (m{<td class=hl>} .. m{</?td>}) {
+	$count{-url} = 'http://stats.wikimedia.org/archive/squid_reports/';
+	$count{-source} = 'Wikimedia';
+	$count{-date} = $1 if m{ period: (?:\d+ )?(\w+ \d+) };
+	next;
+}
+
 # select relevant columns
 />Browser versions(.*)/ ... m{</table>} && last or next;
 my ($tr, $id, $count2, $count) = split /(?:<[^>]*>)+/;
@@ -31,10 +38,7 @@ given ($browser) {
 				($_) = $1 =~ m{^/(\d+)};
 				continue;
 			}
-			s/\d\d\.\d\K.*// or do {
-				# major part only, except for ≥v9.6
-				$_ ge '9.6' ? ($_ = '9.6') : (s/\..*//);
-			};
+			s/^\d*\.\d\K.*//;  # one significant digit
 		}
 		continue;
 	}
@@ -50,7 +54,7 @@ given ($browser) {
 				[ '525'     => '2'   ],
 				[ '528'     => '3'   ],
 				[ '531'     => '3.2' ],
-				[ '531.022' => '4.1' ],
+				[ '531.022' => '4'   ],
 				[ '533'     => '4.2' ],
 				[ '534'     => '4x' ],
 			) : (