Remove MediaTek since is not a brand

matomo-org · Dec 6, 2024 · 5e317f3 · 5e317f3
1 parent c03648a
commit 5e317f3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 60 deletions.
diff --git a/Parser/AbstractParser.php b/Parser/AbstractParser.php
@@ -345,7 +345,7 @@ protected function hasDesktopFragment(): bool
         $regexExcludeDesktopFragment = \implode('|', [
             'CE-HTML',
             ' Mozilla/|Andr[o0]id|Tablet|Mobile|iPhone|Windows Phone|ricoh|OculusBrowser',
-            'PicoBrowser|Lenovo|compatible; MSIE|SRAF/|Trident/|Tesla/|XBOX|FBMD/|ARM; ?([^)]+)',
+            'PicoBrowser|Lenovo|compatible; MSIE|Trident/|Tesla/|XBOX|FBMD/|ARM; ?([^)]+)',
         ]);
 
         return

diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
@@ -1108,7 +1108,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         '0M'  => 'Mecool',
         'MEM' => 'MeMobile',
         'MC'  => 'Mediacom',
-        'MK'  => 'MediaTek',
         'MD'  => 'Medion',
         'M2'  => 'MEEG',
         'MEG' => 'MEGA VISION',

diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml
@@ -5025,21 +5025,3 @@
     model: Smart TV (2019)
   os_family: GNU/Linux
   browser_family: Chrome
--
-  user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36 SRAF/5.0 1.0 (MediaTek; MT5870; V0.1.0.0.M001; ) NETRANGEMMH
-  os:
-    name: GNU/Linux
-    version: ""
-    platform: x64
-  client:
-    type: browser
-    name: Seraphic Sraf
-    version: "5.0"
-    engine: Blink
-    engine_version: 73.0.3683.103
-  device:
-    type: tv
-    brand: MediaTek
-    model: MT5870
-  os_family: GNU/Linux
-  browser_family: Chrome
diff --git a/Tests/fixtures/tv.yml b/Tests/fixtures/tv.yml
@@ -3307,26 +3307,8 @@
     engine_version: ""
   device:
     type: tv
-    brand: MediaTek
-    model: MT5396
-  os_family: Real-time OS
-  browser_family: Unknown
--
-  user_agent: HbbTV/1.2.1 (;MTK;MT5396;;;) ANTGalio/3.3.0.26.02.devel
-  os:
-    name: MTK / Nucleus
-    version: ""
-    platform: ""
-  client:
-    type: browser
-    name: ANTGalio
-    version: 3.3.0.26.02
-    engine: ""
-    engine_version: ""
-  device:
-    type: tv
-    brand: MediaTek
-    model: MT5396
+    brand: ""
+    model: ""
   os_family: Real-time OS
   browser_family: Unknown
 -
@@ -9222,8 +9204,8 @@
     engine_version: 55.0.2883.91
   device:
     type: tv
-    brand: MediaTek
-    model: MT5887
+    brand: ""
+    model: Smart TV (2019)
   os_family: GNU/Linux
   browser_family: Chrome
 -

diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -42894,14 +42894,6 @@ Acepad:
     - regex: 'A130[_-](202[34])'
       model: A130 ($1)
 
-# MediaTek (https://www.mediatek.com/)
-MediaTek:
-  regex: 'MTK|MediaTek;'
-  device: 'tv'
-  models:
-    - regex: '(MT[0-9]{4})'
-      model: '$1'
-
 # Devices with undectable brand, but detectable model
 Unknown:
   regex: 'Plasma Mobile|WebTV/(\d+\.\d+)|TV Bro| BOX|BOX | BOX |roku|YouView|DirectFB|avdn/|wired|wireless|AndroidTV|cordova-amazon-fireos|wv-atv|SDSTB|SDOTT|(?:M10 Ultra|FO-R15|TVBOX|Smart[ _-]?TV|SmartATV|M8S\+ 4K|PCBox|rk(?:3128|322x|3368)(?:[_-]box)?|H10 PLAY|Smart AIO TV|TVBOX_L|L-BOX|TVBOX-5G|mips.+(?:Opera TV|wireless|wired)|smartbox|TV BOX|BOX TV|I12Pro Max|(?:audi_)?ks1280x480|AT&T TV|RealtekATV|AOSP on r33a0|tv001 on rtd289x|hx322x_box|X98_S500|8K3528-T|MX10|V88|H8S|X92|AI PONT|tv\.plus|WayDroid x86_64 Device|MediaBox|Cloud Phone|HK1RBOX-X4)(?:[);/ ]|$)'

diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml
@@ -656,14 +656,6 @@ Manhattan:
     - regex: 'T3'
       model: 'T3'
 
-# MediaTek (https://www.mediatek.com/)
-MediaTek:
-  regex: 'MTK|MediaTek;'
-  device: 'tv'
-  models:
-    - regex: '(MT[0-9]{4})'
-      model: '$1'
-
 # Medion
 Medion:
   regex: 'Medion'
@@ -1220,8 +1212,9 @@ Xiaomi:
 
 # Unknown
 Unknown:
-  regex: 'OEM, ([a-z0-9_ -]+), (?:wired|wireless)|_TV_[A-Z0-9]+_([0-9]{4});'
-  device: 'tv'
+  regex: 'OEM, ([a-z0-9_ -]+), (?:wired|wireless)|_TV_[A-Z0-9]+_([0-9]{4});|LaTivu_(?:\d+[.\d]+)_([0-9]{4})'
   models:
     - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
       model: 'Smart TV ($1)'
+    - regex: 'LaTivu_(?:\d+[.\d]+)_([0-9]{4})'
+      model: 'Smart TV ($1)'