Improves detection for SCBC devices

ref matomo-org#7880
liviuconcioiu · Oct 29, 2024 · 18deda1 · 18deda1 · EfekanPekel · Oct 30, 2024
1 parent 6f0af4f
commit 18deda1
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 10 deletions.
diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml
@@ -3243,3 +3243,39 @@
     model: Smart TV (2020)
   os_family: Other Smart TV
   browser_family: Opera
+-
+  user_agent: 'Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.120 Safari/537.36 OPR/46.0.2207.0 OMI/4.20.4.54.Elm.9 HbbTV/1.5.1 (+DRM; TCL72671D;V8-NT671LA-LF1V486;T000.000.000.218_DM100.2.29_U1.0.42.45_A0.0.38 [2021-04-21 14:44:20]; ;_TV_NT72671_TCL_SCBC_Tbrowser_2k20;) FVC/4.0 (TCL72671D;) LaTivu_1.0.1_2020 SignOn/2.0 WhaleTV/2.0 NETTV/4.6.0.1 es-MX'
+  os:
+    name: Whale OS
+    version: "2.0"
+    platform: ARM
+  client:
+    type: browser
+    name: Opera Devices
+    version: 4.20.4.54
+    engine: Blink
+    engine_version: 77.0.3865.120
+  device:
+    type: tv
+    brand: SCBC
+    model: Smart TV (2020)
+  os_family: Other Smart TV
+  browser_family: Opera
+-
+  user_agent: 'Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.120 Safari/537.36 OPR/46.0.2207.0 OMI/4.20.4.54.Elm.9 HbbTV/1.5.1 (+DRM; TCL72671D;V8-NT671LA-LF1V458;T000.000.000.207_DM100.2.26_U1.0.42.40_A0.0.38 [2021-03-26 14:36:55]; ;_TV_NT72671_TCL_SCBC_Tbrowser_2k20;) FVC/4.0 (TCL72671D;) LaTivu_1.0.1_2020 SignOn/2.0 WhaleTV/2.0 NETTV/4.6.0.1 es-MX'
+  os:
+    name: Whale OS
+    version: "2.0"
+    platform: ARM
+  client:
+    type: browser
+    name: Opera Devices
+    version: 4.20.4.54
+    engine: Blink
+    engine_version: 77.0.3865.120
+  device:
+    type: tv
+    brand: SCBC
+    model: Smart TV (2020)
+  os_family: Other Smart TV
+  browser_family: Opera
diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml
@@ -814,6 +814,18 @@ PEAQ:
   device: 'tv'
   model: ''
 
+# SCBC
+SCBC:
+  regex: 'SCBC[;,]|_TV_[A-Z0-9_]+_TCL_SCBC'
+  device: 'tv'
+  models:
+    - regex: 'SCBC586'
+      model: 'SCBC586'
+    - regex: '43D1850'
+      model: '43D1850'
+    - regex: '_TV_[A-Z0-9]+_TCL_SCBC_Tbrowser_2k20'
+      model: 'Smart TV (2020)'
+
 # Philips
 Philips:
   regex: 'Philips|NETTV/'
@@ -890,16 +902,6 @@ Samsung:
     - regex: 'Maple_2011'
       model: 'Smart TV (2011)'
 
-# SCBC
-SCBC:
-  regex: 'SCBC[;,]'
-  device: 'tv'
-  models:
-    - regex: 'SCBC586'
-      model: 'SCBC586'
-    - regex: '43D1850'
-      model: '43D1850'
-
 # SEG
 SEG:
   regex: 'SEG[;,]'