refs #5585 - adds detection for Meizu M3S

matomo-org · Mar 2, 2017 · ac39f16 · ac39f16
1 parent 5869157
commit ac39f16
Show file tree

Hide file tree

Showing 5 changed files with 228 additions and 162 deletions.
diff --git a/Tests/fixtures/smartphone-1.yml b/Tests/fixtures/smartphone-1.yml
@@ -9197,6 +9197,46 @@
     model: Trooper2 50
   os_family: Android
   browser_family: Android Browser
+- 
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 5.0.2; Le 1 Pro Build/BGXNAOP5501103071S)
+  os:
+    name: Android
+    short_name: AND
+    version: "5.0.2"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+    engine_version:
+  device:
+    type: smartphone
+    brand: L1
+    model: Le 1 Pro
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 7.1.1; LeEco Le 2 Build/NMF26V)
+  os:
+    name: Android
+    short_name: AND
+    version: "7.1.1"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+    engine_version:
+  device:
+    type: smartphone
+    brand: L1
+    model: Le 2
+  os_family: Android
+  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; Android 5.0.2; Le Max Build/CHXOSOP5501405221S) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/37.0.0.0 Mobile Safari/537.36
   os:
@@ -9917,43 +9957,3 @@
     model: E610v
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; es-hn; LG-E612g Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: "4.0.3"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: smartphone
-    brand: LG
-    model: E612g
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ko-kr; LG-E615 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: "4.0.4"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: smartphone
-    brand: LG
-    model: E615
-  os_family: Android
-  browser_family: Android Browser
diff --git a/Tests/fixtures/smartphone-2.yml b/Tests/fixtures/smartphone-2.yml
@@ -1,4 +1,44 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; es-hn; LG-E612g Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: "4.0.3"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: smartphone
+    brand: LG
+    model: E612g
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ko-kr; LG-E615 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: "4.0.4"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: smartphone
+    brand: LG
+    model: E615
+  os_family: Android
+  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; en-ca; LG-E617G Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
   os:
@@ -1495,6 +1535,26 @@
     model: M2
   os_family: Android
   browser_family: Unknown
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 5.1; M3s Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.116 YaBrowser/16.10.2.1487.00 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "5.1"
+    platform:
+  client:
+    type: browser
+    name: Yandex Browser
+    short_name: YA
+    version: "16.10.2.1487.00"
+    engine: Blink
+    engine_version:
+  device:
+    type: smartphone
+    brand: M1
+    model: M3S
+  os_family: Android
+  browser_family: Unknown
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.2.1; zh-CN; M045 Build/JOP40D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 UCBrowser/10.0.0.488 U3/0.8.0 Mobile Safari/534.30
   os:
@@ -9829,63 +9889,3 @@
     model: 53
   os_family: Android
   browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; QMobile A11Note Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: "4.0.4"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: smartphone
-    brand: QM
-    model: A11Note
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: UCWEB/2.0 (MIDP-2.0; U; Adr 2.3.5; en-US; QMobile_A2_Lite) U2/1.0.0 UCBrowser/9.1.1.420 U2/1.0.0 Mobile
-  os:
-    name: Android
-    short_name: AND
-    version: "2.3.5"
-    platform:
-  client:
-    type: browser
-    name: UC Browser
-    short_name: UC
-    version: "9.1.1.420"
-    engine:
-    engine_version:
-  device:
-    type: smartphone
-    brand: QM
-    model: A2 Lite
-  os_family: Android
-  browser_family: Unknown
-- 
-  user_agent: UCWEB/2.0 (Linux; U; Adr 4.2.2; en-US; QMobile A30) U2/1.0.0 UCBrowser/9.3.1.344 U2/1.0.0 Mobile
-  os:
-    name: Android
-    short_name: AND
-    version: "4.2.2"
-    platform:
-  client:
-    type: browser
-    name: UC Browser
-    short_name: UC
-    version: "9.3.1.344"
-    engine:
-    engine_version:
-  device:
-    type: smartphone
-    brand: QM
-    model: A30
-  os_family: Android
-  browser_family: Unknown
diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml
@@ -1,4 +1,64 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; QMobile A11Note Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: "4.0.4"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: smartphone
+    brand: QM
+    model: A11Note
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: UCWEB/2.0 (MIDP-2.0; U; Adr 2.3.5; en-US; QMobile_A2_Lite) U2/1.0.0 UCBrowser/9.1.1.420 U2/1.0.0 Mobile
+  os:
+    name: Android
+    short_name: AND
+    version: "2.3.5"
+    platform:
+  client:
+    type: browser
+    name: UC Browser
+    short_name: UC
+    version: "9.1.1.420"
+    engine:
+    engine_version:
+  device:
+    type: smartphone
+    brand: QM
+    model: A2 Lite
+  os_family: Android
+  browser_family: Unknown
+- 
+  user_agent: UCWEB/2.0 (Linux; U; Adr 4.2.2; en-US; QMobile A30) U2/1.0.0 UCBrowser/9.3.1.344 U2/1.0.0 Mobile
+  os:
+    name: Android
+    short_name: AND
+    version: "4.2.2"
+    platform:
+  client:
+    type: browser
+    name: UC Browser
+    short_name: UC
+    version: "9.3.1.344"
+    engine:
+    engine_version:
+  device:
+    type: smartphone
+    brand: QM
+    model: A30
+  os_family: Android
+  browser_family: Unknown
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; en-us; QMobile A65 Build/QMobileA65) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/9.5.0.360 U3/0.8.0 Mobile Safari/533.1
   os:
@@ -9835,63 +9895,3 @@
     model: Xperia S
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; fr-ch; SonyLT26i Build/6.2.B.1.96) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: "4.1.2"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: smartphone
-    brand: SO
-    model: Xperia S
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; Xperia S Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "4.4.2"
-    platform:
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "34.0.1847.114"
-    engine: Blink
-    engine_version:
-  device:
-    type: smartphone
-    brand: SO
-    model: Xperia S
-  os_family: Android
-  browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ar-eg; LT26ii Build/6.1.A.2.50) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: "4.0.4"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: smartphone
-    brand: SO
-    model: Xperia SL
-  os_family: Android
-  browser_family: Android Browser