fixes #5242 - added detection for Wolder devices

matomo-org · Jul 29, 2014 · d636108 · d636108
1 parent 0b72a48
commit d636108
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 19 deletions.
diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php
@@ -235,6 +235,7 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'WB' => 'Web TV',
         'WE' => 'WellcoM',
         'WI' => 'Wiko',
+        'WL' => 'Wolder',
         'WO' => 'Wonu',
         'WX' => 'Woxter',
         'XI' => 'Xiaomi',

diff --git a/Tests/fixtures/smartphone.yml b/Tests/fixtures/smartphone.yml
@@ -20654,7 +20654,24 @@
     model: Sublim
   os_family: Android
   browser_family: Android Browser
-- 
+-
+  user_agent: mozilla/5.0 (linux; android 4.2.2; mismart wink ;) build/jdq39) applewebkit/537.36 (khtml, like gecko) chrome/32.0.1700.99 mobile safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.2.2
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: 32.0.1700.99
+  device:
+    type: smartphone
+    brand: WL
+    model: miSmart wink ;)
+  os_family: Android
+  browser_family: Chrome
+-
   user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; zh-tw; MI 1S Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
   os:
     name: Android

diff --git a/Tests/fixtures/tablet.yml b/Tests/fixtures/tablet.yml
@@ -7887,7 +7887,75 @@
     model: ViewPad 7e
   os_family: Android
   browser_family: Android Browser
-- 
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; miTab FUNK Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0.4
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+  device:
+    type: tablet
+    brand: WL
+    model: miTab FUNK
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; fr-fr; miTab-EPSILON Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1.1
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+  device:
+    type: tablet
+    brand: WL
+    model: miTab EPSILON
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; es-es; miTab JUMP Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.2.2
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+  device:
+    type: tablet
+    brand: WL
+    model: miTab JUMP
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; es-es; miTab HERO Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0.3
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+  device:
+    type: tablet
+    brand: WL
+    model: miTab HERO
+  os_family: Android
+  browser_family: Android Browser
+-
   user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; es-es; Woxter QX 70 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
   os:
     name: Android

diff --git a/Tests/fixtures/unknown.yml b/Tests/fixtures/unknown.yml
@@ -985,23 +985,6 @@
     model:
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; es-es; miTab HERO Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: 4.0.3
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-  device:
-    type:
-    brand:
-    model:
-  os_family: Android
-  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; es-es; Proton Lite Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
   os:

diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -1569,6 +1569,17 @@ Wiko:
     - regex: 'Barry'
       model: 'Barry'
 
+# Wolder
+Wolder:
+  regex: 'miSmart|miTab'
+  device: 'smartphone'
+  models:
+    - regex: 'miSmart[ -_]?([^/]+) Build'
+      model: 'miSmart $1'
+    - regex: 'miTab[ -_]?([^/]+) Build'
+      device: 'tablet'
+      model: 'miTab $1'
+
 # Wonu
 Wonu:
   regex: 'Wonu ([a-z0-9]+)'