device_detector 1.0.0 → 1.0.5

data/regexes/device/notebooks.yml

@@ -0,0 +1,114 @@
+###############
+# Device Detector - The Universal Device Detection library for parsing User Agents
+#
+# @link https://matomo.org
+# @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
+###############
+
+Acer:
+  regex: 'FBMD/(?:Aspire E5-421G|Z5WAL|One S1003);'
+  device: 'desktop'
+  models:
+    - regex: 'FBMD/Aspire E5-421G;'
+      model: 'Aspire E5-421G'
+    - regex: 'FBMD/Z5WAL;'
+      model: 'Aspire E5-511'
+    - regex: 'FBMD/One S1003;'
+      model: 'One 10'
+
+Asus:
+  regex: 'FBMD/(?:K50IN|K54L|T100HAN|T103HAF|UX360CAK|X550LB|X553MA|X555LN|X556UQK);'
+  device: 'desktop'
+  models:
+    - regex: 'FBMD/K50IN;'
+      model: 'K50IN'
+    - regex: 'FBMD/K54L;'
+      model: 'K54L'
+    - regex: 'FBMD/T100HAN;'
+      model: 'Transformer Book'
+    - regex: 'FBMD/T103HAF;'
+      model: 'Transformer Mini'
+    - regex: 'FBMD/UX360CAK;'
+      model: 'ZenBook Flip'
+    - regex: 'FBMD/X550LB;'
+      model: 'X550LB'
+    - regex: 'FBMD/X553MA;'
+      model: 'X553MA'
+    - regex: 'FBMD/X555LN;'
+      model: 'X555LN'
+    - regex: 'FBMD/X556UQK;'
+      model: 'X556UQK'
+
+Dell:
+  regex: 'FBMD/(?:Latitude E4300|Inspiron 3541|XPS 15 95[35]0);'
+  device: 'desktop'
+  models:
+    - regex: 'Latitude E4300'
+      model: 'Latitude E4300'
+    - regex: 'Inspiron 3541'
+      model: 'Inspiron 3541'
+    - regex: 'XPS 15 9530'
+      model: 'XPS 15 9530'
+    - regex: 'XPS 15 9550'
+      model: 'XPS 15 9550'
+
+HP:
+  regex: 'FBMD/((?:Compaq|HP) |23-f364)'
+  device: 'desktop'
+  models:
+    - regex: 'Compaq Presario CQ61 Notebook PC'
+      model: 'Compaq Presario CQ61'
+    - regex: 'HP Pavilion x2 Detachable'
+      model: 'Pavilion x2'
+    - regex: 'HP Laptop 15-bs0xx'
+      model: '15 Laptop PC'
+    - regex: 'HP ENVY x360 Convertible 15-bp0xx'
+      model: 'ENVY x360 Convertible PC'
+    - regex: 'HP EliteBook (25[67]0p)'
+      model: 'EliteBook $1'
+    - regex: 'HP ProBook (440 G5|6[35]60b)'
+      model: 'ProBook $1'
+    - regex: 'HP Pavilion dv6 Notebook PC'
+      model: 'Pavilion dv6'
+    - regex: 'HP Pavilion Notebook'
+      model: 'Pavilion'
+    - regex: 'HP Spectre x360 Convertible'
+      model: 'Spectre x360'
+    - regex: 'HP Pavilion All-in-One 24-r0xx'
+      model: 'Pavilion 24-r0xx All-in-One Desktop PC'
+      device: 'desktop'
+    - regex: '23-f364'
+      model: 'Pavilion TouchSmart 23-f364 All-in-One Desktop PC'
+      device: 'desktop'
+
+Lenovo:
+  regex: 'FBMD/(?:37021C5|80E5|80SM|80VR);'
+  device: 'desktop'
+  models:
+    - regex: 'FBMD/37021C5;'
+      model: 'ThinkPad Helix 3702'
+    - regex: 'FBMD/80E5;'
+      model: 'G50-80'
+    - regex: 'FBMD/80SM;'
+      model: 'Ideapad 310-15ISK'
+    - regex: 'FBMD/80VR;'
+      model: 'Legion Y720'
+
+Schneider:
+  regex: 'FBMD/SCL141CTP;'
+  device: 'desktop'
+  model: 'Notebook 14" Cherry Trail'
+
+Thomson:
+  regex: 'FBMD/TH360R12.32CTW;'
+  device: 'desktop'
+  model: 'Prestige TH-360R12.32CTW'
+
+Toshiba:
+  regex: 'FBMD/Satellite '
+  device: 'desktop'
+  models:
+    - regex: 'Satellite (A[25]00|C650|C855|L650|S855)'
+      model: 'Satellite $1'
+    - regex: 'Satellite ([^;\)]+);'
+      model: 'Satellite $1'

data/regexes/device/portable_media_player.yml

@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -19,10 +19,8 @@ Apple:
       model: 'iPod Touch 4'
     - regex: '(?:Apple-)?iPod5[C,]1'
       model: 'iPod Touch 5'
-    - regex: '(?:Apple-)?iPod1[C,]1'
-      model: 'iPod Touch'
-    - regex: '(?:Apple-)?iPod1[C,]1'
-      model: 'iPod Touch'
+    - regex: '(?:Apple-)?iPod7[C,]1'
+      model: 'iPod Touch 6'
     - regex: '(?:Apple-)?iPod'
       model: 'iPod Touch'
 
@@ -58,4 +56,4 @@ Samsung:
     - regex: 'YP-G50'
       model: 'Galaxy Player 50'
     - regex: 'YP-GB70D'
-      model: 'Galaxy Player 70 Plus'
+      model: 'Galaxy Player 70 Plus'

data/regexes/device/televisions.yml

@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 #
 #  ATTENTION: This file may only include tv user agents that contain 'HbbTV/([1-9]{1}(\.[0-9]{1}){1,2})'
@@ -56,6 +56,16 @@ Grundig:
   device: 'tv'
   model: ''
 
+# Hisense
+Hisense:
+  regex: 'Hisense'
+  device: 'tv'
+  models:
+    - regex: '(L[A-Z]{2,3}[0-9]{2}[A-Z][0-9]{3,4}[A-Z]{0,6}[0-9]?[A-Z]?)'
+      model: '$1'
+    - regex: '(H[A-Z]?[0-9]{2}[A-Z][0-9]{3,4}[A-Z]{0,4})'
+      model: '$1'
+
 # Humax
 Humax:
   regex: 'Humax'
@@ -101,6 +111,10 @@ LG:
   models:
     - regex: '(NetCast [0-9]{1}.[0-9]{1}|GLOBAL_PLAT3)'
       model: '$1'
+    - regex: '(OLED[0-9]{2}[A-Z][0-9][A-Z])'
+      model: '$1'
+    - regex: 'LGE;? ?([0-9]{2}[A-Z]{2}[0-9]{2,4}[A-Z]?)'
+      model: '$1'
 
 # Loewe
 Loewe:
@@ -165,7 +179,7 @@ Samsung:
   regex: 'Samsung|Maple_2011'
   device: 'tv'
   models:
-    - regex: 'SmartTV(2012|2013|2014|2015)'
+    - regex: 'SmartTV(201[2-9])'
       model: 'Smart TV $1'
     - regex: 'Maple_2011'
       model: 'Smart TV 2011'
@@ -213,7 +227,7 @@ Sony:
   regex: 'Sony'
   device: 'tv'
   models:
-    - regex: '(KDL[0-9]{2}[A-Z]{1,2}[0-9]{3})'
+    - regex: '(KDL?-?[0-9]{2}[A-Z]{1,2}[0-9]{1,5})'
       model: '$1'
 
 # TechniSat
@@ -244,14 +258,28 @@ TCL:
   regex: 'TCL'
   device: 'tv'
   models:
+    - regex: '(32D1820)'
+      model: '$1'
     - regex: '(LF1V[0-9]{3})'
       model: '$1'
 
 # Thomson
 Thomson:
-  regex: 'THOMSON|THOM'
+  regex: 'THOMSON[,]?|THOM'
   device: 'tv'
   models:
+    - regex: '(TB28D19DHS-01|T28D18SFS-01B)'
+      model: '$1 28.0"'
+    - regex: '(T32RTM5040|T32D18SFS-01B)'
+      model: '$1 32.0"'
+    - regex: '(T43FSL5031|T43D18SFS-01B)'
+      model: '$1 43.0"'
+    - regex: '(T40D18SFS-01B)'
+      model: '$1 40.0"'
+    - regex: '(T49D18SFS-01B)'
+      model: '$1 49.0"'
+    - regex: '(T55D18[SD]FS-01B)'
+      model: '$1 55.0"'
     - regex: '(LF1V[0-9]{3})'
       model: '$1'
 
@@ -279,4 +307,4 @@ Videoweb:
     - regex: '(tv2n)'
       model: '$1'
     - regex: '(videowebtv)'
-      model: 'VideoWeb TV'
+      model: 'VideoWeb TV'

data/regexes/oss.yml

@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -31,7 +31,7 @@
 ##########
 # Windows Mobile
 ##########
-- regex: 'Windows Phone (?:OS)?[ ]?(\d+[\.\d]+)'
+- regex: '(?:Windows Phone (?:OS)?|wds)[ ]?(\d+[\.\d]+)'
   name: 'Windows Phone'
   version: '$1'
   
@@ -45,7 +45,7 @@
   version: '$1'
   
   
-- regex: '(?:IEMobile|Windows Mobile)(?: (\d+[\.\d]+))?'
+- regex: '(?:IEMobile|Windows ?Mobile)(?: (\d+[\.\d]+))?'
   name: 'Windows Mobile'
   version: '$1'
   
@@ -58,6 +58,19 @@
   name: 'Windows RT'
   version: '8.1'
 
+##########
+# Windows IoT
+##########
+- regex: 'Windows IoT 10.0'
+  name: 'Windows IoT'
+  version: '10'
+
+##########
+# KaiOS
+##########
+- regex: 'KAIOS(?:/(\d+[\.\d]+))?'
+  name: 'KaiOS'
+  version: '$1'
 
 ##########
 # Custom Android Roms
@@ -78,17 +91,36 @@
   name: 'MocorDroid'
   version: '$1'
 
+- regex: 'Fire OS(?:/(\d+[\.\d]*))?'
+  name: 'Fire OS'
+  version: '$1'
+
 ##########
 # Android
 ##########
-- regex: '(?:(?:Orca-)?Android|Adr)[ /](?:[a-z]+ )?(\d+[\.\d]+)'
+- regex: '[ ]([\d\.]+)\) AppleWebKit.*ROBLOX Android App'
+  name: 'Android'
+  version: '$1'
+
+- regex: '(?:(?:Orca-)?Android|Adr)[ /](?:[a-z]+ )?(\d+[\.\d]*)'
   name: 'Android'
   version: '$1'
-  
   
 - regex: 'Android|Silk-Accelerated=[a-z]{4,5}'
   name: 'Android'
   version: ''
+
+- regex: '(?:TwitterAndroid).*[ /](?:[a-z]+ )?(\d+[\.\d]*)'
+  name: 'Android'
+  version: '$1'
+
+- regex: 'FB4A.*FBSV/(\d+[\.\d]*);'
+  name: 'Android'
+  version: '$1'
+
+- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe'
+  name: 'Android'
+  version: ''
   
   
 ##########
@@ -122,9 +154,17 @@
 ##########
 # Linux
 ##########
+- regex: '(Ordissimo|webissimo3)'
+  name: 'Ordissimo'
+  version: ''
+
+- regex: 'TOS; Linux'
+  name: 'TmaxOS'
+  version: ''
+
 - regex: 'Maemo'
   name: 'Maemo'
-  version: '$1'
+  version: ''
 
 - regex: 'Arch ?Linux(?:[ /\-](\d+[\.\d]+))?'
   name: 'Arch Linux'
@@ -147,7 +187,7 @@
 ##########
 # webOS
 ##########
-- regex: '(?:webOS|Palm webOS)(?:/(\d+[\.\d]+))?'
+- regex: '(?:webOS|web0S|Palm webOS)(?:/(\d+[\.\d]+))?'
   name: 'webOS'
   version: '$1'
 
@@ -172,79 +212,118 @@
   name: 'Windows'
   version: '10'
 
-- regex: 'CYGWIN_NT-6.4|Windows NT 6.4|Windows 10'
+- regex: 'CYGWIN_NT-6.4|Windows NT 6.4|Windows 10|win10'
   name: 'Windows'
   version: '10'
-  
+
 - regex: 'CYGWIN_NT-6.3|Windows NT 6.3|Windows 8.1'
   name: 'Windows'
   version: '8.1'
 
-
 - regex: 'CYGWIN_NT-6.2|Windows NT 6.2|Windows 8'
   name: 'Windows'
   version: '8'
-  
-  
-- regex: 'CYGWIN_NT-6.1|Windows NT 6.1|Windows 7'
+
+- regex: 'CYGWIN_NT-6.1|Windows NT 6.1|Windows 7|win7'
   name: 'Windows'
   version: '7'
-  
-  
+
 - regex: 'CYGWIN_NT-6.0|Windows NT 6.0|Windows Vista'
   name: 'Windows'
   version: 'Vista'
-  
-  
+
 - regex: 'CYGWIN_NT-5.2|Windows NT 5.2|Windows Server 2003 / XP x64'
   name: 'Windows'
   version: 'Server 2003'
-  
-  
+
 - regex: 'CYGWIN_NT-5.1|Windows NT 5.1|Windows XP'
   name: 'Windows'
   version: 'XP'
-  
-  
+
 - regex: 'CYGWIN_NT-5.0|Windows NT 5.0|Windows 2000'
   name: 'Windows'
   version: '2000'
-  
-  
+
 - regex: 'CYGWIN_NT-4.0|Windows NT 4.0|WinNT|Windows NT'
   name: 'Windows'
   version: 'NT'
-  
-  
+
 - regex: 'CYGWIN_ME-4.90|Win 9x 4.90|Windows ME'
   name: 'Windows'
   version: 'ME'
-  
-  
+
 - regex: 'CYGWIN_98-4.10|Win98|Windows 98'
   name: 'Windows'
   version: '98'
-  
-  
+
 - regex: 'CYGWIN_95-4.0|Win32|Win95|Windows 95|Windows_95'
   name: 'Windows'
   version: '95'
-  
-  
+
 - regex: 'Windows 3.1'
   name: 'Windows'
   version: '3.1'
-  
-  
+
+- regex: 'FBW.*FBSV/(\d+[\.\d]*);'
+  name: 'Windows'
+  version: '$1'
+
 - regex: 'Windows'
   name: 'Windows'
   version: ''
-  
-  
+
+
+##########
+# Haiku OS
+##########
+- regex: 'Haiku'
+  name: 'Haiku OS'
+  version: ''
+
   
 ##########
 # iOS
 ##########
+- regex: 'CFNetwork/889'
+  name: 'iOS'
+  version: '11.1'
+
+- regex: 'CFNetwork/887.*(x86_64)'
+  name: 'Mac'
+  version: '10.13'
+
+- regex: 'CFNetwork/887'
+  name: 'iOS'
+  version: '11.0'
+
+- regex: 'CFNetwork/811.*(x86_64)'
+  name: 'Mac'
+  version: '10.12'
+
+- regex: 'CFNetwork/811'
+  name: 'iOS'
+  version: '10.3'
+
+- regex: 'CFNetwork/808\.3'
+  name: 'iOS'
+  version: '10.3'
+
+- regex: 'CFNetwork/808\.2'
+  name: 'iOS'
+  version: '10.2'
+
+- regex: 'CFNetwork/808\.1'
+  name: 'iOS'
+  version: '10.1'
+
+- regex: 'CFNetwork/808\.0'
+  name: 'iOS'
+  version: '10.0'
+
+- regex: 'CFNetwork/808'
+  name: 'iOS'
+  version: '10'
+
 - regex: 'CFNetwork/758\.4\.3'
   name: 'iOS'
   version: '9.3.2'
@@ -341,16 +420,31 @@
   name: 'iOS'
   version: '$1'
 
+- regex: 'FBIOS.*FBSV/(\d+[\.\d]*);'
+  name: 'iOS'
+  version: '$1'
+
 - regex: '(?:Apple-)?(?:iPhone|iPad|iPod)(?:.*Mac OS X.*Version/(\d+\.\d+)|; Opera)?'
   name: 'iOS'
   version: '$1'
 
+- regex: 'Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|Overcast|Castro|Podcat|i[cC]atcher|RSSRadio/'
+  name: 'iOS'
+  version: ''
+
+- regex: 'iTunes-(iPod|iPad|iPhone)/(?:[\d\.]+)'
+  name: 'iOS'
+  version: ''
 
 
 ##########
 # Mac
 ##########
 
+- regex: 'CFNetwork/807'
+  name: 'Mac'
+  version: '10.12'
+
 - regex: 'CFNetwork/760'
   name: 'Mac'
   version: '10.11'
@@ -391,7 +485,7 @@
   name: 'Mac'
   version: '10.2'
 
-- regex: 'Mac OS X(?: (?:Version )?(\d+(?:[_\.]\d+)+))?'
+- regex: 'Mac[ +]OS[ +]X(?:[ /](?:Version )?(\d+(?:[_\.]\d+)+))?'
   name: 'Mac'
   version: '$1'
   
@@ -399,7 +493,7 @@
   name: 'Mac'
   version: '$1'
 
-- regex: 'Darwin|Macintosh|Mac_PowerPC|PPC|Mac PowerPC'
+- regex: 'Darwin|Macintosh|Mac_PowerPC|PPC|Mac PowerPC|iMac|MacBook'
   name: 'Mac'
   version: ''
   
@@ -408,7 +502,7 @@
 ##########
 # ChromeOS
 ##########
-- regex: 'CrOS [a-z0-9_]+ (\d+[\.\d]+)'
+- regex: 'CrOS [a-z0-9_]+ .* Chrome/(\d+[\.\d]+)'
   name: 'Chrome OS'
   version: '$1'
   
@@ -435,13 +529,9 @@
 - regex: 'BlackBerry'
   name: 'BlackBerry OS'
   version: ''
-
-
-##########
-# Haiku OS
-##########
-- regex: 'Haiku'
-  name: 'Haiku OS'
+  
+- regex: 'bPod'
+  name: 'BlackBerry OS'
   version: ''
 
 
@@ -645,11 +735,10 @@
 ##########
 # Gaming Console
 ##########
-- regex: 'Nintendo Wii'
+- regex: 'Nintendo (Wii|Switch)'
   name: 'Nintendo'
-  version: 'Wii'
-  
-  
+  version: '$1'
+
 - regex: 'PlayStation ?([3|4])'
   name: 'PlayStation'
   version: '$1'