Adds detection for various tv brands (#8008)

* Adds detection for HIGH1ONE brand * Adds detection for elit brand * Adds detection for EUROLUX brand * Adds detection for HOTACK brand * Adds detection for TORNADO brand * Improves detection for EGL brand * Improves detection for Navon brand * Improves detection for Myros brand * Adds detection for NILAIT brand * Add website for elit brand * Adds detection for ENDURO brand * Adds detection for VORTEX (RO) * Adds detection for Waltham brand * Improves detection for Turbo-X brand * Adds detection for SULPICE TV brand * Adds detection for SCHAUB LORENZ brand * Adds detection for SCHONTECH brand * Adds detection for Visitech brand * Adds detection for TALBERG brand ref #7994 ref #8001
matomo-org · Feb 25, 2025 · 43a3115 · 43a3115
1 parent 652eb3e
commit 43a3115
Show file tree

Hide file tree

Showing 6 changed files with 495 additions and 3 deletions.
diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
@@ -521,6 +521,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'EB'  => 'E-Boda',
         'EJ'  => 'Engel',
         'ENA' => 'ENACOM',
+        'END' => 'ENDURO',
         'ENI' => 'ENIE',
         '2E'  => 'E-Ceros',
         'E8'  => 'E-tel',
@@ -561,6 +562,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'JE'  => 'Elekta',
         'ELE' => 'Elevate',
         'ELS' => 'Elista',
+        'ELT' => 'elit',
         '4E'  => 'Eltex',
         'ELM' => 'Elong Mobile',
         'ED'  => 'Energizer',
@@ -586,6 +588,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'EHL' => 'Ehlel',
         'EU'  => 'Eurostar',
         '4J'  => 'Eurocase',
+        'EUR' => 'EUROLUX',
         'EUD' => 'Eudora',
         'E9'  => 'Evercoss',
         'EV'  => 'Evertek',
@@ -789,6 +792,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'HIK' => 'HiKing',
         'H2'  => 'Highscreen',
         'Q1'  => 'High Q',
+        'HI1' => 'HIGH1ONE',
         'HIG' => 'HiGrace',
         '1H'  => 'Hipstreet',
         'HIR' => 'Hiremco',
@@ -818,6 +822,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'H3'  => 'Hotel',
         'HV'  => 'Hotwav',
         'U8'  => 'Hot Pepper',
+        'HOT' => 'HOTACK',
         'JH'  => 'HOTREALS',
         'HW'  => 'How',
         'WH'  => 'Honeywell',
@@ -1273,6 +1278,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'NZ'  => 'NG Optics',
         'NZP' => 'NGpon',
         'NN'  => 'Nikon',
+        'NIL' => 'NILAIT',
         'NI'  => 'Nintendo',
         'NIN' => 'NINETEC',
         'NI1' => 'NINETOLOGY',
@@ -1573,7 +1579,9 @@ abstract class AbstractDeviceParser extends AbstractParser
         'SAN' => 'SANY',
         'S9'  => 'Savio',
         'Y4'  => 'TCL SCBC',
+        'SCH' => 'SCHAUB LORENZ',
         'CZ'  => 'Schneider',
+        'SHO' => 'SCHONTECH',
         'SCO' => 'Scosmos',
         'SC1' => 'Scoole',
         'ZG'  => 'Schok',
@@ -1688,6 +1696,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'SUR' => 'Surge',
         'SUF' => 'Surfans',
         '06'  => 'Subor',
+        'SUT' => 'SULPICE TV',
         'SZ'  => 'Sumvision',
         '0H'  => 'Sunstech',
         'S3'  => 'SunVan',
@@ -1725,6 +1734,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'U5'  => 'Taiga System',
         'TAL' => 'Talius',
         '7G'  => 'TAG Tech',
+        'TLB' => 'TALBERG',
         'TAU' => 'TAUBE',
         'T5'  => 'TB Touch',
         'TC'  => 'TCL',
@@ -1799,6 +1809,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'TO2' => 'TOPSHOWS',
         '7T'  => 'Torex',
         'TOR' => 'Torque',
+        'TRN' => 'TORNADO',
         '6O'  => 'TOSCIDO',
         'TO1' => 'Topsion',
         'TS'  => 'Toshiba',
@@ -1932,6 +1943,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'VIT' => 'Vityaz',
         '9V'  => 'Vision Touch',
         'VIS' => 'Vision Technology',
+        'VST' => 'Visitech',
         'VIL' => 'Visual Land',
         'VI1' => 'VILLAON',
         'VIM' => 'VIMOQ',
@@ -1951,6 +1963,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '2V'  => 'Vorke',
         '8U'  => 'Vorcom',
         'JW'  => 'Vortex',
+        'VRX' => 'VORTEX (RO)',
         'VOR' => 'Vormor',
         'V1'  => 'Voto',
         'Z7'  => 'VOX',
@@ -1971,6 +1984,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'WA'  => 'Walton',
         'WAF' => 'WAF',
         'WAO' => 'W&O',
+        'WLT' => 'Waltham',
         'WAL' => 'Waltter',
         'WAI' => 'Wainyok',
         'WHI' => 'White Mobile',

diff --git a/Parser/Device/HbbTv.php b/Parser/Device/HbbTv.php
@@ -46,7 +46,9 @@ public function parse(): ?array
         parent::parse();
 
         // always set device type to tv, even if no model/brand could be found
-        $this->deviceType = self::DEVICE_TYPE_TV;
+        if (null === $this->deviceType) {
+            $this->deviceType = self::DEVICE_TYPE_TV;
+        }
 
         return $this->getResult();
     }

diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml
@@ -1720,3 +1720,21 @@
     model: PJ209 Pro
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (X11;Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4280.88 Safari/537.36 Model/NT5642K (Hotack5642K;WHALEOSHTCNT5642KPJP8;WHALEOS-HOTACK-NT5642KPJ-0000062.000;;_Projector_NT5642K_HHbrowser_2k22;) LaTivu_1.0.1_2022 CE-HTML/1.0 NETTV_4.6.0.1 SignOn/2.0 SmartTvA/5.0.0 WhaleTV/3.0 WhaleBrowser/1.3.21.5 en
+  os:
+    name: Whale OS
+    version: "3.0"
+    platform: ARM
+  client:
+    type: browser
+    name: Whale TV Browser
+    version: 1.3.21.5
+    engine: Blink
+    engine_version: 97.0.4280.88
+  device:
+    type: peripheral
+    brand: HOTACK
+    model: ""
+  os_family: Other Smart TV
+  browser_family: Chrome