device_detector 1.0.7 → 1.1.0

data/regexes/device/portable_media_player.yml

@@ -36,8 +36,10 @@ FiiO:
   regex: 'FiiO'
   device: 'portable media player'
   models:
-    - regex: 'M15'
-      model: 'M15'
+    - regex: 'M11 Plus LTD'
+      model: 'M11 Plus LTD'
+    - regex: 'M(1[57])'
+      model: 'M$1'
 
 Microsoft:
   regex: 'Microsoft ZuneHD'
@@ -84,3 +86,17 @@ SONOS:
       model: 'Play:5'
     - regex: 'Sonos;One;'
       model: 'One'
+
+# Shanling
+Shanling:
+  regex: 'Shanling M6'
+  device: 'portable media player'
+  models:
+    - regex: 'Shanling (M6\(21\))'
+      model: '$1'
+
+# Sylvania
+Sylvania:
+  regex: '(SLTDVD102[34])'
+  device: 'portable media player'
+  model: '$1'

data/regexes/device/shell_tv.yml

@@ -110,8 +110,19 @@ Loview:
   device: 'tv'
   model: ''
 
+# Supra
+Supra:
+  regex: 'Supra Shell'
+  device: 'tv'
+  model: ''
+
 # Yuno (yuno.bbk.ru)
 Yuno:
   regex: 'Yuno Shell'
   device: 'tv'
   model: ''
+
+TCL:
+  regex: 'TCL/TCL-'
+  device: 'tv'
+  model: ''

data/regexes/device/televisions.yml

@@ -26,7 +26,9 @@ Airties:
 'ALDI SÜD':
   regex: 'ALDISUED[;,]'
   device: 'tv'
-  model: ''
+  models:
+    - regex: 'ALDISUED, ([a-z0-9_ \-]+), (?:wired|wireless)'
+      model: ''
 
 # Altech UEC
 'Altech UEC':
@@ -152,7 +154,9 @@ GoGEN:
 Grundig:
   regex: '(OWB|Grundig|Arcelik)'
   device: 'tv'
-  model: ''
+  models:
+    - regex: 'G7'
+      model: 'G7'
 
 # Haier
 Haier:
@@ -212,13 +216,21 @@ Hotel:
 
 # Humax
 Humax:
-  regex: 'Humax'
+  regex: 'Humax|hdr1000s'
   device: 'tv'
   models:
     - regex: '(HD-FOX C|HD (FOX\+|NANO)|iCord (HD\+|MINI|Cable)|(CX|IR)HD-5100(C|S)|HM9503HD)'
       model: '$1'
     - regex: 'HMS1000S'
       model: 'HMS-1000S'
+    - regex: 'FVP4000T'
+      model: 'FVP-4000T'
+    - regex: 'HGS1000S'
+      model: 'HGS-1000S'
+    - regex: 'HDR1000S'
+      model: 'HDR-1000S'
+    - regex: 'HDR4000T'
+      model: 'HDR-4000T'
     - regex: 'Humax; ([^);/]+)'
       model: '$1'
 
@@ -364,7 +376,9 @@ MediaTek:
 Medion:
   regex: 'Medion'
   device: 'tv'
-  model: ''
+  models:
+    - regex: 'MEDION, ([a-z0-9_ \-]+), (?:wired|wireless)'
+      model: ''
 
 # Miray
 Miray:
@@ -517,6 +531,8 @@ Sharp:
   regex: '(?:UMC-)?Sharp'
   device: 'tv'
   models:
+    - regex: 'SHARP, ([a-z0-9_ \-]+), (?:wired|wireless)'
+      model: ''
     - regex: 'Sharp[,;] ?((?! |HbbTV)[^),;/]+)'
       model: '$1'
     - regex: '(LE[0-9]{3}[A-Z]{0,3})'
@@ -699,3 +715,9 @@ Vestel:
   regex: '(?:Vestel.+VESTEL|VESTEL;)'
   device: 'tv'
   model: ''
+
+# Unknown
+Unknown:
+  regex: 'OEM, ([a-z0-9_ \-]+), (?:wired|wireless)'
+  device: 'tv'
+  model: ''

data/regexes/oss.yml

@@ -5,6 +5,87 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+##########
+# RouterOS (https://help.mikrotik.com/docs/display/ROS/RouterOS)
+##########
+- regex: 'Mikrotik/(\d).x'
+  name: 'RouterOS'
+  version: '$1'
+
+##########
+# Sirin OS (https://sirinlabs.com/sirin-os/)
+##########
+- regex: 'FINNEY U1'
+  name: 'Sirin OS'
+  version: ''
+
+##########
+# Nova (https://www.nova.cu/)
+##########
+- regex: 'Nova; Linux'
+  name: 'Nova'
+  version: ''
+
+##########
+# Bliss OS (https://blissos.org/)
+##########
+- regex: 'Android 10.+bliss_maple'
+  name: 'Bliss OS'
+  version: '12'
+
+##########
+# TencentOS (https://github.com/Tencent/TencentOS-kernel)
+##########
+- regex: 'Linux/(\d+[\.\d]*).+tlinux'
+  name: 'TencentOS'
+  version: '$1'
+
+##########
+# Amazon Linux (https://docs.aws.amazon.com/AL2/latest/relnotes/relnotes-al2.html)
+##########
+- regex: '.+.amzn(\d).x86_64'
+  name: 'Amazon Linux'
+  version: '$1'
+
+##########
+# COS (China Operating System - https://web.archive.org/web/20170825001023/http://www.china-cos.com/)
+##########
+- regex: ' COS like Android'
+  name: 'China OS'
+  version: ''
+
+##########
+# ClearOS Mobile (https://www.clearos.com/products/clearos-editions/clearos-mobile)
+##########
+- regex: 'Android (\d+[\.\d]*); ClearPHONE'
+  name: 'ClearOS Mobile'
+  version: '$1'
+
+##########
+# Plasma Mobile (https://plasma-mobile.org/)
+##########
+- regex: 'Plasma Mobile'
+  name: 'Plasma Mobile'
+  version: ''
+
+##########
+# KreaTV
+##########
+- regex: 'KreaTV/0.0.0.0'
+  name: 'KreaTV'
+  version: ''
+
+- regex: 'KreaTV/(\d+[\.\d]+)'
+  name: 'KreaTV'
+  version: '$1'
+
+##########
+# Opera TV (https://blogs.opera.com/news/2016/01/ces-2016-meet-opera-tv/)
+##########
+- regex: 'Linux (?:[^;]+); Opera TV(?: Store)?/|^Opera/\d+\.\d+ \(Linux mips'
+  name: 'Opera TV'
+  version: ''
+
 ##########
 # GridOS (https://web.archive.org/web/20111123141630/http://fusiongarage.com/grid-os/about)
 ##########
@@ -132,6 +213,105 @@
   name: 'FydeOS'
   version: ''
 
+##########
+# Revenge OS
+##########
+- regex: 'revengeos_x2'
+  name: 'Revenge OS'
+  version: '2'
+
+##########
+# Lineage OS
+##########
+- regex: 'lineage_\w+'
+  name: 'Lineage OS'
+  version: ''
+
+#########
+# Resurrection Remix OS (https://resurrectionremix.com/)
+##########
+- regex: 'Android 8(?:[\d.]*);(?: [\w-]+;)? rr_fortuna3g'
+  name: 'Resurrection Remix OS'
+  version: '6'
+
+##########
+# Remix OS
+##########
+- regex: 'RemixOS|Remix (?:Pro|Mini)'
+  name: 'Remix OS'
+  versions:
+    - regex: 'RemixOS 5'
+      version: '1'
+    - regex: 'RemixOS 6|Remix Mini'
+      version: '2'
+    - regex: 'Remix Pro'
+      version: '3'
+
+##########
+# FreeBSD
+##########
+- regex: 'FreeBSD.+Android'
+  name: 'FreeBSD'
+  version: ''
+
+##########
+# Android TV (https://android.com/tv/)
+##########
+- regex: 'Linux; Andr0id[; ](\d+[\.\d]*)'
+  name: 'Android TV'
+  version: '$1'
+
+- regex: 'Android[; ](\d+[\.\d]*).+(?:Android|AT&T) TV'
+  name: 'Android TV'
+  version: '$1'
+
+- regex: 'Windows.+Andr0id TV|.+K_?Android_?TV_'
+  name: 'Android TV'
+  version: ''
+
+##########
+# Android SDK Level Api
+##########
+- regex: '\d+/tclwebkit(?:\d+[\.\d]*)'
+  name: 'Android'
+  versions:
+    - regex: '33/tclwebkit'
+      version: '13'
+    - regex: '3[12]/tclwebkit'
+      version: '12'
+    - regex: '30/tclwebkit'
+      version: '11'
+    - regex: '29/tclwebkit'
+      version: '10'
+    - regex: '28/tclwebkit'
+      version: '9'
+    - regex: '27/tclwebkit'
+      version: '8.1'
+    - regex: '26/tclwebkit'
+      version: '8'
+    - regex: '25/tclwebkit'
+      version: '7.1'
+    - regex: '24/tclwebkit'
+      version: '7'
+    - regex: '23/tclwebkit'
+      version: '6'
+    - regex: '22/tclwebkit'
+      version: '5.1'
+    - regex: '21/tclwebkit'
+      version: '5'
+    - regex: '(?:20|19)/tclwebkit'
+      version: '4.4'
+    - regex: '18/tclwebkit'
+      version: '4.3'
+    - regex: '17/tclwebkit'
+      version: '4.2'
+    - regex: '16/tclwebkit'
+      version: '4.2'
+    - regex: '15/tclwebkit'
+      version: '4.0.3'
+    - regex: '15/tclwebkit'
+      version: '4.0.1'
+
 ##########
 # Android
 ##########
@@ -143,7 +323,7 @@
   name: 'Android'
   version: ''
 
-- regex: 'Android OS/(\d+[\.\d]*)'
+- regex: '(?:Android OS|OMDroid)[ /](\d+[\.\d]*)'
   name: 'Android'
   version: '$1'
 
@@ -159,7 +339,7 @@
   name: 'Android'
   version: '$1'
 
-- regex: '(?:(?:Orca-)?Android|Adr)[ /]?(?:[a-z]+ )?(\d+[\.\d]*)'
+- regex: '(?:(?:Orca-)?(?<!like )Android|Adr|AOSP)[ /]?(?:[a-z]+ )?(\d+[\.\d]*)'
   name: 'Android'
   version: '$1'
 
@@ -175,7 +355,7 @@
   name: 'Android'
   version: '$1'
 
-- regex: ' Adr |Android|Silk-Accelerated=[a-z]{4,5}'
+- regex: ' Adr |DDG-Android|(?<!like )Android|Silk-Accelerated=[a-z]{4,5}'
   name: 'Android'
   version: ''
 
@@ -183,14 +363,10 @@
   name: 'Android'
   version: '$1'
 
-- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe|.+K_?Android_?TV_|Sonos/.+\(ACR_'
+- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe|Sonos/.+\(ACR_|Linux x86_64; Quest'
   name: 'Android'
   version: ''
 
-- regex: 'Linux; Andr0id[; ](\d+[\.\d]*)'
-  name: 'Android'
-  version: '$1'
-
 # Inverted Android
 - regex: 'Linux; diordnA[; ](\d+[\.\d]*)'
   name: 'Android'
@@ -245,6 +421,46 @@
 ##########
 # Linux
 ##########
+# Linspire (https://www.linspirelinux.com/)
+- regex: 'Linspire'
+  name: 'Linspire'
+  version: ''
+
+# LindowsOS (https://web.archive.org/web/20040304161245/http://www.lindows.com/)
+- regex: 'LindowsOS'
+  name: 'LindowsOS'
+  version: ''
+
+# Zenwalk (http://www.zenwalk.org/)
+- regex: 'Zenwalk GNU Linux'
+  name: 'Zenwalk'
+  version: ''
+
+# Kanotix (http://www.kanotix.com/)
+- regex: 'Linux.+kanotix'
+  name: 'Kanotix'
+  version: ''
+
+# moonOS (https://www.moonos.org/)
+- regex: 'moonOS/(\d+.[\d.]+)'
+  name: 'moonOS'
+  version: '$1'
+
+# Foresight Linux (https://www.foresightlinux.org/)
+- regex: 'Foresight Linux'
+  name: 'Foresight Linux'
+  version: ''
+
+# Pardus (https://www.pardus.org.tr/)
+- regex: 'Pardus/(\d+.[\d.]+)'
+  name: 'Pardus'
+  version: '$1'
+
+# Pure OS (https://pureos.net/)
+- regex: 'Librem 5'
+  name: 'PureOS'
+  version: ''
+
 # OpenWrt (https://openwrt.org/)
 - regex: 'uclient-fetch'
   name: 'OpenWrt'
@@ -255,7 +471,7 @@
   name: 'Roku OS'
   version: '$1'
 
-- regex: 'Roku(?:OS)?/(?:DVP|Pluto)?-?(\d+[\.\d]+)'
+- regex: 'Roku(?:OS|4640X)?/(?:DVP|Pluto)?-?(\d+[\.\d]+)?'
   name: 'Roku OS'
   version: '$1'
 
@@ -308,6 +524,34 @@
   name: 'VectorLinux'
   version: '$1'
 
+- regex: 'CentOS Stream (\d)'
+  name: 'CentOS Stream'
+  version: '$1'
+
+- regex: '.+.el(\d+(?:[_\.]\d+)*).(?:centos|x86_64)'
+  name: 'CentOS'
+  version: '$1'
+
+- regex: 'CentOS Linux (\d)'
+  name: 'CentOS'
+  version: '$1'
+
+- regex: 'Fedora/.+.fc(\d+)'
+  name: 'Fedora'
+  version: '$1'
+
+- regex: 'Mandriva(?: Linux)?/.+mdv(\d+[\.\d]+)'
+  name: 'Mandriva'
+  version: '$1'
+
+- regex: 'Linux Mint/(\d)'
+  name: 'Mint'
+  version: '$1'
+
+- regex: 'Zorin OS (\d+)'
+  name: 'ZorinOS'
+  version: '$1'
+
 - regex: 'Linux; .*((?:Debian|Knoppix|Mint|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Sabayon|Slackware|SUSE|CentOS|BackTrack))[ /](\d+[\.\d]+)'
   name: '$1'
   version: '$2'
@@ -320,12 +564,14 @@
   name: '$1'
   version: '$2'
 
+- regex: '.+redhat-linux-gnu'
+  name: 'Red Hat'
+  version: ''
+
 - regex: 'OS ROSA; Linux'
   name: 'Rosa'
   version: ''
 
-# generic linux match -> end of file
-
 ##########
 # webOS
 ##########
@@ -335,12 +581,16 @@
   versions:
     - regex: 'WEBOS(\d+[\.\d]+)'
       version: '$1'
-    - regex: 'Web0S; Linux/SmartTV.+Chrome/68'
+    - regex: 'Web0S; Linux/SmartTV.+Chr[o0]me/79'
+      version: '6'
+    - regex: 'Web0S; Linux/SmartTV.+Chr[o0]me/68'
       version: '5'
-    - regex: 'Web0S; Linux/SmartTV.+Chrome/53'
+    - regex: 'Web0S; Linux/SmartTV.+Chr[o0]me/53'
       version: '4'
-    - regex: 'Web0S; Linux/SmartTV.+Chrome/38'
+    - regex: 'Web0S; Linux/SmartTV.+Chr[o0]me/38'
       version: '3'
+    - regex: 'WEBOS1'
+      version: '1'
     - regex: 'Web0S; Linux/SmartTV.+Safari/538'
       version: '2'
     - regex: 'Web0S; Linux/SmartTV.+Safari/537'
@@ -358,7 +608,6 @@
   name: 'MorphOS'
   version: '$1'
 
-
 ##########
 # Windows
 ##########
@@ -378,7 +627,7 @@
   name: 'Windows'
   version: ''
 
-- regex: '(?:Windows(?:-Update-Agent)?|Microsoft-(?:CryptoAPI|Delivery-Optimization|WebDAV-MiniRedir|WNS))/(\d+\.\d+)'
+- regex: '(?:Windows(?:-Update-Agent)?|Microsoft-(?:CryptoAPI|Delivery-Optimization|WebDAV-MiniRedir|WNS)|WINDOWS_64)/(\d+\.\d+)'
   name: 'Windows'
   version: '$1'
 
@@ -438,10 +687,14 @@
   name: 'Windows'
   version: '3.1'
 
-- regex: 'Windows|.+win32|Win64|MSDW|HandBrake Win Upd|Microsoft BITS'
+- regex: 'Windows|.+win32|Win64|MSDW|HandBrake Win Upd|Microsoft BITS|ms-office; MSOffice'
   name: 'Windows'
   version: ''
 
+- regex: 'OS/Microsoft_Windows_NT_(\d+\.\d+)'
+  name: 'Windows'
+  version: '$1'
+
 ##########
 # Haiku OS
 ##########
@@ -452,11 +705,11 @@
 ##########
 # tvOS (https://developer.apple.com/tvos/)
 ##########
-- regex: 'Apple ?TV.*CPU (?:iPhone )?OS ((?:9|1[0-5])[_\.]\d+(?:[_.]\d+)*)'
+- regex: 'Apple ?TV.*CPU (?:iPhone )?OS ((?:9|1[0-6])[_\.]\d+(?:[_.]\d+)*)'
   name: 'tvOS'
   version: '$1'
 
-- regex: 'iOS(?:; |/)((?:9|1[0-5]).\d+(?:[_\.]\d+)*) (?:model/)?AppleTV'
+- regex: 'iOS(?:; |/)((?:9|1[0-6]).\d+(?:[_\.]\d+)*) (?:model/)?AppleTV'
   name: 'tvOS'
   version: '$1'
 
@@ -470,27 +723,27 @@
 ##########
 # iPadOS (https://www.apple.com/ipados/)
 ##########
-- regex: 'FBMD/iPad;.*FBSV/ ?(1[345]).(\d+[\.\d]*);'
+- regex: 'FBMD/iPad;.*FBSV/ ?(1[3-6]).(\d+[\.\d]*);'
   name: 'iPadOS'
   version: '$1.$2'
 
-- regex: 'iPad/(1[345]).(\d+[\.\d]*)'
+- regex: 'iPad/(1[3-6]).(\d+[\.\d]*)'
   name: 'iPadOS'
   version: '$1.$2'
 
-- regex: '^iPad(?:\d+[\,\d]*)/(1[345]).(\d+[\.\d]*)'
+- regex: '^iPad(?:\d+[\,\d]*)/(1[3-6]).(\d+[\.\d]*)'
   name: 'iPadOS'
   version: '$1.$2'
 
-- regex: 'iPad(?:; iOS|.+CPU OS) ((1[345])+(?:[_\.]\d+)*)'
+- regex: 'iPad(?:; (?:iOS|iPhone OS)|.+CPU OS) ((1[3-6])+(?:[_\.]\d+)*)'
   name: 'iPadOS'
   version: '$1'
 
-- regex: 'iOS/(1[345]).(\d+[\.\d]*).+Apple/iPad'
+- regex: 'iOS/(1[3-6]).(\d+[\.\d]*).+Apple/iPad'
   name: 'iPadOS'
   version: '$1.$2'
 
-- regex: 'iPhone OS,(1[345]).(\d+[\.\d]*).+iPad'
+- regex: 'iPhone OS,(1[3-6]).(\d+[\.\d]*).+iPad'
   name: 'iPadOS'
   version: '$1.$2'
 
@@ -509,13 +762,27 @@
   name: 'iOS'
   version: '$1'
 
+- regex: 'iOS (\d+[\.\d]+)\)'
+  name: 'iOS'
+  version: '$1'
+
 - regex: '(?:iPhone ?OS|iOS(?: Version)?)(?:/|; |,)(\d+[\.\d]+)'
   name: 'iOS'
   version: '$1'
 
-- regex: 'CFNetwork/.+ Darwin/(\d+[\.\d]+)(?!.*(?:x86_64|i386|PowerMac))'
+- regex: '^(?!com.apple.Safari.SearchHelper).*CFNetwork/.+ Darwin/(\d+[\.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))'
   name: 'iOS'
   versions:
+    - regex: 'Darwin/22.0.0'
+      version: '16.0'
+    - regex: 'Darwin/21.6.0'
+      version: '15.6'
+    - regex: 'Darwin/21.5.0'
+      version: '15.5'
+    - regex: 'Darwin/21.4.0'
+      version: '15.4'
+    - regex: 'Darwin/21.3.0'
+      version: '15.3'
     - regex: 'Darwin/21.2.0'
       version: '15.2'
     - regex: 'Darwin/21.1.0'
@@ -649,7 +916,7 @@
   name: 'iOS'
   version: '$1.$2.$3'
 
-- regex: '(?:CPU OS|iPh(?:one)?[ _]OS|iOS)[ _/](\d+(?:[_\.]\d+)*)'
+- regex: '(?:CPU OS|iPh(?:one)?[ _]OS|iPhone.+ OS|iOS)[ _/](\d+(?:[_\.]\d+)*)'
   name: 'iOS'
   version: '$1'
 
@@ -681,7 +948,11 @@
   name: 'iOS'
   version: '$1'
 
-- regex: '(?:Apple-)?(?:iPhone|iPad|iPod)(?:.*Mac OS X.*Version/(\d+\.\d+)|; Opera)?'
+- regex: '(?:Apple-)?(?<!like )(?:iPhone|iPad|iPod)(?:.*Mac OS X.*Version/(\d+\.\d+)|; Opera)?'
+  name: 'iOS'
+  version: '$1'
+
+- regex: 'dv\(iPh.+ov\((\d+(?:[_\.]\d+)*)\);'
   name: 'iOS'
   version: '$1'
 
@@ -708,9 +979,19 @@
 ##########
 # Mac
 ##########
-- regex: 'CFNetwork/.+ Darwin/(?:[\d\.]+).+(?:x86_64|i386)|(?:x86_64-apple-)?darwin(?:[\d\.]+)|PowerMac'
+- regex: 'CFNetwork/.+ Darwin/(?:[\d\.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d\.]+)|PowerMac|com.apple.Safari.SearchHelper'
   name: 'Mac'
   versions:
+    - regex: '(?:x86_64-apple-)?Darwin/?22.0.0'
+      version: '13.0'
+    - regex: '(?:x86_64-apple-)?Darwin/?21.6.0'
+      version: '12.5'
+    - regex: '(?:x86_64-apple-)?Darwin/?21.5.0'
+      version: '12.4'
+    - regex: '(?:x86_64-apple-)?Darwin/?21.4.0'
+      version: '12.3'
+    - regex: '(?:x86_64-apple-)?Darwin/?21.3.0'
+      version: '12.2'
     - regex: '(?:x86_64-apple-)?Darwin/?21.2.0'
       version: '12.1'
     - regex: '(?:x86_64-apple-)?Darwin/?21.1.0'
@@ -866,7 +1147,7 @@
   name: 'Mac'
   version: '$1'
 
-- regex: '(?:macOS[/,]|Mac-)(\d+[\.\d]+)'
+- regex: '(?:macOS[ /,]|Mac-)(\d+[\.\d]+)'
   name: 'Mac'
   version: '$1'
 
@@ -888,10 +1169,17 @@
 ##########
 # ChromeOS
 ##########
-- regex: 'CrOS [a-z0-9_]+ .* Chrome/(\d+[\.\d]+)'
+- regex: 'CrOS [a-z0-9_]+ (\d+[\.\d]+)'
   name: 'Chrome OS'
   version: '$1'
 
+##########
+# Fuchsia
+##########
+- regex: 'Fuchsia'
+  name: 'Fuchsia'
+  version: ''
+
 ##########
 # BlackBerry
 ##########
@@ -1018,20 +1306,6 @@
   name: 'WebTV'
   version: '$1'
 
-##########
-# Remix OS
-##########
-- regex: 'RemixOS 5.1.1'
-  name: 'Remix OS'
-  version: '1'
-
-- regex: 'RemixOS 6.0'
-  name: 'Remix OS'
-  version: '2'
-
-- regex: 'RemixOS'
-  name: 'Remix OS'
-  version: ''
 
 ##########
 # Unix
@@ -1083,10 +1357,14 @@
   name: 'Nintendo'
   version: '$1'
 
-- regex: 'PlayStation ?([34])'
+- regex: 'PlayStation.+; Linux (\d+[\.\d]+)'
   name: 'PlayStation'
   version: '$1'
 
+- regex: 'PlayStation ?(\d)(?:[/ ](?:Pro )?(\d+[\.\d]+))?'
+  name: 'PlayStation'
+  version: '$1.$2'
+
 - regex: 'Xbox|KIN\.(?:One|Two)'
   name: 'Xbox'
   version: '360'
@@ -1112,7 +1390,11 @@
 ###########
 # Linux (Generic)
 ###########
-- regex: 'Linux(?:OS)?[^a-z]|Cinnamon/(?:\d+[\.\d]+)'
+- regex: 'Linux/(\d+[\.\d]+)'
+  name: 'GNU/Linux'
+  version: '$1'
+
+- regex: 'Linux(?:OS)?[^a-z]|Cinnamon/(?:\d+[\.\d]+)|.+(?:pc|unknown)-linux-gnu'
   name: 'GNU/Linux'
   version: ''