Adds detection for Formovie brand

ref matomo-org#7882
liviuconcioiu · Dec 22, 2024 · b03a78b · b03a78b
1 parent d98ad25
commit b03a78b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/DeviceDetector.php b/DeviceDetector.php
@@ -1070,7 +1070,7 @@ protected function parseDevice(): void
         /**
          * All devices that contain Andr0id in string are assumed to be a tv
          */
-        if ($this->matchUserAgent('Andr0id|(?:Android(?: UHD)?|Google) TV|\(lite\) TV|BRAVIA| TV$')) {
+        if ($this->matchUserAgent('Andr0id|(?:Android(?: UHD)?|(<!Xming )Google) TV|\(lite\) TV|BRAVIA| TV$')) {
             $this->device = AbstractDeviceParser::DEVICE_TYPE_TV;
         }
 

diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
@@ -647,6 +647,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '44'  => 'Four Mobile',
         'F0'  => 'Fonos',
         'F2'  => 'FORME',
+        'FRM' => 'Formovie',
         'F5'  => 'Formuler',
         'FR'  => 'Forstar',
         'RF'  => 'Fortis',

diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml
@@ -1630,3 +1630,21 @@
     model: MoGo Pro
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; Xming Google TV Build/RTM7.230903.079; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/129.0.6668.102 Mobile Safari/537.36
+  os:
+    name: Android TV
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 129.0.6668.102
+    engine: Blink
+    engine_version: 129.0.6668.102
+  device:
+    type: peripheral
+    brand: Formovie
+    model: Xming
+  os_family: Android
+  browser_family: Chrome
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -36379,6 +36379,14 @@ Yoka TV:
   device: 'tv'
   model: 'KB2 Pro'
 
+# Formovie (https://www.formovie.com)
+Formovie:
+  regex: 'Xming'
+  device: 'peripheral'
+  models:
+    - regex: 'Xming Google TV(?:[);/ ]|$)'
+      model: 'Xming' # Xming Page One or Xming Episode One
+
 # Formuler (formuler.tv)
 Formuler:
   regex: 'Formuler[ _]|(?:S_TURBO_PRO)(?:[);/ ]|$)'