device_detector 1.0.0 → 1.0.1

data/regexes/device/portable_media_player.yml

@@ -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'
 

data/regexes/device/televisions.yml

@@ -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

data/regexes/oss.yml

@@ -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,12 @@
   name: 'Windows RT'
   version: '8.1'
 
+##########
+# Windows IoT
+##########
+- regex: 'Windows IoT 10.0'
+  name: 'Windows IoT'
+  version: '10'
 
 ##########
 # Custom Android Roms
@@ -89,6 +95,10 @@
 - regex: 'Android|Silk-Accelerated=[a-z]{4,5}'
   name: 'Android'
   version: ''
+
+- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe'
+  name: 'Android'
+  version: ''
   
   
 ##########
@@ -124,7 +134,7 @@
 ##########
 - regex: 'Maemo'
   name: 'Maemo'
-  version: '$1'
+  version: ''
 
 - regex: 'Arch ?Linux(?:[ /\-](\d+[\.\d]+))?'
   name: 'Arch Linux'
@@ -345,6 +355,13 @@
   name: 'iOS'
   version: '$1'
 
+- regex: 'Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|Overcast|Castro|Podcat|i[cC]atcher'
+  name: 'iOS'
+  version: ''
+
+- regex: 'iTunes-(iPod|iPad|iPhone)/(?:[\d\.]+)'
+  name: 'iOS'
+  version: ''
 
 
 ##########
@@ -399,7 +416,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 +425,7 @@
 ##########
 # ChromeOS
 ##########
-- regex: 'CrOS [a-z0-9_]+ (\d+[\.\d]+)'
+- regex: 'CrOS [a-z0-9_]+ .* Chrome/(\d+[\.\d]+)'
   name: 'Chrome OS'
   version: '$1'
   
@@ -435,6 +452,10 @@
 - regex: 'BlackBerry'
   name: 'BlackBerry OS'
   version: ''
+  
+- regex: 'bPod'
+  name: 'BlackBerry OS'
+  version: ''
 
 
 ##########

data/spec/device_detector/detector_fixtures_spec.rb

@@ -15,6 +15,11 @@ describe DeviceDetector do
         fail "Failed to parse #{fixture_file}, reason: #{e}"
       end
 
+      def str_or_nil(string)
+        return nil if string == ''
+        string
+      end
+
       fixtures.each do |f|
 
         user_agent = f["user_agent"]
@@ -24,29 +29,64 @@ describe DeviceDetector do
         describe user_agent do
           it "should be detected" do
             if detector.bot?
-              assert_equal f["bot"]["name"], detector.bot_name, "failed bot name detection"
+              assert_equal str_or_nil(f["bot"]["name"]), detector.bot_name, "failed bot name detection"
             else
               if f["client"]
-                assert_equal f["client"]["name"], detector.name, "failed client name detection"
+                assert_equal str_or_nil(f["client"]["name"]), detector.name, "failed client name detection"
               end
-              if f["os_family"] != "Unknown"
-                assert_equal f["os_family"], os.family, "failed os family detection"
-                assert_equal f["os"]["name"], os.name, "failed os name detection"
-                assert_equal f["os"]["short_name"], os.short_name, "failed os short name detection"
-                assert_equal f["os"]["version"], os.full_version, "failed os version detection"
+
+              os_family = str_or_nil(f["os_family"])
+              if os_family != "Unknown"
+                if os_family.nil?
+                  assert_nil os.family, "failed os family detection"
+                else
+                  assert_equal os_family, os.family, "failed os family detection"
+                end
+
+                name = str_or_nil(f["os"]["name"])
+                if name.nil?
+                  assert_nil os.name, "failed os name detection"
+                else
+                  assert_equal name, os.name, "failed os name detection"
+                end
+
+                short_name = str_or_nil(f["os"]["short_name"])
+                if short_name.nil?
+                  assert_nil os.short_name, "failed os short name detection"
+                else
+                  assert_equal short_name, os.short_name, "failed os short name detection"
+                end
+
+                os_version = str_or_nil(f["os"]["version"])
+                if os_version.nil?
+                  assert_nil os.full_version, "failed os version detection"
+                else
+                  assert_equal os_version, os.full_version, "failed os version detection"
+                end
               end
               if f["device"]
-                expected_type = f["device"]["type"]
+                expected_type = str_or_nil(f["device"]["type"])
                 actual_type = detector.device_type
+
                 if expected_type != actual_type
                   # puts "\n", f.inspect, expected_type, actual_type, detector.device_name, regex_meta.inspect
                   # debugger
                   # detector.device_type
                 end
-                assert_equal expected_type, actual_type, "failed device type detection"
-                model = f["device"]["model"]
+                if expected_type.nil?
+                  assert_nil actual_type, "failed device type detection"
+                else
+                  assert_equal expected_type, actual_type, "failed device type detection"
+                end
+
+                model = str_or_nil(f["device"]["model"])
                 model = model.to_s unless model.nil?
-                assert_equal model, detector.device_name, "failed device name detection"
+
+                if model.nil?
+                  assert_nil detector.device_name, "failed device name detection"
+                else
+                  assert_equal model, detector.device_name, "failed device name detection"
+                end
               end
             end
           end

data/spec/device_detector_spec.rb

@@ -70,6 +70,26 @@ describe DeviceDetector do
 
     end
 
+    describe 'firefox mobile phone' do
+
+      let(:user_agent) {'Mozilla/5.0 (Android 7.0; Mobile; rv:53.0) Gecko/53.0 Firefox/53.0'}
+
+      it 'detects smartphone' do
+        client.device_type.must_equal 'smartphone'
+      end
+
+    end
+
+    describe 'firefox mobile tablet' do
+
+      let(:user_agent) {'Mozilla/5.0 (Android 6.0.1; Tablet; rv:47.0) Gecko/47.0 Firefox/47.0'}
+
+      it 'detects tablet' do
+        client.device_type.must_equal 'tablet'
+      end
+
+    end
+
   end
 
   describe 'unknown user agent' do

data/spec/fixtures/client/browser.yml

@@ -7,6 +7,7 @@
     short_name: "36"
     version: "6.8.7"
     engine: WebKit
+    engine_version: "534.30"
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.152 Safari/537.36 QIHU 360SE
   client:
@@ -15,6 +16,7 @@
     short_name: 3B
     version:
     engine: WebKit
+    engine_version: "537.36"
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.152 Safari/537.36 QIHU 360EE
   client:
@@ -23,6 +25,7 @@
     short_name: 3B
     version:
     engine: WebKit
+    engine_version: "537.36"
 -
   user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Avant Browser; InfoPath.1)
   client:
@@ -31,6 +34,7 @@
     short_name: AA
     version:
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (compatible; U; ABrowse 0.6; Syllable) AppleWebKit/420+ (KHTML, like Gecko)
   client:
@@ -39,6 +43,7 @@
     short_name: AB
     version: "0.6"
     engine: WebKit
+    engine_version: "420"
 -
   user_agent: Mozilla/3.04 (compatible; NCBrowser/2.35; ANTFresco/2.17; RISC OS-NC 5.13 Laz1UK1309)
   client:
@@ -47,6 +52,7 @@
     short_name: AF
     version: "2.17"
     engine:
+    engine_version:
 -
   user_agent: HbbTV/1.1.1 (+PVR;Humax;HD FOX+;1.00.12;1.0)CE-HTML/1.0 ANTGalio/3.1.1.23.04.09
   client:
@@ -55,6 +61,7 @@
     short_name: AG
     version: "3.1.1.23.04.09"
     engine:
+    engine_version:
 -
   user_agent: amaya/9.51 libwww/5.4.0
   client:
@@ -63,6 +70,7 @@
     short_name: AM
     version: "9.51"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.74 Safari/537.36 MRCHROME
   client:
@@ -71,6 +79,7 @@
     short_name: AO
     version: "28.0.1500.74"
     engine: Blink
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Linux; U; Android 0.5; en-us) AppleWebKit/522+ (KHTML, like Gecko) Safari/419.3
   client:
@@ -79,6 +88,7 @@
     short_name: AN
     version:
     engine: WebKit
+    engine_version: "522"
 -
   user_agent: Mozilla/5.0 (Linux; U; Android 2.3.5; ru-ru; IQ270 Firebird Build/GRJ22; LeWa_IQ270_ROM_12.12.14) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
   client:
@@ -87,6 +97,7 @@
     short_name: AN
     version:
     engine: WebKit
+    engine_version: "533.1"
 -
   user_agent: 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US) AppleWebKit/532.1 (KHTML, like Gecko) Arora/0.10.1 (Git: 1329 e5385f3) Safari/532.1'
   client:
@@ -95,6 +106,7 @@
     short_name: AR
     version: "0.10.1"
     engine: WebKit
+    engine_version: "532.1"
 -
   user_agent: AmigaVoyager/3.2 (AmigaOS/MC680x0)
   client:
@@ -103,6 +115,7 @@
     short_name: AV
     version: "3.2"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/6.0 (Macintosh; U; Amiga-AWeb) Safari 3.1
   client:
@@ -111,6 +124,7 @@
     short_name: AW
     version:
     engine:
+    engine_version:
 -
   user_agent: AtomicBrowser/7.0.1 CFNetwork/672.1.15 Darwin/14.0.0
   client:
@@ -119,6 +133,7 @@
     short_name: AT
     version: "7.0.1"
     engine:
+    engine_version:
 -
   user_agent: BlackBerry8520/5.0.0.681 Profile/MIDP-2.1 Configuration/CLDC-1.1 VendorID/134
   client:
@@ -127,6 +142,7 @@
     short_name: BB
     version:
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; zh-cn; Coolpad 5950 Build/JZO54K) AppleWebKit/534.24 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.24 T5/2.0 baidubrowser/4.5.20.0 (Baidu; P1 4.1.2)
   client:
@@ -135,6 +151,7 @@
     short_name: BD
     version: "4.5.20.0"
     engine: WebKit
+    engine_version: "534.24"
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.4.9999.1900 Safari/537.31 BDSpark/26.4
   client:
@@ -143,6 +160,7 @@
     short_name: BS
     version: "26.4"
     engine: WebKit
+    engine_version: "537.31"
 -
   user_agent: Mozilla/5.0 (Windows; U; Win9x; en; Stable) Gecko/20020911 Beonex/0.8.1-stable
   client:
@@ -151,6 +169,7 @@
     short_name: BE
     version: "0.8.1"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Bunjalloo/0.7.6(Nintendo DS;U;en)
   client:
@@ -159,6 +178,16 @@
     short_name: BJ
     version: "0.7.6"
     engine:
+    engine_version:
+-
+  user_agent: BriskBard/1.0 (Windows 10) BriskBard/1.0
+  client:
+    type: browser
+    name: BriskBard
+    short_name: BK
+    version: 1.0
+    engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/537.36 (KHTML, like Gecko) brave/0.7.9 Chrome/47.0.2526.73 Electron/0.36.2 Safari/537.36
   client:
@@ -167,6 +196,7 @@
     short_name: BR
     version: "0.7.9"
     engine: Blink
+    engine_version:
 -
   user_agent: 'Mozilla/4.61 [en] (X11; U; ) - BrowseX (2.0.0 Windows)'
   client:
@@ -175,6 +205,7 @@
     short_name: BX
     version: "2.0.0"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en; rv:1.9.2.28) Gecko/20120308 Camino/2.1.2 (like Firefox/3.6.28)
   client:
@@ -183,6 +214,7 @@
     short_name: CA
     version: "2.1.2"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) coc_coc_browser/45.0 Chrome/39.0.2171.74 Safari/537.36
   client:
@@ -191,6 +223,7 @@
     short_name: CC
     version: "45.0"
     engine: Blink
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.11 (KHTML, like Gecko) Comodo_Dragon/17.1.0.0 Chrome/17.0.963.38 Safari/535.11
   client:
@@ -199,6 +232,7 @@
     short_name: CD
     version: "17.1.0.0"
     engine: WebKit
+    engine_version: "535.11"
 -
   user_agent: Mozilla/4.08 (Charon; Inferno)
   client:
@@ -207,6 +241,7 @@
     short_name: CX
     version:
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; chromeframe/19.0.1084.52)
   client:
@@ -215,6 +250,7 @@
     short_name: CF
     version: "19.0.1084.52"
     engine: WebKit
+    engine_version:
 -
   user_agent: Mozilla/5.0 ArchLinux (X11; U; Linux x86_64; en-US) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30
   client:
@@ -223,6 +259,16 @@
     short_name: CH
     version: "12.0.742.100"
     engine: WebKit
+    engine_version: "534.30"
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.0.0; Pixel Build/OPR3.170623.008) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.98 Mobile Safari/537.36
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "61.0.3163.98"
+    engine: Blink
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.125 Safari/537.36
   client:
@@ -231,6 +277,7 @@
     short_name: CH
     version: "36.0.1985.125"
     engine: Blink
+    engine_version:
 -
   user_agent: Mozilla/5.0 (iPad; CPU OS 6_0_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) CriOS/31.0.1650.18 Mobile/10A523 Safari/8536.25
   client:
@@ -239,6 +286,7 @@
     short_name: CI
     version: "31.0.1650.18"
     engine: WebKit
+    engine_version: "536.26"
 -
   user_agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131030 conkeror/1.0pre (Debian-1.0~~pre+git131116-1)
   client:
@@ -247,6 +295,7 @@
     short_name: CK
     version: "1.0"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (Linux; Android 4.1.1; ALCATEL ONE TOUCH 6033X Build/JRO03C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36
   client:
@@ -255,6 +304,7 @@
     short_name: CM
     version: "31.0.1650.59"
     engine: Blink
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.7 (KHTML, like Gecko) Chrome/16.0.912.63 Safari/535.7 CoolNovo/1.6.5.28
   client:
@@ -263,6 +313,7 @@
     short_name: CN
     version: "1.6.5.28"
     engine: WebKit
+    engine_version: "535.7"
 -
   user_agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:11.0) Gecko/20100101 Firefox/11.0 CometBird/11.0
   client:
@@ -271,6 +322,7 @@
     short_name: CO
     version: "11.0"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/534.13 (KHTML, like Gecko) Chrome/9.0.597.98 Safari/534.13 ChromePlus/1.6.0.0
   client:
@@ -279,6 +331,7 @@
     short_name: CP
     version: "1.6.0.0"
     engine: WebKit
+    engine_version: "534.13"
 -
   user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/31.0.1650.63 Chrome/31.0.1650.63 Safari/537.36
   client:
@@ -287,6 +340,7 @@
     short_name: CR
     version: "31.0.1650.63"
     engine: Blink
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.9 (KHTML, like Gecko, Safari) Safari/419.3 Cheshire/1.0.ALPHA
   client:
@@ -295,6 +349,43 @@
     short_name: CS
     version: "1.0"
     engine: WebKit
+    engine_version: "418.9"
+-
+  user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 7_1 like Mac OS X) AppleWebKit/537.51.2 (KHTML, like Gecko) Mobile/11D167 bline/7 (iPhone OS 7.1, iPhone)
+  client:
+    type: browser
+    name: B-Line
+    short_name: BL
+    version:
+    engine: WebKit
+    engine_version: "537.51.2"
+-
+  user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_2 like Mac OS X) AppleWebKit/601.1.46  (KHTML, like Gecko) Mobile/13F69 bline/1.04 (iPhone OS 9.3.2, iPhone)
+  client:
+    type: browser
+    name: B-Line
+    short_name: BL
+    version: "1.04"
+    engine: WebKit
+    engine_version: "601.1.46"
+-
+  user_agent: Mozilla/5.0 (iPhone; CPU ,iPhone OS 7_0_6 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/dbrowser Safari/8536.25
+  client:
+    type: browser
+    name: dbrowser
+    short_name: DB
+    version:
+    engine: WebKit
+    engine_version: "536.26"
+-
+  user_agent: Mozilla/5.0 (iPod touch; CPU ,iPod touch OS 7_1_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/dbrowser Safari/8536.25
+  client:
+    type: browser
+    name: dbrowser
+    short_name: DB
+    version:
+    engine: WebKit
+    engine_version: "536.26"
 -
   user_agent: Deepnet Explorer 1.5.3; Smart 2x2; Avant Browser; .NET CLR 2.0.50727; InfoPath.1)
   client:
@@ -303,6 +394,7 @@
     short_name: DE
     version: "1.5.3"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (SAMSUNG; SAMSUNG-GT-S5380D/S5380DNVKL1; U; Bada/2.0; fr-fr) AppleWebKit/534.20 (KHTML, like Gecko) Dolfin/3.0 Mobile HVGA SMM-MMS/1.2.0 OPN-B
   client:
@@ -311,6 +403,7 @@
     short_name: DF
     version: "3.0"
     engine: WebKit
+    engine_version: "534.20"
 -
   user_agent: Dillo/0.8.5-i18n-misc
   client:
@@ -319,6 +412,16 @@
     short_name: DI
     version: "0.8.5"
     engine: Dillo
+    engine_version: "0.8.5"
+-
+  user_agent: Dorado WAP-Browser/1.0
+  client:
+    type: browser
+    name: Dorado
+    short_name: DO
+    version: "1.0"
+    engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/533+ (KHTML, like Gecko) Element Browser 5.0
   client:
@@ -327,6 +430,7 @@
     short_name: EB
     version: "5.0"
     engine: WebKit
+    engine_version: "533"
 -
   user_agent: ELinks/0.12~pre6-1ubuntu1 (textmode; Ubuntu; Linux 3.11.0-13-generic i686; 100x25-2)
   client:
@@ -335,22 +439,25 @@
     short_name: EL
     version: "0.12"
     engine: Text-based
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; U; Linux i586; en-US; rv:1.6) Gecko/20040413 Epiphany/1.2.6
   client:
     type: browser
-    name: Epiphany
+    name: GNOME Web
     short_name: EP
     version: "1.2.6"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (X11; U; Linux i686; fr-fr) AppleWebKit/531.2+ (KHTML, like Gecko) Version/5.0 Safari/531.2+ Debian/squeeze (2.30.6-1) Epiphany/2.30.6
   client:
     type: browser
-    name: Epiphany
+    name: GNOME Web
     short_name: EP
     version: "2.30.6"
     engine: WebKit
+    engine_version: "531.2"
 -
   user_agent: Mozilla/5.0 (DTV) AppleWebKit/531.2+ (KHTML, like Gecko) Espial/6.1.5 AQUOSBrowser/2.0 (US01DTV;V;0001;0001)
   client:
@@ -359,6 +466,7 @@
     short_name: ES
     version: "6.1.5"
     engine: WebKit
+    engine_version: "531.2"
 -
   user_agent: Mozilla/5.0 (Windows; U; Win95; en-US; rv:1.5) Gecko/20031007 Firebird/0.7
   client:
@@ -367,6 +475,7 @@
     short_name: FB
     version: "0.7"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_6; en-us) AppleWebKit/528.16 (KHTML, like Gecko) Fluid/0.9.6 Safari/528.16
   client:
@@ -375,6 +484,7 @@
     short_name: FD
     version: "0.9.6"
     engine: WebKit
+    engine_version: "528.16"
 -
   user_agent: Mozilla/5.0 (Android; Linux armv7l; rv:10.0) Gecko/20120118 Firefox/10.0 Fennec/10.0
   client:
@@ -383,6 +493,7 @@
     short_name: FE
     version: "10.0"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (X11; Arch Linux i686; rv:2.0) Gecko/20110321 Firefox/4.0
   client:
@@ -391,6 +502,7 @@
     short_name: FF
     version: "4.0"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (BeOS; U; Haiku BePC; en-US; rv:1.8.1.21pre) Gecko/20090218 BonEcho/2.0.0.21pre
   client:
@@ -399,6 +511,7 @@
     short_name: FF
     version: "BonEcho (2.0.0.21)"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.11) Gecko GranParadiso/3.0.11
   client:
@@ -407,6 +520,7 @@
     short_name: FF
     version: "GranParadiso (3.0.11)"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a3pre) Gecko/20070301 Minefield/3.0a3pre
   client:
@@ -415,6 +529,7 @@
     short_name: FF
     version: "Minefield (3.0)"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1b5pre) Gecko/20090424 Shiretoko/3.5b5pre
   client:
@@ -423,6 +538,7 @@
     short_name: FF
     version: "Shiretoko (3.5)"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3pre) Gecko/20100403 Lorentz/3.6.3plugin2pre (.NET CLR 4.0.20506)
   client:
@@ -431,6 +547,7 @@
     short_name: FF
     version: "Lorentz (3.6.3)"
     engine: Gecko
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.13) Gecko/20110504 Namoroka/3.6.13
   client:
@@ -439,14 +556,34 @@
     short_name: FF
     version: "Namoroka (3.6.13)"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) FxiOS/1.0 Mobile/12F69 Safari/600.1.4
   client:
     type: browser
-    name: Firefox
-    short_name: FF
+    name: Firefox Mobile
+    short_name: FM
     version: "iOS 1.0"
     engine: WebKit
+    engine_version: "600.1.4"
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0.1) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Klar/1.0 Chrome/57.0.2987.132 Mobile Safari/537.36
+  client:
+    type: browser
+    name: Firefox Focus
+    short_name: FK
+    version: "1.0"
+    engine: WebKit
+    engine_version: "537.36"
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Focus/1.1 Chrome/49.0.2623.91 Mobile Safari/537.36
+  client:
+    type: browser
+    name: Firefox Focus
+    short_name: FK
+    version: 1.1
+    engine: WebKit
+    engine_version: "537.36"
 -
   user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; pl; rv:1.9.0.16) Gecko/2010021013 Firefox/3.0.16 Flock/2.5.6
   client:
@@ -455,6 +592,7 @@
     short_name: FL
     version: "2.5.6"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:2.0) Treco/20110515 Fireweb Navigator/2.4
   client:
@@ -463,6 +601,7 @@
     short_name: FN
     version: "2.4"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534+ (KHTML, like Gecko) FireWeb/1.0.0.0
   client:
@@ -471,6 +610,7 @@
     short_name: FW
     version: "1.0.0.0"
     engine: WebKit
+    engine_version: "534"
 -
   user_agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20051105 Galeon/1.3.21
   client:
@@ -479,6 +619,7 @@
     short_name: GA
     version: "1.3.21"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; cs-CZ) AppleWebKit/532.4 (KHTML, like Gecko) Google Earth/5.2.1.1329 Safari/532.4
   client:
@@ -487,6 +628,7 @@
     short_name: GE
     version: "5.2.1.1329"
     engine: WebKit
+    engine_version: "532.4"
 -
   user_agent: HotJava/1.1.2 FCS
   client:
@@ -495,6 +637,7 @@
     short_name: HJ
     version: "1.1.2"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20130823 Firefox/10.0.11esrpre Iceape/2.7.12
   client:
@@ -503,6 +646,7 @@
     short_name: IA
     version: "2.7.12"
     engine: Gecko
+    engine_version:
 -
   user_agent: IBrowse/2.4 (AmigaOS 3.9; 68K)
   client:
@@ -511,6 +655,7 @@
     short_name: IB
     version: "2.4"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/4.5 (compatible; iCab 2.9.9; Macintosh; U; 68K)
   client:
@@ -519,6 +664,7 @@
     short_name: IC
     version: "2.9.9"
     engine: iCab
+    engine_version: "2.9.9"
 -
   user_agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_5_8; en-us) AppleWebKit/533.19.4 (KHTML, like Gecko) iCab/4.8 Safari/533.16
   client:
@@ -527,6 +673,7 @@
     short_name: IC
     version: "4.8"
     engine: WebKit
+    engine_version: "533.19.4"
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; rv:26.0) Gecko/20100101 Firefox/26.0 IceDragon/26.0.0.2
   client:
@@ -535,6 +682,7 @@
     short_name: ID
     version: "26.0.0.2"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; U; Linux i686; de; rv:1.9.0.15) Gecko/2009102815 Iceweasel/3.0.6 (Debian-3.0.6-3)
   client:
@@ -543,6 +691,7 @@
     short_name: IW
     version: "3.0.6"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/4.0 (compatible; MSIE 4.01; Mac_PowerPC)
   client:
@@ -551,6 +700,7 @@
     short_name: IE
     version: "4.01"
     engine: Trident
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0
   client:
@@ -559,6 +709,7 @@
     short_name: PS
     version: "12.0"
     engine: Edge
+    engine_version: "12.0"
 -
   user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10240
   client:
@@ -567,6 +718,7 @@
     short_name: PS
     version: "12.10240"
     engine: Edge
+    engine_version: "12.10240"
 -
   user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Safari/537.36 Edge/13.10537
   client:
@@ -575,6 +727,7 @@
     short_name: PS
     version: "13.10537"
     engine: Edge
+    engine_version: "13.10537"
 -
   user_agent: Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Safari/537.36 Edge/13.10547
   client:
@@ -583,6 +736,25 @@
     short_name: PS
     version: "13.10547"
     engine: Edge
+    engine_version: "13.10547"
+-
+  user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_2 like Mac OS X) AppleWebKit/603.2.4 (KHTML, like Gecko) Mobile/14F89 Safari/603.2.4 EdgiOS/41.1.35.1
+  client:
+    type: browser
+    name: Microsoft Edge
+    short_name: PS
+    version: "41.1.35.1"
+    engine: WebKit
+    engine_version: "603.2.4"
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.0; Pixel XL Build/OPP3.170518.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.0 Mobile Safari/537.36 EdgA/41.1.35.1
+  client:
+    type: browser
+    name: Microsoft Edge
+    short_name: PS
+    version: "41.1.35.1"
+    engine: Blink
+    engine_version: ""
 -
   user_agent: Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; Acer; Allegro)
   client:
@@ -591,6 +763,7 @@
     short_name: IM
     version: "9.0"
     engine: Trident
+    engine_version: "5.0"
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Iron/26.0.1450.0 Chrome/26.0.1450.0 Safari/537.36
   client:
@@ -599,6 +772,25 @@
     short_name: IR
     version: "26.0.1450.0"
     engine: WebKit
+    engine_version: "537.36"
+-
+  user_agent: Mozilla/5.0 (iPhone; CPU OS 8_0 like Mac OS X) AppleWebKit/538.34.9 (KHTML, like Gecko) Mobile/isivioo
+  client:
+    type: browser
+    name: Isivioo
+    short_name: IV
+    version:
+    engine: WebKit
+    engine_version: "538.34.9"
+-
+  user_agent: Mozilla/5.0 (Linux; Android 5.0; LG-D855 Build/LRX21R.A1445306351; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/51.0.2704.81 Mobile Safari/537.36/isivioo
+  client:
+    type: browser
+    name: Isivioo
+    short_name: IV
+    version:
+    engine: WebKit
+    engine_version: "537.36"
 -
   user_agent: SAMSUNG-GT-S5230-ORANGE/S5230BVIF1 SHP/VPP/R5 Jasmine/0.8 Nextreaming SMM-MMS/1.2.0 profile/MIDP-2.1 configuration/CLDC-1.1
   client:
@@ -607,6 +799,7 @@
     short_name: JS
     version: "0.8"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/4.0 (jig browser 5.0.1; F900iT)
   client:
@@ -615,6 +808,7 @@
     short_name: JI
     version: "5.0.1"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/4.0 (jig browser web; 1.0.4; V702NK)
   client:
@@ -623,6 +817,7 @@
     short_name: JI
     version: "1.0.4"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/4.0 (jig browser9i 1.5.0; F10B; 2004)
   client:
@@ -631,6 +826,7 @@
     short_name: JI
     version: "1.5.0"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/4.0 (jig browser9 1.4.9; D905i; 2043)
   client:
@@ -639,6 +835,7 @@
     short_name: JI
     version: "1.4.9"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/4.0 (compatible; Linux 2.6.22) NetFront/3.4 Kindle/2.0 (screen 600x800)
   client:
@@ -647,6 +844,7 @@
     short_name: KI
     version: "2.0"
     engine: NetFront
+    engine_version: "3.4"
 -
   user_agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.24pre) Gecko/20100228 K-Meleon/1.5.4
   client:
@@ -655,6 +853,7 @@
     short_name: KM
     version: "1.5.4"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux; de) KHTML/3.5.8 (like Gecko) (Debian)
   client:
@@ -663,6 +862,7 @@
     short_name: KO
     version: "3.5"
     engine: KHTML
+    engine_version: "3.5.8"
 -
   user_agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9) Gecko/20080705 Firefox/3.0 Kapiko/3.0
   client:
@@ -671,6 +871,7 @@
     short_name: KP
     version: "3.0"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.8) Gecko Fedora/1.9.0.8-1.fc10 Kazehakase/0.5.6
   client:
@@ -679,6 +880,7 @@
     short_name: KZ
     version: "0.5.6"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2) Gecko/20100222 Firefox/3.6 Kylo/0.6.1.70394
   client:
@@ -687,6 +889,7 @@
     short_name: KY
     version: "0.6.1.70394"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36 LBBROWSER
   client:
@@ -695,6 +898,7 @@
     short_name: LB
     version:
     engine: WebKit
+    engine_version: "537.36"
 -
   user_agent: Links (2.1pre23; Linux 3.5.0 i686; 237x63)
   client:
@@ -703,6 +907,7 @@
     short_name: LI
     version: "2.1"
     engine: Text-based
+    engine_version:
 -
   user_agent: Mozilla/5.0 (OpenBSD i386) AppleWebKit/538.1+ (KHTML, like Gecko) WebKitGTK+/2.2.3 luakit/0d5f4
   client:
@@ -711,6 +916,7 @@
     short_name: LU
     version:
     engine: WebKit
+    engine_version: "538.1"
 -
   user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; .NET CLR 1.1.4322; Lunascape 2.1.3)
   client:
@@ -719,6 +925,7 @@
     short_name: LS
     version: "2.1.3"
     engine:
+    engine_version:
 -
   user_agent: Lynx/2.8.8pre.3 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/1.0.1e
   client:
@@ -727,6 +934,7 @@
     short_name: LX
     version: "2.8.8"
     engine: Text-based
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; U; Linux armv7l; en-GB; rv:1.9.2a1pre) Gecko/20090514 Firefox/3.0 Tablet browser 0.9.7 RX-34
   client:
@@ -735,6 +943,7 @@
     short_name: MB
     version: "0.9.7"
     engine: Gecko
+    engine_version:
 -
   user_agent: Maemo Browser
   client:
@@ -743,6 +952,7 @@
     short_name: MB
     version:
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; U; Linux armv7l; pt-PT; rv:1.9.2.3pre) Gecko/20100723 Firefox/3.5 Maemo Browser 1.7.4.8 RX-51 N900
   client:
@@ -751,6 +961,7 @@
     short_name: MB
     version: "1.7.4.8"
     engine: Gecko
+    engine_version:
 -
   user_agent: NCSA_Mosaic/2.7b5 (X11;Linux 2.6.7 i686) libwww/2.12 modified
   client:
@@ -759,6 +970,7 @@
     short_name: MC
     version: "2.7"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (iPad; CPU OS 6_0_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Mercury/8.0.1 Mobile/10A523 Safari/8536.25
   client:
@@ -767,6 +979,7 @@
     short_name: ME
     version: "8.0.1"
     engine: WebKit
+    engine_version: "536.26"
 -
   user_agent: Mozilla/5.0 (Linux; U; Android 4.3; zh-cn; MI 3W Build/JLS36C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 XiaoMi/MiuiBrowser/1.0
   client:
@@ -775,6 +988,7 @@
     short_name: MU
     version: "1.0"
     engine: WebKit
+    engine_version: "534.30"
 -
   user_agent: Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_0_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Mobile/8C148
   client:
@@ -783,6 +997,7 @@
     short_name: MF
     version:
     engine: WebKit
+    engine_version: "533.17.9"
 -
   user_agent: MobileSafari/9537.53 CFNetwork/672.1.13 Darwin/13.1.0
   client:
@@ -791,6 +1006,7 @@
     short_name: MF
     version: "9537.53"
     engine: WebKit
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; Linux) AppleWebKit/535.22 (KHTML, like Gecko) Chrome/18.0.1025.133 Safari/535.22 Midori/0.5
   client:
@@ -799,6 +1015,7 @@
     short_name: MI
     version: "0.5"
     engine: WebKit
+    engine_version: "535.22"
 -
   user_agent: Mozilla/5.0 (Linux; U; en-gb; KFSOWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.12 Safari/535.19 Silk-Accelerated=true
   client:
@@ -807,6 +1024,7 @@
     short_name: MS
     version: "3.12"
     engine: Blink
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_5) AppleWebKit/537.22 (KHTML, like Gecko) Maxthon/4.1.2.2000 Chrome/25.0.1364.99 Safari/537.22
   client:
@@ -815,6 +1033,7 @@
     short_name: MX
     version: "4.1.2.2000"
     engine: WebKit
+    engine_version: "537.22"
 -
   user_agent: Mozilla/5.0 (Symbian/3; Series60/5.3 NokiaE7-00/111.040.1511; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/535.1 (KHTML, like Gecko) NokiaBrowser/8.3.1.4 Mobile Safari/535.1
   client:
@@ -823,6 +1042,7 @@
     short_name: NB
     version: "8.3.1.4"
     engine: WebKit
+    engine_version: "535.1"
 -
   user_agent: NokiaN73-2/3.0-630.0.2 Series60/3.0 Profile/MIDP-2.0 Configuration/CLDC-1.1
   client:
@@ -831,6 +1051,7 @@
     short_name: 'NO'
     version: "3.0"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Linux; U; Android 2.3.3; cs_cz; MT11i Build/GINGERBREAD) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 NetFrontLifeBrowser/2.3 Mobile (Dragonfruit)
   client:
@@ -839,6 +1060,7 @@
     short_name: NL
     version: "2.3"
     engine: NetFront
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Series40; Nokia306/03.63; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/3.9.0.0.22
   client:
@@ -847,6 +1069,7 @@
     short_name: NV
     version: "3.9.0.0.22"
     engine: Gecko
+    engine_version:
 -
   user_agent: SAMSUNG-SGH-A737/UCHD2 SHP/VPP/R5 NetFront/3.4 SMM-MMS/1.2.0 profile/MIDP-2.0 configuration/CLDC-1.1
   client:
@@ -855,6 +1078,7 @@
     short_name: NF
     version: "3.4"
     engine: NetFront
+    engine_version: "3.4"
 -
   user_agent: Mozilla/3.0 (compatible; NetPositive/2.2.1; BeOS)
   client:
@@ -863,6 +1087,7 @@
     short_name: NP
     version: "2.2.1"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; U; Linux 2.4.2-2 i586; en-US; m18) Gecko/20010131 Netscape6/6.01
   client:
@@ -871,6 +1096,7 @@
     short_name: NS
     version: "6.01"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.7.5) Gecko/20070321 Netscape/8.1.3
   client:
@@ -879,6 +1105,7 @@
     short_name: NS
     version: "8.1.3"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (DirectFB; Linux armv7l) AppleWebKit/534.26+ (KHTML, like Gecko) Version/5.0 Safari/534.26+ LG Browser/5.00.00(+mouse+3D+SCREEN+TUNER; LGE; 47LM9600-NA; 06.00.00; 0x00000001;); LG NetCast.TV-2012 0
   client:
@@ -887,6 +1114,7 @@
     short_name: LG
     version: "5.00.00"
     engine: WebKit
+    engine_version: "534.26"
 -
   user_agent: Huawei/1.0/0HuaweiG2800/WAP2.0/Obigo-Browser/Q03C MMS/Obigo-MMS/1.2
   client:
@@ -895,6 +1123,7 @@
     short_name: OB
     version:
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Macintosh; PowerPC MorphOS 3.7; Odyssey Web Browser; rv:1.23) AppleWebKit/538.1 (KHTML, like Gecko) OWB/1.23 Safari/538.1
   client:
@@ -903,6 +1132,7 @@
     short_name: OD
     version: "1.23"
     engine: WebKit
+    engine_version: "538.1"
 -
   user_agent: Mozilla/4.7 (compatible; OffByOne; Windows 2000) Webster Pro V3.4
   client:
@@ -911,6 +1141,7 @@
     short_name: OF
     version:
     engine:
+    engine_version:
 -
   user_agent: OneBrowser/4.2.0/Adr(Linux; U; Android 2.3.4; en-us; ADR6325 Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Mobile Safari/533.1
   client:
@@ -919,6 +1150,17 @@
     short_name: OE
     version: "4.2.0"
     engine: WebKit
+    engine_version: "533.1"
+-
+  user_agent: Opera/9.80 (J2ME/MIDP; Opera Mini; U; en) Presto/2.12.423 Version/12.16
+  client:
+    type: browser
+    name: Opera Mini
+    short_name: OI
+    version: "12.16"
+    engine: Presto
+    engine_version: "2.12.423"
+
 -
   user_agent: UCWEB/2.0 (Linux; U; Opera Mini/7.1.32052/30.3697; en-US; GT-S6812) U2/1.0.0 UCBrowser/9.0.0.366 Mobile
   client:
@@ -927,6 +1169,7 @@
     short_name: OI
     version: "7.1.32052"
     engine: Presto
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Linux; Android 4.0.3; HTC EVO 3D X515m Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.63 Mobile Safari/537.36 OPR/15.0.1162.61541
   client:
@@ -935,6 +1178,16 @@
     short_name: OM
     version: "15.0.1162.61541"
     engine: Blink
+    engine_version:
+-
+  user_agent: Mozilla/5.0 (SAMSUNG; SAMSUNG-GT-S7230-VODAFONE/1.0; U; Bada/1.0; en-us) OperaMini/5.0.21073 Mobile WVGA SMM-MMS/1.2.0 NexPla
+  client:
+    type: browser
+    name: Opera Mini
+    short_name: OI
+    version: "5.0.21073"
+    engine: Presto
+    engine_version:
 -
   user_agent: Opera/9.80 (X11; Linux zbov) Presto/2.11.355 Version/12.10
   client:
@@ -943,6 +1196,7 @@
     short_name: OP
     version: "12.10"
     engine: Presto
+    engine_version: "2.11.355"
 -
   user_agent: Opera/3.2 (Windows 2000 3.8; )
   client:
@@ -951,6 +1205,7 @@
     short_name: OP
     version: "3.2"
     engine:
+    engine_version:
 -
   user_agent: 'Opera/6.04 (Windows 2000; U) [en]'
   client:
@@ -959,6 +1214,7 @@
     short_name: OP
     version: "6.04"
     engine: Elektra
+    engine_version:
 -
   user_agent: MOT-A1600/1.0 LinuxOS/2.4.20 Release/8.22.2006 Browser/Opera8.00 Profile/MIDP-2.0 Configuration/CLDC-1.1 Software/R542_G_11.61.33R
   client:
@@ -967,6 +1223,7 @@
     short_name: OP
     version: "8.00"
     engine: Presto
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 1091) AppleWebKit/537.36 (KHTML like Gecko) Chrome/33.0.1750.91 Safari/537.36 OPR/20.0.1387.37 (Edition Next)
   client:
@@ -975,6 +1232,7 @@
     short_name: 'ON'
     version: "20.0.1387.37"
     engine: Blink
+    engine_version:
 -
   user_agent: 'Mozilla/1.10 [en] (Compatible; RISC OS 3.70; Oregano 1.10)'
   client:
@@ -983,6 +1241,7 @@
     short_name: OR
     version: "1.10"
     engine:
+    engine_version:
 -
   user_agent: pcdc751/1.0 UP.Browser/6.2.3.2 (GUI) MMP/2.0
   client:
@@ -991,6 +1250,7 @@
     short_name: OV
     version: "6.2.3.2"
     engine:
+    engine_version:
 -
   user_agent: SonyEricssonW395c/R1DA Browser/OpenWave/1.0 Profile/MIDP-2.1 Configuration/CLDC-1.1
   client:
@@ -999,6 +1259,7 @@
     short_name: OV
     version: "1.0"
     engine:
+    engine_version:
 -
   user_agent: 'Mozilla/5.0 (Macintosh; Intel  Mac OS X 10_9_1; en-US) AppleWebKit/9537.73.11 (KHTML, like Gecko) Version/7.0 Safari/537.71 OmniWeb/v624.0'
   client:
@@ -1007,6 +1268,7 @@
     short_name: OW
     version: "624.0"
     engine: WebKit
+    engine_version: "9537.73.11"
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/538.1 (KHTML, like Gecko) Otter/0.9.04
   client:
@@ -1015,6 +1277,7 @@
     short_name: OT
     version: "0.9.04"
     engine: WebKit
+    engine_version: "538.1"
 -
   user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; PalmSource/Palm-D050; Blazer/4.3) 16;320x320
   client:
@@ -1023,6 +1286,7 @@
     short_name: PL
     version: "4.3"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows NT 6.2; Win64; x64; rv:24.0) Gecko/20140129 Firefox/24.0 PaleMoon/24.3.1
   client:
@@ -1031,6 +1295,7 @@
     short_name: PM
     version: "24.3.1"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (webOS/1.0; U; en-US) AppleWebKit/525.27.1 (KHTML, like Gecko) Version/1.0 Safari/525.27.1 Pre/1.0
   client:
@@ -1039,6 +1304,7 @@
     short_name: PR
     version: "1.0"
     engine: WebKit
+    engine_version: "525.27.1"
 -
   user_agent: 'Mozilla/5.0 (X11; U; Linux x86_64; fa-ir) AppleWebKit/534.35 (KHTML, like Gecko)  Chrome/11.0.696.65 Safari/534.35 Puffin/2.10977AP'
   client:
@@ -1047,6 +1313,7 @@
     short_name: PU
     version: "2.10977"
     engine: WebKit
+    engine_version: "534.35"
 -
   user_agent: Mozilla/4.76 (compatible; MSIE 6.0; U; Windows 95; PalmSource; PalmOS; WebPro; Tungsten Proxyless 1.1 320x320x16)
   client:
@@ -1055,14 +1322,16 @@
     short_name: PW
     version:
     engine:
+    engine_version:
 -
-    user_agent: 'Palmscape/3.0J [ja] (v. 3.5.2H1.5; 153x130; c8)'
-    client:
-      type: browser
-      name: Palmscape
-      short_name: PA
-      version: 3.0
-      engine:
+  user_agent: 'Palmscape/3.0J [ja] (v. 3.5.2H1.5; 153x130; c8)'
+  client:
+    type: browser
+    name: Palmscape
+    short_name: PA
+    version: 3.0
+    engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.2b) Gecko/20021029 Phoenix/0.4
   client:
@@ -1071,6 +1340,7 @@
     short_name: PX
     version: "0.4"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/4.0 (compatible; Polaris 6.2; Brew 3.1.5; en)/240X320 Samsung sam-r631
   client:
@@ -1079,6 +1349,7 @@
     short_name: PO
     version: "6.2"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) rekonq/2.3.2 Safari/537.21
   client:
@@ -1087,6 +1358,7 @@
     short_name: RK
     version: "2.3.2"
     engine: WebKit
+    engine_version: "537.21"
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1) AppleWebKit/535.7 (KHTML, like Gecko) RockMelt/0.16.91.483 Chrome/16.0.912.77 Safari/535.7
   client:
@@ -1095,6 +1367,7 @@
     short_name: RM
     version: "0.16.91.483"
     engine: WebKit
+    engine_version: "535.7"
 -
   user_agent: Mozilla/5.0 (SMART-TV; Linux; Tizen 2.3) AppleWebkit/538.1 (KHTML, like Gecko) SamsungBrowser/1.0 TV Safari/538.1
   client:
@@ -1103,6 +1376,7 @@
     short_name: SB
     version: 1.0
     engine: WebKit
+    engine_version: "538.1"
 -
   user_agent: Mozilla/5.0 (Linux; Android 5.1.1; SAMSUNG SM-A510F Build/LMY47X) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile Safari/537.36
   client:
@@ -1111,6 +1385,7 @@
     short_name: SB
     version: 4.0
     engine: WebKit
+    engine_version: "537.36"
 -
   user_agent: Mozilla/5.0 (Maemo; Linux; U; Jolla; Sailfish; Mobile; rv:26.0) Gecko/26.0 Firefox/26.0 SailfishBrowser/1.0 like Safari/538.1
   client:
@@ -1119,6 +1394,7 @@
     short_name: SA
     version: "1.0"
     engine: Gecko
+    engine_version: "26.0"
 -
   user_agent: Mozilla/4.0 (compatible; MSIE 9.0; Windows NT 6.1; SV1; SE 2.x)
   client:
@@ -1127,6 +1403,7 @@
     short_name: SE
     version: "2"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; Linux i686; U; en-US) Gecko/20081217 Vision-Browser/8.1 301x200 LG VN530
   client:
@@ -1135,6 +1412,7 @@
     short_name: VB
     version: "8.1"
     engine: Gecko
+    engine_version:
 -
   user_agent: Safari/9537.73.11 CFNetwork/673.0.3 Darwin/13.0.0 (x86_64) (MacBookAir6%2C2)
   client:
@@ -1143,6 +1421,7 @@
     short_name: SF
     version:
     engine: WebKit
+    engine_version:
 -
   user_agent: Sraf/3.0 (Linux i686 ; U; HbbTV/1.1.1 (+PVR+DL;NEXUS; TV44; sw1.0) CE-HTML/1.0 Config(L:eng,CC:DEU); en/de)
   client:
@@ -1151,6 +1430,7 @@
     short_name: SS
     version: "3.0"
     engine: Blink
+    engine_version:
 -
   user_agent: CELKON.C64/R2AE SEMC-Browser/4.0.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
   client:
@@ -1159,6 +1439,7 @@
     short_name: SC
     version: "4.0.3"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/419 (KHTML, like Gecko) Shiira/1.2.3 Safari/125
   client:
@@ -1167,6 +1448,7 @@
     short_name: SH
     version: "1.2.3"
     engine: WebKit
+    engine_version: "419"
 -
   user_agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_7; xx) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Safari/530.17 Skyfire/6DE
   client:
@@ -1175,6 +1457,7 @@
     short_name: SK
     version:
     engine: WebKit
+    engine_version: "530.17"
 -
   user_agent: Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0; Sleipnir/2.9.18)
   client:
@@ -1183,6 +1466,7 @@
     short_name: SL
     version: "2.9.18"
     engine: Trident
+    engine_version: "6.0"
 -
   user_agent: Mozilla/5.0 (X11; Linux x86_64; rv:29.0) Gecko/20100101 Firefox/29.0 SeaMonkey/2.26a1 Lightning/3.1a1
   client:
@@ -1191,6 +1475,7 @@
     short_name: SM
     version: "2.26"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) Snowshoe/1.0.0 Safari/537.21
   client:
@@ -1199,6 +1484,34 @@
     short_name: SN
     version: "1.0.0"
     engine: WebKit
+    engine_version: "537.21"
+-
+  user_agent: Mozilla/5.0 (iPhone; U; CPU @2764110S 5_1_1 like Mac OS X; sv-SE) AppleWebKit/601.1.46 (KHTML, like Gecko) Streamy/1.1.11 Mobile/13B143 Safari/7534.48.3
+  client:
+    type: browser
+    name: Streamy
+    short_name: ST
+    version: "1.1.11"
+    engine: WebKit
+    engine_version: "601.1.46"
+-
+  user_agent: Mozilla/5.0 (iPhone; U; CPU @1064110S 5_1_1 like Mac OS X; en-US) AppleWebKit/601.1.46 (KHTML, like Gecko) Streamy/1.1.11 Mobile/13F69 Safari/7534.48.3
+  client:
+    type: browser
+    name: Streamy
+    short_name: ST
+    version: "1.1.11"
+    engine: WebKit
+    engine_version: "601.1.46"
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0.1; SM-G920F Build/MMB29K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.116 Crosswalk/18.48.477.13 Mobile Safari/537.36 Streamy/1.1.193
+  client:
+    type: browser
+    name: Streamy
+    short_name: ST
+    version: "1.1.193"
+    engine: WebKit
+    engine_version: "537.36"
 -
   user_agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/125.5.7 (KHTML, like Gecko) SunriseBrowser/0.833
   client:
@@ -1207,6 +1520,7 @@
     short_name: SR
     version: "0.833"
     engine: WebKit
+    engine_version: "125.5.7"
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.17 (KHTML, like Gecko) SuperBird/24.0
   client:
@@ -1215,6 +1529,7 @@
     short_name: SP
     version: "24.0"
     engine: WebKit
+    engine_version: "537.17"
 -
   user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1) Gecko/20061024 Firefox/2.0 (Swiftfox)
   client:
@@ -1223,6 +1538,7 @@
     short_name: SX
     version: "2.0"
     engine: Gecko
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Linux; U; Tizen/1.0 like Android; en-us; AppleWebKit/534.46 (KHTML, like Gecko) Tizen Browser/1.0 Mobile
   client:
@@ -1231,6 +1547,7 @@
     short_name: TZ
     version: "1.0"
     engine: WebKit
+    engine_version: "534.46"
 -
   user_agent: UCWEB/2.0 (Java; U; MIDP-2.0; fr-FR; ALCATEL_one_touch_585) U2/1.0.0 UCBrowser/9.4.1.377 U2/1.0.0 Mobile UNTRUSTED/1.0
   client:
@@ -1239,6 +1556,7 @@
     short_name: UC
     version: "9.4.1.377"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.114 Safari/537.36 Vivaldi/1.0.105.7
   client:
@@ -1247,6 +1565,7 @@
     short_name: VI
     version: "1.0.105.7"
     engine: Blink
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) TweakStyle/0.9.2 Chrome/49.0.2623.75 Electron/0.37.5 Safari/537.36 (Tab 1)
   client:
@@ -1255,6 +1574,7 @@
     short_name: TS
     version: "0.9.2"
     engine: Blink
+    engine_version:
 -
   user_agent: Mozilla/5.0 (compatible; U; Webpositive/533.4; Haiku) AppleWebkit/533.4 (KHTML, like gecko) Chrome/5.0.375.55 Safari/533.4
   client:
@@ -1263,6 +1583,7 @@
     short_name: WE
     version:
     engine: WebKit
+    engine_version: "533.4"
 -
   user_agent: Mozilla/5.0 (X11; U; Linux i686; de-DE) AppleWebKit/534.3 (KHML, like Gecko) WeTab-Browser Safari/534.3
   client:
@@ -1271,6 +1592,7 @@
     short_name: WT
     version:
     engine: WebKit
+    engine_version: "534.3"
 -
   user_agent: Mozilla/5.0 (webOS/1.4.5; U; ru-RU) AppleWebKit/532.2 (KHTML, like Gecko) Version/1.0 Safari/532.2 Pixi/1.0
   client:
@@ -1279,6 +1601,7 @@
     short_name: WO
     version: "1.4.5"
     engine: WebKit
+    engine_version: "532.2"
 -
   user_agent: Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 YaBrowser/13.10.1500.9323 Safari/537.36
   client:
@@ -1287,6 +1610,7 @@
     short_name: YA
     version: "13.10.1500.9323"
     engine: Blink
+    engine_version:
 -
   user_agent: 'Xiino/1.0.9E [en] (v. 4.1; 153x130; g4)'
   client:
@@ -1295,6 +1619,7 @@
     short_name: XI
     version: "1.0.9"
     engine:
+    engine_version:
 -
   user_agent: Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.48 Safari/537.36 QQBrowser/8.0.3197.400
   client:
@@ -1303,6 +1628,7 @@
     short_name: QQ
     version: "8.0.3197.400"
     engine: WebKit
+    engine_version: "537.36"
 -
   user_agent: MQQBrowser/Mini2.6 (SAMSUNG-SGH-A777/A777UCIF2)
   client:
@@ -1311,3 +1637,112 @@
     short_name: QQ
     version: "2.6"
     engine:
+    engine_version:
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.3; en-us; Nexus 4 Build/JOP24G) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/37.0.0.0 Mobile Polarity/6.0.0 Safari/534.30
+  client:
+    type: browser
+    name: Polarity
+    short_name: PT
+    version: "6.0.0"
+    engine: WebKit
+    engine_version: 534.30
+-
+  user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/533.3 (KHTML, like Gecko) QupZilla/1.1.5 Safari/533.3
+  client:
+    type: browser
+    name: QupZilla
+    short_name: QZ
+    version: "1.1.5"
+    engine: WebKit
+    engine_version: 533.3
+-
+  user_agent: Mozilla/5.0 (Windows NT 5.1) AppleWebKit/534.34 (KHTML, like Gecko) Dooble/1.41 Safari/534.34
+  client:
+    type: browser
+    name: Dooble
+    short_name: DL
+    version: "1.41"
+    engine: WebKit
+    engine_version: 534.34
+-
+  user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.10) Gecko/20101026 Epic/1.2 Firefox/3.6.10
+  client:
+    type: browser
+    name: Epic
+    short_name: EI
+    version: "1.2"
+    engine: Gecko
+    engine_version:
+-
+  user_agent: Mozilla/5.0 (iPad; CPU OS 6_1_3 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Coast/1.0.2.62956 Mobile/10B329 Safari/7534.48.3
+  client:
+    type: browser
+    name: Coast
+    short_name: C1
+    version: "1.0.2.62956"
+    engine: WebKit
+    engine_version: 536.26
+-
+  user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/538.1 (KHTML, like Gecko) qutebrowser/0.2.1 Safari/538.1
+  client:
+    type: browser
+    name: Qutebrowser
+    short_name: QT
+    version: "0.2.1"
+    engine: WebKit
+    engine_version: 538.1
+-
+  user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 Mobile/14A456 Safari/602.1 AlohaBrowser/1.4
+  client:
+    type: browser
+    name: Aloha Browser
+    short_name: AL
+    version: "1.4"
+    engine: WebKit
+    engine_version: 602.1.50
+-
+  user_agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:30.0) Gecko/20100101 Waterfox/30.0 Firefox/30.0
+  client:
+    type: browser
+    name: Waterfox
+    short_name: WF
+    version: "30.0"
+    engine: Gecko
+    engine_version:
+-
+  user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_4) AppleWebKit/537.36 (KHTML, like Gecko) Iridium/41.2 Safari/537.36 Chrome/41.0.2272.118
+  client:
+    type: browser
+    name: Iridium
+    short_name: I1
+    version: "41.2"
+    engine: WebKit
+    engine_version: 537.36
+-
+  user_agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:28.0) Gecko/20100101 Firefox/28.0 Cyberfox/28.0.1
+  client:
+    type: browser
+    name: Cyberfox
+    short_name: CY
+    version: "28.0.1"
+    engine: Gecko
+    engine_version:
+-
+  user_agent: Mozilla/5.0 (iPhone; CPU OS 8_0 like Mac OS X) AppleWebKit/538.34.9 (KHTML, like Gecko) iCabMobile/1.1
+  client:
+    type: browser
+    name: "iCab Mobile"
+    short_name: I2
+    version:  "1.1"
+    engine: WebKit
+    engine_version: "538.34.9"
+-
+  user_agent: NetSurf/3.7 (Linux; Arch Linux)
+  client:
+    type: browser
+    name: "NetSurf"
+    short_name: NE
+    version: "3.7"
+    engine: NetSurf
+    engine_version: "3.7"