Improves detection for EKO, Kogan, Sharp, Sony, Vodafone devices (#7067)

* Improves detection for various Sony tvs * Improves detection for various Sharp tvs * Adds detection for Vodafone TV * Improves detection for EKO tvs * Adds detection for various Kogan tvs * Add device type for Sharp ref #7066
matomo-org · Mar 25, 2022 · 19b772e · 19b772e
1 parent 53a1634
commit 19b772e
Show file tree

Hide file tree

Showing 2 changed files with 322 additions and 1 deletion.
diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml
@@ -5727,3 +5727,309 @@
     model: ""
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 10; BRAVIA VH1 Build/QTG3.200305.006.S89)
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Sony
+    model: Bravia VH1
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; BRAVIA 4K UR1 Build/PTT1.190515.001.S104)
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Sony
+    model: Bravia 4K UR1
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 10; BRAVIA 4K VH2 Build/QTG3.200305.006.S118)
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Sony
+    model: Bravia 4K VH2
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 11; BRAVIA VU1 Build/RTT7.210105.001)
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Sony
+    model: Bravia VU1
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; AQUOS-TVX19A Build/PTM5.200218.685)
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Sharp
+    model: Aquos TVX19A
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; AQUOS-TVX19B Build/PTM5.200218.646)
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Sharp
+    model: Aquos TVX19B
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 10; AQUOS-TVJ21-2 Build/QTG3.200913.001)
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Sharp
+    model: Aquos TVJ21-2
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 10; AQUOS-TVX21A Build/QTG3.200913.001)
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Sharp
+    model: Aquos TVX21A
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; Vodafone TV Build/PI)
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Vodafone
+    model: TV
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; EKO Android TV Build/PTO2.210527.001)
+  os:
+    name: Android TV
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: EKO
+    model: Android TV
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; EKO Android TV 2K Build/PTO3.201213.001)
+  os:
+    name: Android TV
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: EKO
+    model: 2K Android TV
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; EKO 2K Android TV Build/PTO6.200615.001)
+  os:
+    name: Android TV
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: EKO
+    model: 2K Android TV
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; EKO 4K Android TV Build/PTO6.200610.001)
+  os:
+    name: Android TV
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: EKO
+    model: 4K Android TV
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; Kogan TV Build/PTO2.210830.001)
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Kogan
+    model: TV
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; Kogan SmarterTV Build/PTO3.201213.001)
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Kogan
+    model: SmarterTV
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; Kogan SmarterTV 2K Build/PTMW.190511.120)
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Kogan
+    model: SmarterTV 2K
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 9; KoganTVAP Build/PTO7.200925.001)
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Kogan
+    model: TVAP
+  os_family: Android
+  browser_family: Android Browser
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -6649,7 +6649,7 @@ Sony:
       device: 'wearable'
 
     # SONY: Bravia or TV Box
-    - regex: '(?:BRAVIA )(2K GB ATV3|4K UR[23]|4K GB ATV3|4K GB|4K 2015|2015)(?:[);/ ]|$)'
+    - regex: '(?:BRAVIA )(2K GB ATV3|4K UR[123]|4K GB ATV3|4K GB|4K VH2|4K 2015|2015|VH1|VU1)(?:[);/ ]|$)'
       model: 'Bravia $1'
       device: 'tv'
     - regex: 'SVP-DTV15(?:[);/ ]|$)'
@@ -6974,6 +6974,10 @@ EKO:
   regex: 'EKO'
   device: 'smartphone'
   models:
+    - regex: 'EKO Android TV 2K'
+      model: '2K Android TV'
+      device: 'tv'
+
     - regex: 'EKO[ _-]?([^;/)]+) Build'
       model: '$1'
     - regex: 'EKO[ _-]?([^;/)]+)(?:[);/ ]|$)'
@@ -10222,6 +10226,10 @@ Kogan:
   regex: 'Kogan'
   device: 'smartphone'
   models:
+    - regex: 'Kogan ?(SmarterTV(?: 2K)?|TV|TVAP)(?:[);/ ]|$)'
+      device: 'tv'
+      model: '$1'
+
     - regex: 'Kogan[ _-]([^;/]+) Build'
       model: '$1'
     - regex: 'Kogan[ _-]([a-z0-9_-]+)'
@@ -18437,6 +18445,9 @@ Sharp:
       model: 'Aquos Net Plus'
     - regex: 'SHARP[ \-]([a-z0-9\-]+)'
       model: '$1'
+    - regex: 'AQUOS[ \-]TV([a-z0-9\-]+)'
+      device: 'tv'
+      model: 'Aquos TV$1'
     - regex: '(?:SHARP|SBM)([a-z0-9]+)'
       model: '$1'
     - regex: '(SH-?[0-9]+[a-z]?|IS05)(?:[);/ ]|$)'
@@ -20184,6 +20195,10 @@ Vodafone:
       model: 'Smart Tab III 10' # Lenovo
       device: 'tablet'
 
+    - regex: 'Vodafone TV(?:[);/ ]|$)'
+      model: 'TV'
+      device: 'tv'
+
     - regex: 'VFD[ _]([0-9]+)(?:[);/ ]|$)'
       model: 'VFD $1'
     - regex: 'Vodafone[ _-]([^;/]+) Build'