Improves detection for Edenwood, Infomir, Hisense and Salora devices (#…

…7907) * Improves detection for Infomir devices * Improves detection for Hisense devices * Improves detection for Edenwood devices * Improves detection for Salora devices ref #7889
matomo-org · Nov 8, 2024 · 714c6cd · 714c6cd
1 parent aac3ddc
commit 714c6cd
Show file tree

Hide file tree

Showing 3 changed files with 132 additions and 2 deletions.
diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml
@@ -4413,3 +4413,111 @@
     model: YNDX-00074
   os_family: Android
   browser_family: Unknown
+-
+  user_agent: 'Mozilla/5.0 (QtEmbedded; U; Linux; C) AppleWebKit/533.3 (KHTML, like Gecko) MAG200 stbapp ver: 6 rev: c8a6f17 Mobile Safari/533.3'
+  os:
+    name: GNU/Linux
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Mobile Safari
+    version: ""
+    engine: WebKit
+    engine_version: "533.3"
+  device:
+    type: tv
+    brand: Infomir
+    model: MAG200
+  os_family: GNU/Linux
+  browser_family: Safari
+-
+  user_agent: 'Mozilla/5.0 (QtEmbedded; U; Linux; C) AppleWebKit/533.3 (KHTML, like Gecko) MAG250 stbapp ver: 2 rev: 250 Safari/533.3'
+  os:
+    name: GNU/Linux
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Safari
+    version: ""
+    engine: WebKit
+    engine_version: "533.3"
+  device:
+    type: tv
+    brand: Infomir
+    model: MAG250
+  os_family: GNU/Linux
+  browser_family: Safari
+-
+  user_agent: 'Mozilla/5.0 (QtEmbedded; U; Linux; C) AppleWebKit/533.3 (KHTML, like Gecko) MAG350 stbapp ver: 4 rev: 2721 Mobile Safari/533.3'
+  os:
+    name: GNU/Linux
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Mobile Safari
+    version: ""
+    engine: WebKit
+    engine_version: "533.3"
+  device:
+    type: tv
+    brand: Infomir
+    model: MAG350
+  os_family: GNU/Linux
+  browser_family: Safari
+-
+  user_agent: Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.108 Odin/74.3729.2.10 Safari/537.36 VK_PATCH/1.0 CE-HTML/1.0 HBBTV/2.0 MSD6886 (Hisense;50A6101EX;V0000.01.00a.N0519)
+  os:
+    name: GNU/Linux
+    version: ""
+    platform: ARM
+  client:
+    type: browser
+    name: Odin
+    version: 74.3729.2.10
+    engine: Blink
+    engine_version: 74.0.3729.108
+  device:
+    type: tv
+    brand: Hisense
+    model: 50A6101EX
+  os_family: GNU/Linux
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Odin/88.4324.2.10 Safari/537.36 Model/Hisense-MT9602 VIDAA/6.0(EDENWOOD;SmartTV;VS0355UE1;MTK9602/V0000.06.13P.O0810;UHD;VS0355U;)
+  os:
+    name: VIDAA
+    version: "6.0"
+    platform: ARM
+  client:
+    type: browser
+    name: Odin
+    version: 88.4324.2.10
+    engine: Blink
+    engine_version: 88.0.4324.182
+  device:
+    type: tv
+    brand: Edenwood
+    model: Smart TV
+  os_family: GNU/Linux
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Odin/88.4324.2.10 Safari/537.36 Model/Hisense-MT9602 VIDAA/6.0(SALORA_cx;SmartTV;VS0343FD1;MTK9602/V0000.01.00L.N1206;FHD;VS0343F;)
+  os:
+    name: VIDAA
+    version: "6.0"
+    platform: ARM
+  client:
+    type: browser
+    name: Odin
+    version: 88.4324.2.10
+    engine: Blink
+    engine_version: 88.0.4324.182
+  device:
+    type: tv
+    brand: Salora
+    model: Smart TV
+  os_family: GNU/Linux
+  browser_family: Chrome
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -7843,6 +7843,16 @@ ECS:
     - regex: 'TM105(?:[);/ ]|$)'
       model: 'TM105'
 
+# Edenwood
+Edenwood:
+  regex: 'EDENWOOD[;,]'
+  device: 'tv'
+  models:
+    - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
+      model: 'Smart TV ($1)'
+    - regex: 'SmartTV;'
+      model: 'Smart TV'
+
 # EE
 EE:
   regex: '(?:Harrier(?: Tab)?|Hawk|Rook)[_ ]from[_ ]EE'
@@ -36331,7 +36341,7 @@ Genesis:
 
 # Infomir (https://www.infomir.us/)
 Infomir:
-  regex: '(MAG425A)(?:[);/ ]|$)'
+  regex: '(MAG(?:200|[23]50|425A))(?:[);/ ]|$)'
   device: 'tv'
   model: '$1'
 
@@ -41639,6 +41649,16 @@ SAILF:
   device: 'smartphone'
   model: 'I13 Pro'
 
+# Salora
+Salora:
+  regex: 'Salora(?:_cx)?[;,]'
+  device: 'tv'
+  models:
+    - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
+      model: 'Smart TV ($1)'
+    - regex: 'SmartTV;'
+      model: 'Smart TV'
+
 # Hisense (https://www.hisense-usa.com/)
 Hisense:
   regex: '(?:HS-)?Hisense ([^;/]+) Build|Hisense|HS-(?:G|U|EG?|I|L|T|X)[0-9]+[a-z0-9-]*|HNR(?:320T|55[01]T)|E270BSA|HWCD100E|HITV300C|HITV205N|M470BS[AE]|EG98|E2281|EG680|I46D1G|HAT4KDTV|HITV10[12]C|HLTE(?:[237]00T|229T|200M|203T|202N|21[023567][TM]|22[67]T|22[13]E|230E|239E|103E|310[TM]|31[16]T|500T|501N|510[TM]|556N|7[23]0T|720E|M800)|KS(?:907|964)|U972|U601S Pro|U972_Pro|HiSmart [24]K ATV4|HiSmartTV A4'

diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml
@@ -331,6 +331,8 @@ Hisense:
       model: '50ADEVTOOL'
     - regex: '50A53FEVS'
       model: '50A53FEVS'
+    - regex: '50A6101EX'
+      model: '50A6101EX'
     - regex: '50A683FEVS'
       model: '50A683FEVS'
     - regex: '55A6100EE'
@@ -884,7 +886,7 @@ Saba:
 
 # Salora
 Salora:
-  regex: 'Salora[;,]'
+  regex: 'Salora(?:_cx)?[;,]'
   device: 'tv'
   models:
     - regex: '_TV_[A-Z0-9]+_([0-9]{4});'