Merge pull request #5347 from matt-kv/master

Improved dectection of Wiko smartphones
matomo-org · May 31, 2015 · b522596 · b522596
2 parents 58899d1 + 46f54dd
commit b522596
Show file tree

Hide file tree

Showing 2 changed files with 235 additions and 19 deletions.
diff --git a/Tests/fixtures/smartphone.yml b/Tests/fixtures/smartphone.yml
@@ -27486,6 +27486,42 @@
     model: Cink PEAX 2
   os_family: Android
   browser_family: Android Browser
+- 
+  user_agent: UCWEB/2.0 (MIDP-2.0; U; Adr 4.1.2; en-US; CINK_PEAX_2) U2/1.0.0 UCBrowser/9.1.1.420 U2/1.0.0 Mobile
+  os:
+    name: Android
+    short_name: AND
+    version: "4.1.2"
+  client:
+    type: browser
+    name: UC Browser
+    short_name: UC
+    version: "9.1.1.420"
+    engine:
+  device:
+    type: smartphone
+    brand: WI
+    model: Cink PEAX 2
+  os_family: Android
+  browser_family: Unknown
+- 
+  user_agent: UCWEB/2.0 (MIDP-2.0; U; Adr 4.4.2; en-US; HIGHWAY_SIGNS) U2/1.0.0 UCBrowser/9.2.0.419 U2/1.0.0 Mobile
+  os:
+    name: Android
+    short_name: AND
+    version: "4.4.2"
+  client:
+    type: browser
+    name: UC Browser
+    short_name: UC
+    version: "9.2.0.419"
+    engine:
+  device:
+    type: smartphone
+    brand: WI
+    model: Highway SIGNS
+  os_family: Android
+  browser_family: Unknown
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; fr-fr; WIKO-CINK SLIM Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
   os:
@@ -27756,6 +27792,168 @@
     model: Sublim
   os_family: Android
   browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; BIRDY Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.93 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.4.2"
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "39.0.2171.93"
+    engine: Blink
+  device:
+    type: smartphone
+    brand: WI
+    model: Birdy
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; BLOOM Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36
+  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: smartphone
+    brand: WI
+    model: Bloom
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; GETAWAY Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/24.0.0.30.15;]
+  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: smartphone
+    brand: WI
+    model: Getaway
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; GOA Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.93 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.4.2"
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "39.0.2171.93"
+    engine: Blink
+  device:
+    type: smartphone
+    brand: WI
+    model: Goa
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; KITE Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/24.0.0.30.15;]
+  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: smartphone
+    brand: WI
+    model: Kite
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; LENNY Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36
+  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: smartphone
+    brand: WI
+    model: Lenny
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; SLIDE Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36
+  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: smartphone
+    brand: WI
+    model: Slide
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; SUNSET Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.117 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.4.2"
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "37.0.2062.117"
+    engine: Blink
+  device:
+    type: smartphone
+    brand: WI
+    model: Sunset
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.3; WAX Build/JLS36C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.93 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.3"
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "39.0.2171.93"
+    engine: Blink
+  device:
+    type: smartphone
+    brand: WI
+    model: Wax
+  os_family: Android
+  browser_family: Chrome
 - 
   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:

diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -2942,37 +2942,55 @@ WellcoM:
 
 # Wiko
 Wiko:
-  regex: '(?:Wiko-)?(?:CINK|IGGY|Stairway|Rainbow|Highway|Darkside|Darkmoon|Darkfull|Darknight|Sublim|Ozzy|Barry)'
+  regex: '(?:WIKO-)?CINK_[a-z0-9_]+|(?:WIKO-)?HIGHWAY_[a-z0-9_]+|(?:WIKO-)?(?:Cink.*|Highway.*|Iggy|Stairway|Rainbow|Darkside|Darkmoon|Darkfull|Darknight|Sublim|Ozzy|Barry|Birdy|Bloom|Getaway|Goa|Kite|Lenny|Slide|Sunset|Wax) Build'
   device: 'smartphone'
   models:
-    - regex: '(?:Wiko-)?CINK(.*) Build'
-      model: 'Cink$1'
-    - regex: '(?:Wiko-)?CINK[ _\-]([a-z0-9]+)'
+    - regex: '(?:WIKO-)?CINK_([a-z0-9_]+)'
       model: 'Cink $1'
-    - regex: '(?:Wiko-)?IGGY(.*) Build'
-      model: 'Iggy$1'
-    - regex: '(?:Wiko-)?IGGY[ _\-]([a-z0-9]+)'
-      model: 'Iggy $1'
-    - regex: 'Stairway'
+    - regex: '(?:Wiko-)?Cink(.*) Build'
+      model: 'Cink$1'
+    - regex: '(?:WIKO-)?HIGHWAY_([a-z0-9_]+)'
+      model: 'Highway $1'
+    - regex: '(?:Wiko-)?Highway(.*) Build'
+      model: 'Highway$1'
+    - regex: '(?:WIKO-)?Iggy Build'
+      model: 'Iggy'
+    - regex: '(?:WIKO-)?Stairway Build'
       model: 'Stairway'
-    - regex: 'Highway'
-      model: 'Highway'
-    - regex: 'Rainbow'
+    - regex: '(?:WIKO-)?Rainbow Build'
       model: 'Rainbow'
-    - regex: 'Darkside'
+    - regex: '(?:WIKO-)?Darkside Build'
       model: 'Darkside'
-    - regex: 'Darkmoon'
+    - regex: '(?:WIKO-)?Darkmoon Build'
       model: 'Darkmoon'
-    - regex: 'Darkfull'
+    - regex: '(?:WIKO-)?Darkfull Build'
       model: 'Darkfull'
-    - regex: 'Darknight'
+    - regex: '(?:WIKO-)?Darknight Build'
       model: 'Darknight'
-    - regex: 'Sublim'
+    - regex: '(?:WIKO-)?Sublim Build'
       model: 'Sublim'
-    - regex: 'Ozzy'
+    - regex: '(?:WIKO-)?Ozzy Build'
       model: 'Ozzy'
-    - regex: 'Barry'
+    - regex: '(?:WIKO-)?Barry Build'
       model: 'Barry'
+    - regex: '(?:WIKO-)?Birdy Build'
+      model: 'Birdy'
+    - regex: '(?:WIKO-)?Bloom Build'
+      model: 'Bloom'
+    - regex: '(?:WIKO-)?Getaway Build'
+      model: 'Getaway'
+    - regex: '(?:WIKO-)?Goa Build'
+      model: 'Goa'
+    - regex: '(?:WIKO-)?Kite Build'
+      model: 'Kite'
+    - regex: '(?:WIKO-)?Lenny Build'
+      model: 'Lenny'
+    - regex: '(?:WIKO-)?Slide Build'
+      model: 'Slide'
+    - regex: '(?:WIKO-)?Sunset Build'
+      model: 'Sunset'
+    - regex: '(?:WIKO-)?Wax Build'
+      model: 'Wax'
 
 # Wolder
 Wolder: