improved detection of Xiaomi phablets

matomo-org · Jun 23, 2015 · 37ee3b9 · 37ee3b9
1 parent ff9e808
commit 37ee3b9
Show file tree

Hide file tree

Showing 3 changed files with 148 additions and 109 deletions.
diff --git a/Tests/fixtures/phablet.yml b/Tests/fixtures/phablet.yml
@@ -1255,3 +1255,147 @@
     model: Xperia Z Ultra
   os_family: Android
   browser_family: Unknown
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; HM NOTE 1LTE Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.141 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.4.2"
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "35.0.1916.141"
+    engine: Blink
+  device:
+    type: phablet
+    brand: XI
+    model: HM Note 1LTE
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.4; HM NOTE 1LTEGLOBAL Build/KTU84Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.109 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.4.4"
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "40.0.2214.109"
+    engine: Blink
+  device:
+    type: phablet
+    brand: XI
+    model: HM Note 1LTEGLOBAL
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; HM NOTE 1LTEW Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 MxBrowser/4.3.6.2000
+  os:
+    name: Android
+    short_name: AND
+    version: "4.4.2"
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "30.0.0.0"
+    engine: Blink
+  device:
+    type: phablet
+    brand: XI
+    model: HM Note 1LTEW
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.4.4; zh-tw; HM NOTE 1LTEW Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Mobile Safari/537.36 XiaoMi/MiuiBrowser/2.0.1
+  os:
+    name: Android
+    short_name: AND
+    version: "4.4.4"
+  client:
+    type: browser
+    name: MIUI Browser
+    short_name: MU
+    version: "2.0.1"
+    engine: WebKit
+  device:
+    type: phablet
+    brand: XI
+    model: HM Note 1LTEW
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; zh-cn; HM NOTE 1TD Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 XiaoMi/MiuiBrowser/1.0
+  os:
+    name: Android
+    short_name: AND
+    version: "4.2.2"
+  client:
+    type: browser
+    name: MIUI Browser
+    short_name: MU
+    version: "1.0"
+    engine: WebKit
+  device:
+    type: phablet
+    brand: XI
+    model: HM Note 1TD
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.2.2; HM NOTE 1W Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.2.2"
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+  device:
+    type: phablet
+    brand: XI
+    model: HM Note 1W
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; en-gb; HM NOTE 1W Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Mobile Safari/537.36 XiaoMi/MiuiBrowser/2.0.1
+  os:
+    name: Android
+    short_name: AND
+    version: "4.2.2"
+  client:
+    type: browser
+    name: MIUI Browser
+    short_name: MU
+    version: "2.0.1"
+    engine: WebKit
+  device:
+    type: phablet
+    brand: XI
+    model: HM Note 1W
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.4.4; en-us; MI NOTE LTE Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36 XiaoMi/MiuiBrowser/2.1.1
+  os:
+    name: Android
+    short_name: AND
+    version: "4.4.4"
+  client:
+    type: browser
+    name: MIUI Browser
+    short_name: MU
+    version: "2.1.1"
+    engine: WebKit
+  device:
+    type: phablet
+    brand: XI
+    model: MI Note LTE
+  os_family: Android
+  browser_family: Android Browser
diff --git a/Tests/fixtures/tablet.yml b/Tests/fixtures/tablet.yml
@@ -14189,114 +14189,6 @@
     model: Zielo D15
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; HM NOTE 1LTE Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.141 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "4.4.2"
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "35.0.1916.141"
-    engine: Blink
-  device:
-    type: tablet
-    brand: XI
-    model: HM Note 1LTE
-  os_family: Android
-  browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 4.4.4; HM NOTE 1LTEGLOBAL Build/KTU84Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.109 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "4.4.4"
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "40.0.2214.109"
-    engine: Blink
-  device:
-    type: tablet
-    brand: XI
-    model: HM Note 1LTEGLOBAL
-  os_family: Android
-  browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; HM NOTE 1LTEW Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 MxBrowser/4.3.6.2000
-  os:
-    name: Android
-    short_name: AND
-    version: "4.4.2"
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "30.0.0.0"
-    engine: Blink
-  device:
-    type: tablet
-    brand: XI
-    model: HM Note 1LTEW
-  os_family: Android
-  browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; zh-cn; HM NOTE 1TD Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 XiaoMi/MiuiBrowser/1.0
-  os:
-    name: Android
-    short_name: AND
-    version: "4.2.2"
-  client:
-    type: browser
-    name: MIUI Browser
-    short_name: MU
-    version: "1.0"
-    engine: WebKit
-  device:
-    type: tablet
-    brand: XI
-    model: HM Note 1TD
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 4.2.2; HM NOTE 1W Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "4.2.2"
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-  device:
-    type: tablet
-    brand: XI
-    model: HM Note 1W
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; en-gb; HM NOTE 1W Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Mobile Safari/537.36 XiaoMi/MiuiBrowser/2.0.1
-  os:
-    name: Android
-    short_name: AND
-    version: "4.2.2"
-  client:
-    type: browser
-    name: MIUI Browser
-    short_name: MU
-    version: "2.0.1"
-    engine: WebKit
-  device:
-    type: tablet
-    brand: XI
-    model: HM Note 1W
-  os_family: Android
-  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; fr-be; Luna TAB474 Build/LunaTAB474) 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
@@ -3077,10 +3077,13 @@ Xiaomi:
     - regex: 'Xiaomi_2013061|2013061 Build'
       model: 'MI 3'
 
+    - regex: 'MI Note ([^;/]+)? Build'
+      model: 'MI Note $1'
+      device: 'phablet'
     - regex: '(MI [a-z0-9]+|MI-One[ _]Plus) Build'
       model: '$1'
     - regex: 'HM Note ([^/;]+) Build'
-      device: 'tablet'
+      device: 'phablet'
       model: 'HM Note $1'
     - regex: 'HM ([^/;]+) Build'
       model: 'HM $1'