device_detector 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98cdaab8265efd95799dcb71e4588cef6c300528
-  data.tar.gz: f43a7ef253ca782d672d8856d1b1214c6b300cfb
+  metadata.gz: 9dafeb69d5740bff28a730522bfcb0487ed419b8
+  data.tar.gz: e82f903f97d49b743d6572bd6a5f4c50b6ab5c61
 SHA512:
-  metadata.gz: 579c755cd334bb9dbb4f23402de2f7982d7b62f1d6a852524834ddc28f09a099e849d8a7c3111e89dfbed39ece1eb2467a07cb333dc8b7f1b458cc209eda1bc1
-  data.tar.gz: 84c58c57130167b1eab5162aaf4aa000e62ec1f38fd3e550f802602f483e85c1a4ff969fe31d7bc30fff2cfc14e3c8243a90dfde32495257cb4bb0070bc509b5
+  metadata.gz: 9ee6f2f50425f367ca9a1823d3f133d410d77d854fe9b88d991a1f07f2fd2c9ea35799c530ace6220d87b74b839b581b48bc6d9d186f9bff9da618439fe498f8
+  data.tar.gz: e047fd31175b2c09e17ac6fa0d7bdee576c579f675059c0cf3144e257c4d3e1c524d18aa286cfe1610d63611b3d7449fc5465685797b686d1a287a6a7d394d5c

data/Rakefile

@@ -39,8 +39,36 @@ task :detectable_names do
   puts
 end
 
+PIWIK_TARBALL_LOCATION = '/tmp/piwik_device_detector.tar.gz'.freeze
+
+def get_latest_piwik_tarball
+  system "curl -s -L https://api.github.com/repos/piwik/device-detector/tarball/master -o #{PIWIK_TARBALL_LOCATION}"
+end
+
 desc 'update regex database from piwik project'
 task :update_regexes do
   top = File.expand_path('..', __FILE__)
-  system "curl -s -L https://api.github.com/repos/piwik/device-detector/tarball/master | tar xzvf - --strip-components 1 --include */regexes/*.yml -C #{top}"
+  get_latest_piwik_tarball
+  system "tar xzvf #{PIWIK_TARBALL_LOCATION} --strip-components 1 --include */regexes/*.yml -C #{top}"
+end
+
+desc 'update fixtures from piwik project'
+task :update_fixtures do
+  top = File.expand_path('..', __FILE__)
+  get_latest_piwik_tarball
+
+  fixture_mappings = [
+    # tablet.yml from the detector fixtures is broken: https://github.com/piwik/device-detector/issues/5355
+    #{ local_path: "#{top}/spec/fixtures/detector", archive_path: '*/Tests/fixtures/*.yml', strip_components: 3 },
+    { local_path: "#{top}/spec/fixtures/client", archive_path: '*/Tests/Parser/Client/fixtures/*.yml', strip_components: 5 },
+    { local_path: "#{top}/spec/fixtures/parser", archive_path: '*/Tests/Parser/fixtures/*.yml', strip_components: 4 },
+    { local_path: "#{top}/spec/fixtures/device", archive_path: '*/Tests/Parser/Devices/fixtures/*.yml', strip_components: 5 },
+  ]
+
+  fixture_mappings.each do |mapping|
+    strip_components = mapping.fetch(:strip_components)
+    archive_path = mapping.fetch(:archive_path)
+    local_path = mapping.fetch(:local_path)
+    system "tar xzvf #{PIWIK_TARBALL_LOCATION} --strip-components #{strip_components} --include #{archive_path} -C #{local_path}"
+  end
 end

data/lib/device_detector/version.rb

@@ -1,3 +1,3 @@
 class DeviceDetector
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

data/regexes/bots.yml

@@ -965,6 +965,23 @@
     name: 'Pinterest'
     url: 'http://www.pinterest.com/'
 
+- regex: 'Site24x7'
+  name: 'Site24x7 Website Monitoring'
+  category: 'Site Monitor'
+  url: 'https://www.site24x7.com/site24x7-faq.html'
+  producer:
+    name: 'Site24x7'
+    url: 'https://www.site24x7.com'
+
+- regex: 'www.monitor.us'
+  name: 'Monitor.Us'
+  category: 'Site Monitor'
+  url: 'http://www.monitor.us'
+  producer:
+    name: 'Monitor.Us'
+    url: 'http://www.monitor.us'
+
+
 - regex: 'lycos'
   name: 'Lycos'
 
@@ -1019,7 +1036,6 @@
 - regex: '(nuhk|TsolCrawler|Yammybot|Openbot|Gulper Web Bot|grub-client|Download Demon|SearchExpress|Microsoft URL Control|borg|altavista|teoma|blitzbot|oegp|furlbot|http%20client|polybot|htdig|mogimogi|larbin|scrubby|searchsight|seekbot|semanticdiscovery|snappy|vortex|zao|zeal|fast-webcrawler|converacrawler|dataparksearch|findlinks|BrowserMob|HttpMonitor|ThumbShotsBot|URL2PNG|ZooShot|GomezA|Catchpoint bot|Google SketchUp|Read%20Later|Minimo|RackspaceBot)'
   name: 'Bot'
 
-
 # Generic detections
 
 - regex: 'Nutch'
@@ -1031,4 +1047,4 @@
     url: 'http://www.apache.org/foundation/'
 
 - regex: '[a-z0-9\-_]*(bot|crawler|archiver|transcoder|spider)'
-  name: 'Generic Bot'
+  name: 'Generic Bot'

data/regexes/client/browsers.yml

@@ -5,13 +5,19 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
-# Spartan (newer versions of IE)
+# Microsoft Edge (newer versions of IE)
 - regex: 'Edge[ /](\d+[\.\d]+)'
-  name: 'Project Spartan'
+  name: 'Microsoft Edge'
   version: '$1'
   engine:
     default: 'Edge'
 
+# 360 Phone Browser
+- regex: '360 Aphone Browser(?: \((\d+[\.\d]+)(?:beta)?\))?'
+  name: '360 Phone Browser'
+  version: '$1'
+  engine:
+    default: 'WebKit'
 
 #SailfishBrowser
 - regex: 'SailfishBrowser(?:/(\d+[\.\d]+))?'
@@ -139,6 +145,11 @@
   version: '$1 ($2)'
   engine:
     default: 'Gecko'
+- regex: 'FxiOS/(\d+[\.\d]+)'
+  name: 'Firefox'
+  version: 'iOS $1'
+  engine:
+    default: 'WebKit'
 
 #ANTGalio
 - regex: 'ANTGalio(?:/(\d+[\.\d]+))?'

data/regexes/client/mediaplayers.yml

@@ -65,6 +65,14 @@
   name: 'XBMC'
   version: '$1'
 
+- regex: 'Kodi(?:/([\d\.]+))?'
+  name: 'Kodi'
+  version: '$1'
+
 - regex: 'stagefright(?:/([\d\.]+))?'
   name: 'Stagefright'
-  version: '$1'
+  version: '$1'
+
+- regex: 'Instacast\/([\d\.]+) CFNetwork\/([\d\.]+)'
+  name: 'Instacast'
+  version: '$1'

data/regexes/device/cameras.yml

@@ -13,9 +13,11 @@ Nikon:
 
 # Samsung
 Samsung:
-  regex: 'EK-GC[0-9]{3}'
+  regex: 'EK-G[CN][0-9]{3}'
   device: 'camera'
   models:
+    - regex: 'EK-GN120'
+      model: 'GALAXY NX'
     - regex: 'EK-GC100'
       model: 'GALAXY Camera'
     - regex: 'EK-GC110'

data/regexes/device/mobiles.yml

@@ -269,7 +269,7 @@ Apple:
       device: 'tablet'
     - regex: '(?:Apple-)?iPad5[C,][34]'
       model: 'iPad Air 2'
-
+      device: 'tablet'
 
     - regex: 'AppleTV'
       model: 'Apple TV'
@@ -300,7 +300,7 @@ MicroMax:
 
 # Acer
 Acer:
-  regex: 'acer|a(?:101|110|200|210|211|500|501|510|511|700|701) Build|Android.*V360 Build|A1-830|A1-81[01]|A3-A1[01]|B1-7[12][01]|B1-A71|S5[12]0'
+  regex: 'acer|a(?:101|110|200|210|211|500|501|510|511|700|701) Build|Android.*V3[67]0 Build|Android.*Z1[23456]0 Build|Android.*Z500 Build|A1-830|A1-81[01]|A3-A[12][01]|B1-7[1235][01]|B1-810|B1-A71|E39 Build|S5[12]0 Build'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -310,21 +310,30 @@ Acer:
     - regex: 'A1-830'
       model: 'Iconia A1'
       device: 'tablet'
-    - regex: 'A3-A1[01]'
+    - regex: 'A3-A[12][01]'
       model: 'Iconia A3'
       device: 'tablet'
-    - regex: 'B1-7[12][01]|B1-A71'
+    - regex: 'B1-7[1235][01]|B1-810|B1-A71'
       model: 'Iconia B1'
       device: 'tablet'
 
     # explicit smartphone models
+    - regex: 'E39 Build'
+      model: 'Liquid E700'
     - regex: 'Android.*V360 Build'
       model: 'Liquid E1'
+    - regex: 'Android.*V370 Build'
+      model: 'Liquid E2'
     - regex: 'S510 Build'
       model: 'Liquid S1'
     - regex: 'S520 Build'
       model: 'Liquid S2'
-
+    - regex: 'Android.*Z1([2345])0 Build'
+      model: 'Liquid Z$1'
+    - regex: 'Android.*Z160 Build'
+      model: 'Liquid Z4'
+    - regex: 'Android.*Z500 Build'
+      model: 'Liquid Z500'
     - regex: 'Acer; ?([^;\)]+)'
       model: '$1'
     - regex: 'Acer[ _\-]?([^;\)]+) Build'
@@ -364,9 +373,13 @@ Alcatel:
 
 # Amoi
 Amoi:
-  regex: 'Amoi'
+  regex: 'Amoi|A862W'
   device: 'smartphone'
   models:
+    # explicit smartphone models
+    - regex: 'A862W'
+      model: 'A862W'
+
     - regex: 'Amoi[\- /]([a-z0-9]+)'
       model: '$1'
     - regex: 'Amoisonic-([a-z0-9]+)'
@@ -407,12 +420,78 @@ MEU:
 
 # Arnova
 Arnova:
-  regex: 'arnova|AN[0-9]'
+  regex: 'arnova|ARCHM901|AN7CG2|AN7G2(DTE|I)?|AN7[BCDFH]?G3|A80KSC|AN8G2|AN8[BC]?G3|AN9G2I?|AN9G3|A101[BC]|AN10G2|AN10BG2(DT|I)?|AN10BG3(DT)?|AN10[CD]G3'
   device: 'tablet'
   models:
+    # explicit tablet models
+    - regex: 'ARCHM901'
+      model: 'M901'
+    - regex: 'AN7CG2'
+      model: '7c G2'
+    - regex: 'AN7G2I|AN7G2|AN7G2DTE'
+      model: '7 G2'
+    - regex: 'AN7G3'
+      model: '7 G3'
+    - regex: 'AN7BG3'
+      model: '7b G3'
+    - regex: 'AN7CG3'
+      model: '7c G3'
+    - regex: 'AN7DG3-CP'
+      model: 'Childpad'
+    - regex: 'AN7DG3'
+      model: '7d G3'
+    - regex: 'AN7FG3'
+      model: '7f G3'
+    - regex: 'AN7HG3'
+      model: '7h G3'
+    - regex: 'A80KSC'
+      model: '8'
+    - regex: 'AN8G2'
+      model: '8 G2'
+    - regex: 'AN8G3'
+      model: '8 G3'
+    - regex: 'AN8BG3'
+      model: '8b G3'
+    - regex: 'AN8CG3'
+      model: '8c G3'
+    - regex: 'AN9G2I'
+      model: '9i G2'
+    - regex: 'AN9G2'
+      model: '9 G2'
+    - regex: 'AN9G3'
+      model: '9 G3'
+    - regex: 'A101B2|A101C|AN10G2'
+      model: '10 G2'
+    - regex: 'A101B'
+      model: '10'
+    - regex: 'AN10BG2|AN10BG2DT|AN10BG2I'
+      model: '10b G2'
+    - regex: 'AN10BG3|AN10BG3DT|AN10BG3-LZ'
+      model: '10b G3'
+    - regex: 'AN10CG3'
+      model: '10c G3'
+    - regex: 'AN10DG3'
+      model: '10d G3'
+    - regex: 'ARNOVA 90G3'
+      model: '90 G3'
+    - regex: 'ARNOVA 90 G4'
+      model: '90 G4'
+    - regex: 'ARNOVA 97G4'
+      model: '97 G4'
+    - regex: 'ARNOVA 101 G4'
+      model: '101 G4'
+
     - regex: 'Arnova ([^/;]*) Build'
       model: '$1'
-    - regex: 'AN([0-9][a-z0-9]+)'
+
+# Garmin-Asus
+Garmin-Asus:
+  regex: 'Garmin-Asus'
+  device: 'smartphone'
+  models:
+    - regex: 'Garmin-Asus[ \-_]([^;/]+)Build'
+      model: '$1'
+    - regex: 'Garmin-Asus[ \-_]([^;/]+)[\)/]'
       model: '$1'
 
 # Asus
@@ -439,6 +518,9 @@ Asus:
     - regex: 'K01[3A] Build'
       model: 'MeMO Pad 7'
       device: 'tablet'
+    - regex: 'K01E Build'
+      model: 'MeMO Pad 10 ME103K'
+      device: 'tablet'
     - regex: 'K00U|ME173X Build'
       model: 'MeMO Pad HD 7'
       device: 'tablet'
@@ -546,8 +628,8 @@ Blu:
   device: 'smartphone'
   model: '$1'
 
-#BBK
-BBK:
+# Vivo
+Vivo:
   regex: 'vivo'
   device: 'smartphone'
   models:
@@ -818,6 +900,12 @@ ECS:
     - regex: 'TM105 Build'
       model: 'TM105'
 
+# Elephone
+Elephone:
+  regex: 'Elephone[ _\-]([^/;]+) Build'
+  device: 'smartphone'
+  model: '$1'
+
 # Ericy
 Ericy:
   regex: 'Ericy-([a-z0-9]+)'
@@ -1122,9 +1210,14 @@ eTouch:
 
 # Storex
 Storex:
-  regex: "eZee[^a-z]*Tab ?([^;/]*) Build"
+  regex: "eZee[^a-z]*Tab ?([^;/]*) Build|STOREX LinkBox"
   device: 'tablet'
-  model: "eZee'Tab$1"
+  models:
+    - regex: "eZee[^a-z]*Tab ?([^;/]*) Build"
+      model: "eZee'Tab$1"
+    - regex: 'STOREX LinkBox'
+      model: 'LinkBox'
+      device: 'tv'
 
 # Evertek
 Evertek:
@@ -1271,7 +1364,7 @@ Haier:
 
 # Hisense
 Hisense:
-  regex: 'HS-(?:U|EG?)[0-9]+[a-z0-9\-]*|E270BSA|M470BS[AE]|E2281'
+  regex: '(?:HS-)?Hisense ([^;/]+) Build|HS-(?:U|EG?)[0-9]+[a-z0-9\-]*|E270BSA|M470BS[AE]|E2281'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -1287,6 +1380,14 @@ Hisense:
 
     - regex: '(HS-(?:U|EG?)[0-9]+[a-z0-9\-]*)'
       model: '$1'
+    - regex: '(?:HS-)?Hisense ([^;/]+) Build'
+      model: '$1'
+
+# Hi-Level
+Hi-Level:
+  regex: 'HLV-T([a-z0-9]+)'
+  device: 'tablet'
+  model: 'HLV-T$1'
 
 # Huawei
 Huawei:
@@ -1539,12 +1640,21 @@ Lenco:
 
 # lenovo
 Lenovo:
-  regex: '(?:LNV-)?Lenovo|IdeaTab'
+  regex: '(?:LNV-)?Lenovo|IdeaTab|IdeaPad|Thinkpad|Yoga Tablet'
   device: 'smartphone'
   models:
     - regex: 'Lenovo (B[0-9]+[^/;]*) Build'
       model: 'IdeaTab $1'
       device: 'tablet'
+    - regex: 'ThinkPadTablet_(A[0-9]{3})_'
+      model: 'ThinkPad Tablet $1'
+      device: 'tablet'
+    - regex: 'ThinkPad ?Tablet([^;/]*) Build'
+      model: 'ThinkPad Tablet$1'
+      device: 'tablet'
+    - regex: 'IdeaPad ?([^;/]*) Build'
+      model: 'IdeaPad $1'
+      device: 'tablet'
     - regex: 'Lenovo ([^/;]*) Build'
       model: '$1'
     - regex: '(?:LNV-|Lenovo-)?Lenovo[ \-_]([a-z0-9_+\-]+)'
@@ -1552,6 +1662,9 @@ Lenovo:
     - regex: 'IdeaTab[ \-_]?([a-z0-9]+)'
       model: 'IdeaTab $1'
       device: 'tablet'
+    - regex: 'Yoga Tablet([^;/]+) Build'
+      model: 'Yoga Tablet$1'
+      device: 'tablet'
 
 # lexibook
 Lexibook:
@@ -1739,6 +1852,23 @@ Medion:
     - regex: 'Medion(?: Smartphone)? ([^/;]+) Build'
       model: '$1'
 
+# Meizu
+Meizu:
+  regex: '(M04[05]|M35[1356]|MX[ -]?[234](?: Pro)?|m1 note) Build'
+  device: 'smartphone'
+  models:
+    - regex: 'm1 note Build'
+      device: 'phablet'
+      model: 'M1 Note'
+    - regex: '(M04[05]|MX[ -]?2) Build'
+      model: 'MX2'
+    - regex: '(M35[1356]|MX[ -]?3) Build'
+      model: 'MX3'
+    - regex: 'MX[ -]?4 Build'
+      model: 'MX4'
+    - regex: 'MX[ -]?4 Pro Build'
+      model: 'MX4 Pro'
+
 # Memup
 Memup:
   regex: 'SlidePad ?([^;/]*) Build'
@@ -1889,12 +2019,23 @@ MyPhone:
     - regex: 'MyPhone (.+) Build'
       model: '$1'
 
+# M.T.T.
+M.T.T.:
+  regex: 'M.T.T.'
+  device: 'smartphone'
+  models:
+    - regex: 'M.T.T. ?Tablet([^;/]+)? Build'
+      device: 'tablet'
+      model: 'Tablet$1'
+    - regex: 'M.T.T. ?([^;/]+) Build'
+      model: '$1'
+
 # nec
 NEC:
-  regex: 'NEC|KGT/2\.0|portalmmm/1\.0 (?:DB|N)|(?:portalmmm|o2imode)/2.0[ ,]N'
+  regex: 'NEC[ _\-]|KGT/2\.0|portalmmm/1\.0 (?:DB|N)|(?:portalmmm|o2imode)/2.0[ ,]N'
   device: 'smartphone'
   models:
-    - regex: '(?:NEC-|KGT/2\.0 )([a-z0-9]+)'
+    - regex: '(?:NEC[ _\-]|KGT/2\.0 )([a-z0-9]+)'
       model: '$1'
     - regex: 'portalmmm/1\.0 ((?:DB|N)[a-z0-9]+)'
       model: '$1'
@@ -1909,13 +2050,15 @@ Newgen:
 
 # ngm
 NGM:
-  regex: 'NGM_[a-z0-9]+|(Forward|Dynamic)[ _][^/;]+(?:Build|/)'
+  regex: 'NGM[_ ][a-z0-9]+|(Forward|Dynamic)[ _][^/;]+(?:Build|/)'
   device: 'smartphone'
   models:
     - regex: '((?:Forward|Dynamic)[ _][^/;]+) Build'
       model: '$1'
     - regex: '((?:Forward|Dynamic)[ _][^/;]+)/'
       model: '$1'
+    - regex: 'NGM ([^;/]+) Build'
+      model: '$1'
     - regex: 'NGM_([a-z0-9]+)'
       model: '$1'
 
@@ -2051,6 +2194,11 @@ Samsung:
   regex: 'SAMSUNG|SC-(?:02C|04E|01F)|N7100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|SMART-TV|GT-|Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]'
   device: 'smartphone'
   models:
+    # explicit tv models
+    - regex: 'GT-B9150'
+      device: 'tv'
+      model: 'Home Sync'
+
     # explicit tablet models
     - regex: '(?:SAMSUNG-)?GT-N5100'
       device: 'tablet'
@@ -2192,11 +2340,59 @@ Samsung:
       model: 'GALAXY TabPRO 12.2" WiFi'
 
     # explicit smartphone models
+    - regex: '(?:SAMSUNG-)?GT-B5330'
+      model: 'GALAXY Chat'
+    - regex: '(?:SAMSUNG-)?GT-B5510'
+      model: 'GALAXY Y Pro'
+    - regex: '(?:SAMSUNG-)?GT-B5512'
+      model: 'GALAXY Y Pro Duos'
+    - regex: '(?:SAMSUNG-)?GT-B7510'
+      model: 'GALAXY Pro'
+    - regex: '(?:SAMSUNG-)?GT-I5700'
+      model: 'GALAXY Spica'
+    - regex: '(?:SAMSUNG-)?GT-I5801'
+      model: 'GALAXY Apollo'
+    - regex: '(?:SAMSUNG-)?GT-I5800'
+      model: 'GALAXY 3'
+    - regex: '(?:SAMSUNG-)?GT-I8000'
+      model: 'Omnia II'
+    - regex: '(?:SAMSUNG-)?GT-I8150'
+      model: 'GALAXY W'
+    - regex: '(?:SAMSUNG-)?GT-I8160'
+      model: 'GALAXY Ace 2'
     - regex: '(?:SAMSUNG-)?GT-I8190'
       model: 'GALAXY S III mini'
+    - regex: '(?:SAMSUNG-)?GT-I8200'
+      model: 'GALAXY S III mini Value Edition'
+    - regex: '(?:SAMSUNG-)?GT-I826[02]'
+      model: 'GALAXY Core'
+    - regex: '(?:SAMSUNG-)?GT-I8320'
+      model: 'H1'
+    - regex: '(?:SAMSUNG-)?GT-I85[23]0'
+      model: 'GALAXY Beam'
+    - regex: '(?:SAMSUNG-)?GT-I855[028]'
+      model: 'GALAXY Win'
+    - regex: '(?:SAMSUNG-)?GT-I8580'
+      model: 'GALAXY Core Advance'
+    - regex: '(?:SAMSUNG-)?GT-I8730'
+      model: 'GALAXY Express'
+    - regex: '(?:SAMSUNG-)?GT-I90(?:00|08|18|88)'
+      model: 'GALAXY S'
+    - regex: '(?:SAMSUNG-)?GT-I9001'
+      model: 'GALAXY S Plus'
+    - regex: '(?:SAMSUNG-)?GT-I9003'
+      model: 'GALAXY SL'
+    - regex: '(?:SAMSUNG-)?GT-I9010'
+      model: 'GALAXY S Giorgio Armani'
+    - regex: '(?:SAMSUNG-)?GT-I9070'
+      model: 'GALAXY S Advance'
+    - regex: '(?:SAMSUNG-)?GT-I910[08]'
+      model: 'GALAXY S II'
+    - regex: '(?:SAMSUNG-)?GT-I9103'
+      model: 'GALAXY R'
     - regex: '(?:SAMSUNG-)?GT-I9105'
       model: 'GALAXY S II Plus'
-    - regex: '(?:SAMSUNG-)?(?:GT-I9195|SCH-I435)'
+    - regex: '(?:SAMSUNG-)?(?:GT-I919[05]|SCH-I435)'
       model: 'GALAXY S4 mini'
     - regex: '(?:SAMSUNG-)?GT-I9295'
       model: 'GALAXY S4 ACTIVE'
@@ -2250,8 +2446,6 @@ Samsung:
       model: 'GALAXY CORE LTE'
     - regex: '(?:SAMSUNG-)?SM-G3815'
       model: 'GALAXY EXPRESS II'
-    - regex: '(?:SAMSUNG-)?SM-G7105'
-      model: 'GALAXY Grand 2'
     - regex: '(?:SAMSUNG-)?SM-G800'
       model: 'GALAXY S5 mini'
     - regex: '(?:SAMSUNG-)?SM-G9009D'
@@ -2268,12 +2462,30 @@ Samsung:
       model: 'GALAXY Centura'
 
     # explicit phablet models
+    - regex: '(?:SAMSUNG-)?GT-I9060'
+      model: 'GALAXY Grand Neo'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG-)?GT-I9063'
+      model: 'GALAXY Grand Neo Duos'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG-)?GT-I9(?:080|128)'
+      model: 'GALAXY Grand'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG-)?GT-I9168'
+      model: 'GALAXY Grand Neo+'
+      device: 'phablet'
+    - regex: '(?:SAMSUNG-)?GT-I9082'
+      model: 'GALAXY Grand Duos'
+      device: 'phablet'
     - regex: '(?:SAMSUNG-)?(?:(?:GT-)?N7100|SCH-I605|SCH-N719|SCH-R950|SPH-L900)'
       model: 'GALAXY Note II'
       device: 'phablet'
     - regex: '(?:SAMSUNG-)?GT-N7105'
       model: 'GALAXY Note II LTE'
       device: 'phablet'
+    - regex: '(?:SAMSUNG-)?SM-G7105'
+      model: 'GALAXY Grand 2'
+      device: 'phablet'
     - regex: '(?:SAMSUNG-)?SM-N7502'
       model: 'GALAXY Note 3 Neo Duos'
       device: 'phablet'
@@ -2523,6 +2735,20 @@ Sendo:
   device: 'feature phone'
   model: '$1'
 
+# Turbo-X
+Turbo-X:
+  regex: 'Turbo-X'
+  device: 'smartphone'
+  models:
+    - regex: 'Turbo-X Ice Build'
+      device: 'tablet'
+      model: 'Ice'
+    - regex: 'Turbo-X Tablet([^;/]+) Build'
+      device: 'tablet'
+      model: 'Tablet$1'
+    - regex: 'Turbo-X ([^;/]+) Build'
+      model: '$1'
+
 # Spice
 Spice:
   regex: 'Spice'
@@ -2685,6 +2911,13 @@ TVC:
   device: 'smartphone'
   model: 'Nuclear SX-SP5'
 
+# Unowhy
+Unowhy:
+  regex: 'QOOQ '
+  device: 'tablet'
+  model: 'QOOQ'
+
+
 # UTStarcom
 UTStarcom:
   regex: 'utstar[ _-]?([a-z0-9]+)'
@@ -2693,10 +2926,10 @@ UTStarcom:
 
 # ViewSonic
 ViewSonic:
-  regex: 'ViewSonic|VSD[0-9]+ Build'
+  regex: 'ViewSonic|VSD[0-9]+ Build|ViewPad'
   device: 'smart display'
   models:
-    - regex: 'ViewSonic-ViewPad([a-z0-9]+) Build'
+    - regex: '(?:ViewSonic-)?ViewPad ?([^;/]+) Build'
       model: 'ViewPad $1'
       device: 'tablet'
     - regex: '(VSD[0-9]+) Build'
@@ -2746,37 +2979,55 @@ WellcoM:
 
 # Wiko
 Wiko:
-  regex: '(?:Wiko-)?(?:CINK|IGGY|Stairway|Rainbow|Highway|Darkside|Darkmoon|Darkfull|Darknight|Sublim|Ozzy|Barry)'
+  regex: '(?:WIKO-)?CINK_[a-z0-9_]+|(?:WIKO-)?HIGHWAY_[a-z0-9_]+|(?:WIKO-)?(?:Cink.*|Highway.*|Iggy|Stairway|Rainbow|Darkside|Darkmoon|Darkfull|Darknight|Sublim|Ozzy|Barry|Birdy|Bloom|Getaway|Goa|Kite|Lenny|Slide|Sunset|Wax) Build'
   device: 'smartphone'
   models:
-    - regex: '(?:Wiko-)?CINK(.*) Build'
-      model: 'Cink$1'
-    - regex: '(?:Wiko-)?CINK[ _\-]([a-z0-9]+)'
+    - regex: '(?:WIKO-)?CINK_([a-z0-9_]+)'
       model: 'Cink $1'
-    - regex: '(?:Wiko-)?IGGY(.*) Build'
-      model: 'Iggy$1'
-    - regex: '(?:Wiko-)?IGGY[ _\-]([a-z0-9]+)'
-      model: 'Iggy $1'
-    - regex: 'Stairway'
+    - regex: '(?:Wiko-)?Cink(.*) Build'
+      model: 'Cink$1'
+    - regex: '(?:WIKO-)?HIGHWAY_([a-z0-9_]+)'
+      model: 'Highway $1'
+    - regex: '(?:Wiko-)?Highway(.*) Build'
+      model: 'Highway$1'
+    - regex: '(?:WIKO-)?Iggy Build'
+      model: 'Iggy'
+    - regex: '(?:WIKO-)?Stairway Build'
       model: 'Stairway'
-    - regex: 'Highway'
-      model: 'Highway'
-    - regex: 'Rainbow'
+    - regex: '(?:WIKO-)?Rainbow Build'
       model: 'Rainbow'
-    - regex: 'Darkside'
+    - regex: '(?:WIKO-)?Darkside Build'
       model: 'Darkside'
-    - regex: 'Darkmoon'
+    - regex: '(?:WIKO-)?Darkmoon Build'
       model: 'Darkmoon'
-    - regex: 'Darkfull'
+    - regex: '(?:WIKO-)?Darkfull Build'
       model: 'Darkfull'
-    - regex: 'Darknight'
+    - regex: '(?:WIKO-)?Darknight Build'
       model: 'Darknight'
-    - regex: 'Sublim'
+    - regex: '(?:WIKO-)?Sublim Build'
       model: 'Sublim'
-    - regex: 'Ozzy'
+    - regex: '(?:WIKO-)?Ozzy Build'
       model: 'Ozzy'
-    - regex: 'Barry'
+    - regex: '(?:WIKO-)?Barry Build'
       model: 'Barry'
+    - regex: '(?:WIKO-)?Birdy Build'
+      model: 'Birdy'
+    - regex: '(?:WIKO-)?Bloom Build'
+      model: 'Bloom'
+    - regex: '(?:WIKO-)?Getaway Build'
+      model: 'Getaway'
+    - regex: '(?:WIKO-)?Goa Build'
+      model: 'Goa'
+    - regex: '(?:WIKO-)?Kite Build'
+      model: 'Kite'
+    - regex: '(?:WIKO-)?Lenny Build'
+      model: 'Lenny'
+    - regex: '(?:WIKO-)?Slide Build'
+      model: 'Slide'
+    - regex: '(?:WIKO-)?Sunset Build'
+      model: 'Sunset'
+    - regex: '(?:WIKO-)?Wax Build'
+      model: 'Wax'
 
 # Wolder
 Wolder:
@@ -2814,12 +3065,65 @@ Xiaomi:
     - regex: 'HM ([^/;]+) Build'
       model: 'HM $1'
 
-#Yuandao
+# Yarvik
+Yarvik:
+  regex: 'Xenta[ \-]Tab|Luna TAB|TAB09-410|TAB10-410|TAB07-485|TAB0[78]-200|TAB08-201-3G|TAB9-200|TAB09-211|TAB10-2[01]1|TAB13-201'
+  device: 'tablet'
+  models:
+    # explicit tablet models
+    - regex: 'Luna TAB07-920N'
+      model: 'Luna 7'
+    - regex: 'Luna TAB07-10[01]'
+      model: 'Luna 7c'
+    - regex: 'Luna TAB274'
+      model: 'Luna 7c'
+    - regex: 'Luna TAB474'
+      model: 'Luna 10'
+    - regex: 'Luna TAB10-150'
+      model: 'Luna 10c'
+    - regex: 'TAB09-410'
+      model: 'Noble 9.7'
+    - regex: 'TAB10-410'
+      model: 'Noble 10.1'
+    - regex: 'TAB07-485'
+      model: 'Noble Mini'
+    - regex: 'Xenta-TAB07-21[01]'
+      model: 'Xenta 7c'
+    - regex: 'TAB07-200'
+      model: 'Xenta 7ic'
+    - regex: 'TAB08-200'
+      model: 'Xenta 8ic'
+    - regex: 'TAB08-201-3G'
+      model: 'Xenta 8c'
+    - regex: 'TAB9-200'
+      model: 'Xenta 9.7ic'
+    - regex: 'TAB09-211'
+      model: 'Xenta 9.7ic+'
+    - regex: 'TAB10-2[01]1'
+      model: 'Xenta 10ic'
+    - regex: 'TAB13-201'
+      model: 'Xenta 13c'
+
+# Yuandao
 Yuandao:
   regex: 'N101[ _]DUAL(?:[ _]CORE)?(?:[ _]?2|\|\|)?(?:[ _]V11)? Build'
   device: 'tablet'
   model: 'N101'
 
+# Yusun
+Yusun:
+  regex: 'Yusun|LA2-T'
+  device: 'smartphone'
+  models:
+    # explicit smartphone models
+    - regex: 'LA2-T'
+      model: 'LA2-T'
+
+    - regex: 'Yusun ([^;/]+) Build'
+      model: '$1'
+    - regex: 'Yusun ([a-z0-9_\-\+]+)'
+      model: '$1'
+
 # Zonda
 Zonda:
   regex: '(ZM(?:CK|EM|TFTV|TN)[a-z0-9]+)'
@@ -2828,9 +3132,35 @@ Zonda:
 
 # Toshiba
 Toshiba:
-  regex: 'Toshiba|portalmmm/[12].0 TS'
+  regex: 'Toshiba|portalmmm/[12].0 TS|T-01C|T-0[12]D|IS04|IS11T|AT1S0|AT300SE|AT(100|200|270|300|330|374|400|470|500|503|570|703|830)'
   device: 'smartphone'
   models:
+    # explicit smartphone models
+    - regex: 'T-01C'
+      model: 'Regza T-01C'
+    - regex: 'T-01D'
+      model: 'Regza T-01D'
+    - regex: 'T-02D'
+      model: 'Regza T-02D'
+    - regex: 'IS04'
+      model: 'Regza IS04'
+    - regex: 'IS11T'
+      model: 'Regza IS11T'
+
+    # explicit tablet models
+    - regex: 'AT1S0'
+      model: 'Regza AT1S0'
+      device: 'tablet'
+    - regex: 'AT300SE'
+      model: 'Regza AT300SE'
+      device: 'tablet'
+    - regex: 'AT500a'
+      model: 'Regza AT500a'
+      device: 'tablet'
+    - regex: 'AT(100|200|270|300|330|374|400|470|500|503|570|703|830)'
+      model: 'Regza AT$1'
+      device: 'tablet'
+
     - regex: 'Toshiba[ /_\-]?([a-z0-9_ \-]+) Build'
       model: '$1'
     - regex: 'Toshiba[ /_\-]?([a-z0-9_\-]+)'
@@ -2871,7 +3201,7 @@ ZTE:
   regex: 'ZTE|Z331|N799D|([a-z0-9]+)_USA_Cricket'
   device: 'smartphone'
   models:
-    # Explicit smartphone models
+    # explicit smartphone models
     - regex: 'N799D'
       model: 'MTS Blaze 4'