Merge branch 'master' into devices

matomo-org · Nov 13, 2023 · 9d586f7 · 9d586f7
2 parents f88b6c2 + b706328
commit 9d586f7
Show file tree

Hide file tree

Showing 8 changed files with 703 additions and 86 deletions.
diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
@@ -140,6 +140,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'A1'  => 'Altech UEC',
         '66'  => 'Altice',
         'A5'  => 'altron',
+        'ALT' => 'Altus',
         'KN'  => 'Amazon',
         'AMA' => 'AMA',
         'AG'  => 'AMGOO',
@@ -160,6 +161,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'RW'  => 'Aoro',
         '9Y'  => 'Aocos',
         'AP'  => 'Apple',
+        'ARC' => 'Arçelik',
         'AR'  => 'Archos',
         'AB'  => 'Arian Space',
         'A6'  => 'Ark',
@@ -193,12 +195,14 @@ abstract class AbstractDeviceParser extends AbstractParser
         'AH'  => 'AVH',
         'AV'  => 'Avvio',
         'AVA' => 'Avaya',
+        'AXE' => 'AXEN',
         'AY'  => 'Axxion',
         'AXX' => 'AXXA',
         'YR'  => 'AYYA',
         'XA'  => 'Axioo',
         'AM'  => 'Azumi Mobile',
         'WW'  => 'Awow',
+        'AWO' => 'AWOX',
         'XU'  => 'AUX',
         'BAC' => 'Backcell',
         'BFF' => 'BAFF',
@@ -216,6 +220,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'B5'  => 'Beeline',
         'B0'  => 'Beelink',
         'BL'  => 'Beetel',
+        'BEK' => 'Beko',
         '2X'  => 'Benco',
         'BQ'  => 'BenQ',
         'BS'  => 'BenQ-Siemens',
@@ -313,6 +318,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '1C'  => 'Chuwi',
         'L8'  => 'Clarmin',
         '25'  => 'Claresta',
+        'CLA' => 'CLAYTON',
         '1J'  => 'Cloud',
         'CD'  => 'Cloudfone',
         '6C'  => 'Cloudpad',
@@ -396,6 +402,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'DIG' => 'Digit4G',
         'DIC' => 'DIGICOM',
         'Q0'  => 'DIGIFORS',
+        'DIK' => 'DIKOM',
         'DQ'  => 'DISH',
         'DIS' => 'Disney',
         '9D'  => 'Ditecma',
@@ -432,6 +439,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'UD'  => 'DUNNS Mobile',
         'DUU' => 'Duubee',
         'DUR' => 'Durabook',
+        'DYO' => 'Dyon',
         'DTE' => 'D-Tech',
         'DLI' => 'D-Link',
         'ENO' => 'eNOVA',
@@ -1082,6 +1090,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '2N'  => 'Nomu',
         '6H'  => 'Noontec',
         'NR'  => 'Nordmende',
+        'NOR' => 'NORMANDE',
         '7N'  => 'NorthTech',
         'NOT' => 'Nothing Phone',
         '5N'  => 'Nos',
@@ -1120,6 +1129,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '3O'  => 'ONYX BOOX',
         'O4'  => 'ONN',
         '9Q'  => 'Onkyo',
+        'ONV' => 'ONVO',
         '2O'  => 'OpelMobile',
         'OH'  => 'Openbox',
         '7Y'  => 'Obabox',
@@ -1545,6 +1555,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '6T'  => 'Twoe',
         '15'  => 'Tymes',
         'UC'  => 'U.S. Cellular',
+        'UGI' => 'UGINE',
         'UG'  => 'Ugoos',
         'U1'  => 'Uhans',
         'UH'  => 'Uhappy',

diff --git a/Parser/OperatingSystem.php b/Parser/OperatingSystem.php
@@ -158,6 +158,7 @@ class OperatingSystem extends AbstractParser
         'TIZ' => 'Tizen',
         'TOS' => 'TmaxOS',
         'UBT' => 'Ubuntu',
+        'VID' => 'VIDAA',
         'WAS' => 'watchOS',
         'WER' => 'Wear OS',
         'WTV' => 'WebTV',
@@ -205,7 +206,7 @@ class OperatingSystem extends AbstractParser
             'ORD', 'TOS', 'RSO', 'DEE', 'FRE', 'MAG', 'FEN', 'CAI', 'PCL', 'HAS',
             'LOS', 'DVK', 'ROK', 'OWR', 'OTV', 'KTV', 'PUR', 'PLA', 'FUC', 'PAR',
             'FOR', 'MON', 'KAN', 'ZEN', 'LND', 'LNS', 'CHN', 'AMZ', 'TEN', 'CST',
-            'NOV', 'ROU', 'ZOR', 'RED', 'KAL', 'ORA',
+            'NOV', 'ROU', 'ZOR', 'RED', 'KAL', 'ORA', 'VID',
         ],
         'Mac'                   => ['MAC'],
         'Mobile Gaming Console' => ['PSP', 'NDS', 'XBX'],

diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml
@@ -3942,3 +3942,19 @@
     version: "7"
     platform: x64
     family: GNU/Linux
+-
+  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-NT72671D VIDAA/6.0(Hisense;SmartTV;85A66GAVT;NT72671/V0000.06.12N.N0622;UHD;86A6GA;)
+  os:
+    name: VIDAA
+    short_name: VID
+    version: "6.0"
+    platform: ARM
+    family: GNU/Linux
+-
+  user_agent: Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.140 Safari/537.36 OPR/46.0.2207.0 OMI/4.21.2.50.Honey.220 Model/Hisense-NT72671D TV Store/4.21
+  os:
+    name: Opera TV
+    short_name: OTV
+    version: "4.21"
+    platform: ARM
+    family: GNU/Linux