Merge branch 'master' into bots

matomo-org · May 27, 2024 · 9e84896 · 9e84896
2 parents c995ff0 + ab5d363
commit 9e84896
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 6 deletions.
diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php
@@ -403,6 +403,7 @@ class Browser extends AbstractClientParser
         'MY' => 'Mypal',
         'MR' => 'Monument Browser',
         'MW' => 'MAUI WAP Browser',
+        'N7' => 'Naenara Browser',
         'NW' => 'Navigateur Web',
         'NK' => 'Naked Browser',
         'NA' => 'Naked Browser Pro',
@@ -724,7 +725,7 @@ class Browser extends AbstractClientParser
             'IW', 'LH', 'LY', 'MB', 'MN', 'MO', 'MY', 'OA', 'OS',
             'PI', 'PX', 'QA', 'S5', 'SX', 'TF', 'TO', 'WF', 'ZV',
             'FP', 'AD', 'WL', '2I', 'P9', 'KJ', 'WY', 'VK', 'W5',
-            '7C',
+            '7C', 'N7',
         ],
         'Internet Explorer'  => ['IE', 'CZ', 'BZ', 'IM', 'PS', '3A', '4A', 'RN'],
         'Konqueror'          => ['KO'],

diff --git a/Parser/OperatingSystem.php b/Parser/OperatingSystem.php
@@ -147,6 +147,7 @@ class OperatingSystem extends AbstractParser
         'PIO' => 'Raspberry Pi OS',
         'RAS' => 'Raspbian',
         'RHT' => 'Red Hat',
+        'RST' => 'Red Star',
         'RED' => 'RedOS',
         'REV' => 'Revenge OS',
         'ROS' => 'RISC OS',
@@ -232,7 +233,7 @@ class OperatingSystem extends AbstractParser
             'FOR', 'MON', 'KAN', 'ZEN', 'LND', 'LNS', 'CHN', 'AMZ', 'TEN', 'CST',
             'NOV', 'ROU', 'ZOR', 'RED', 'KAL', 'ORA', 'VID', 'TIV', 'BSN', 'RAS',
             'UOS', 'PIO', 'FRI', 'LIR', 'WEB', 'SER', 'ASP', 'AOS', 'LOO', 'EUL',
-            'SCI', 'ALP', 'CLO', 'ROC', 'OVZ', 'PVE',
+            'SCI', 'ALP', 'CLO', 'ROC', 'OVZ', 'PVE', 'RST',
         ],
         'Mac'                   => ['MAC'],
         'Mobile Gaming Console' => ['PSP', 'NDS', 'XBX'],

diff --git a/README.md b/README.md
diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml
@@ -9415,3 +9415,12 @@
     engine: ""
     engine_version: ""
     family: ""
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1b4) Gecko/20130508 Fedora/1.9.1-2.5.rs3.0 NaenaraBrowser/3.5b4
+  client:
+    type: browser
+    name: Naenara Browser
+    version: "3.5"
+    engine: Gecko
+    engine_version: 1.9.1
+    family: Firefox
diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml
@@ -4942,3 +4942,19 @@
     version: "16.1"
     platform: ARM
     family: iOS
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; ko-KP, en; rv:1.8.1.8) Gecko/20090718 《붉은별》/2.5 NaenaraBrowser/2.0.0.8
+  os:
+    name: Red Star
+    short_name: RST
+    version: ""
+    platform: x86
+    family: GNU/Linux
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1b4) Gecko/20130508 Fedora/1.9.1-2.5.rs3.0 NaenaraBrowser/3.5b4
+  os:
+    name: Red Star
+    short_name: RST
+    version: "3.0"
+    platform: x86
+    family: GNU/Linux
diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
@@ -5,6 +5,13 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+# Naenara Browser (https://en.wikipedia.org/wiki/Naenara_(browser))
+- regex: 'NaenaraBrowser(?:/(\d+[\.\d]+))?'
+  name: 'Naenara Browser'
+  version: '$1'
+  engine:
+    default: 'Gecko'
+
 # NOOK Browser
 - regex: 'nook browser(?:/(\d+[\.\d]+))?'
   name: 'NOOK Browser'

diff --git a/regexes/oss.yml b/regexes/oss.yml
@@ -5,6 +5,13 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+##########
+# Red Star (https://en.wikipedia.org/wiki/Red_Star_OS)
+##########
+- regex: '붉은별|Fedora/(?:\d+\.[\d.-]+)\.rs(\d+(?:[_.]\d+)*)'
+  name: 'Red Star'
+  version: '$1'
+
 ##########
 # Proxmox VE (https://pve.proxmox.com/wiki/Main_Page)
 ##########