From 5802af6d0cd7fcd00f088c7f7f854012d3bbdc07 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 17:01:51 +0200 Subject: [PATCH 01/49] Improves detection for Windows OS --- regexes/oss.yml | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/regexes/oss.yml b/regexes/oss.yml index e53c3a03ee..5f7395eccb 100644 --- a/regexes/oss.yml +++ b/regexes/oss.yml @@ -212,67 +212,59 @@ - regex: 'CYGWIN_NT-6.4|Windows NT 6.4|Windows 10' 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' 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: '' From f2fb46aeb40d176d8e69a3615fc60d2662485516 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 17:52:14 +0200 Subject: [PATCH 02/49] Adds detection for Lenovo Legion Y720 notebook --- DeviceDetector.php | 2 ++ Parser/Device/DeviceParserAbstract.php | 2 ++ Parser/Device/Notebook.php | 30 +++++++++++++++++++ Tests/DeviceDetectorTest.php | 1 + Tests/Parser/Devices/NotebookTest.php | 34 ++++++++++++++++++++++ Tests/Parser/Devices/fixtures/notebook.yml | 7 +++++ Tests/fixtures/notebook.yml | 18 ++++++++++++ misc/statistics.php | 6 ++-- regexes/device/notebooks.yml | 11 +++++++ 9 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 Parser/Device/Notebook.php create mode 100644 Tests/Parser/Devices/NotebookTest.php create mode 100644 Tests/Parser/Devices/fixtures/notebook.yml create mode 100644 Tests/fixtures/notebook.yml create mode 100644 regexes/device/notebooks.yml diff --git a/DeviceDetector.php b/DeviceDetector.php index f91dfef98f..9f552f6dfd 100644 --- a/DeviceDetector.php +++ b/DeviceDetector.php @@ -34,6 +34,7 @@ * @method boolean isTV() * @method boolean isSmartDisplay() * @method boolean isCamera() + * @method boolean isNotebook() * * Magic Client Type Methods * @method boolean isBrowser() @@ -186,6 +187,7 @@ public function __construct($userAgent = '') $this->addDeviceParser('Camera'); $this->addDeviceParser('PortableMediaPlayer'); $this->addDeviceParser('Mobile'); + $this->addDeviceParser('Notebook'); $this->addBotParser(new Bot()); } diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php index a0dbb75a20..389cb9e3f6 100644 --- a/Parser/Device/DeviceParserAbstract.php +++ b/Parser/Device/DeviceParserAbstract.php @@ -35,6 +35,7 @@ abstract class DeviceParserAbstract extends ParserAbstract const DEVICE_TYPE_PHABLET = 10; const DEVICE_TYPE_SMART_SPEAKER = 11; const DEVICE_TYPE_WEARABLE = 12; // including set watches, headsets + const DEVICE_TYPE_NOTEBOOK = 13; /** * Detectable device types @@ -55,6 +56,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'phablet' => self::DEVICE_TYPE_PHABLET, 'smart speaker' => self::DEVICE_TYPE_SMART_SPEAKER, 'wearable' => self::DEVICE_TYPE_WEARABLE, + 'notebook' => self::DEVICE_TYPE_NOTEBOOK, ); /** diff --git a/Parser/Device/Notebook.php b/Parser/Device/Notebook.php new file mode 100644 index 0000000000..e76528d79a --- /dev/null +++ b/Parser/Device/Notebook.php @@ -0,0 +1,30 @@ +preMatchOverall()) { + return false; + } + + return parent::parse(); + } +} diff --git a/Tests/DeviceDetectorTest.php b/Tests/DeviceDetectorTest.php index 0e170c7473..07818528ea 100644 --- a/Tests/DeviceDetectorTest.php +++ b/Tests/DeviceDetectorTest.php @@ -312,6 +312,7 @@ public function testMagicMMethods() $this->assertFalse($dd->isConsole()); $this->assertFalse($dd->isPortableMediaPlayer()); $this->assertFalse($dd->isCamera()); + $this->assertFalse($dd->isNotebook()); $this->assertTrue($dd->isBrowser()); $this->assertFalse($dd->isLibrary()); diff --git a/Tests/Parser/Devices/NotebookTest.php b/Tests/Parser/Devices/NotebookTest.php new file mode 100644 index 0000000000..c3d98b2400 --- /dev/null +++ b/Tests/Parser/Devices/NotebookTest.php @@ -0,0 +1,34 @@ +setUserAgent($useragent); + $this->assertTrue($consoleParser->parse()); + $this->assertEquals($device['type'], $consoleParser->getDeviceType()); + $this->assertEquals($device['brand'], $consoleParser->getBrand()); + $this->assertEquals($device['model'], $consoleParser->getModel()); + } + + public function getFixtures() + { + $fixtureData = \Spyc::YAMLLoad(realpath(dirname(__FILE__)) . '/fixtures/notebook.yml'); + return $fixtureData; + } +} diff --git a/Tests/Parser/Devices/fixtures/notebook.yml b/Tests/Parser/Devices/fixtures/notebook.yml new file mode 100644 index 0000000000..b3e981555d --- /dev/null +++ b/Tests/Parser/Devices/fixtures/notebook.yml @@ -0,0 +1,7 @@ +--- +- + user_agent: Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80VR;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0] + device: + type: 13 + brand: LE + model: Legion Y720 diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml new file mode 100644 index 0000000000..35a2990583 --- /dev/null +++ b/Tests/fixtures/notebook.yml @@ -0,0 +1,18 @@ +--- +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80VR;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: LE + model: Legion Y720 + os_family: Windows + browser_family: Unknown diff --git a/misc/statistics.php b/misc/statistics.php index 2f39761d7e..36e03ea0b5 100644 --- a/misc/statistics.php +++ b/misc/statistics.php @@ -9,7 +9,7 @@ require_once(__DIR__.'/../vendor/autoload.php'); if(count($argv) != 2) { - die("invalid arguments. Useage: php statistics.php filetoparse.txt"); + die("Invalid arguments. Usage: php statistics.php filetoparse.txt"); } $parsedUAs = $unknownDeviceTypes = @@ -94,6 +94,7 @@ function format($str, $length) Camera: %s (%s%%) Media Player: %s (%s%%) Phablet: %s (%s%%) +Notebook: %s (%s%%) Unknown: %s (%s%%) ---------------------------------- ", @@ -109,5 +110,6 @@ function format($str, $length) format($deviceTypes[8], $parsedUAs), getPercentage($deviceTypes[8], $parsedUAs), format($deviceTypes[9], $parsedUAs), getPercentage($deviceTypes[9], $parsedUAs), format($deviceTypes[10], $parsedUAs), getPercentage($deviceTypes[10], $parsedUAs), + format($deviceTypes[10], $parsedUAs), getPercentage($deviceTypes[13], $parsedUAs), format($unknownDeviceTypes, $parsedUAs), getPercentage($unknownDeviceTypes, $parsedUAs) -); \ No newline at end of file +); diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml new file mode 100644 index 0000000000..b9458a4682 --- /dev/null +++ b/regexes/device/notebooks.yml @@ -0,0 +1,11 @@ +############### +# 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 +############### + +Lenovo: + regex: 'FBMD/80VR;' + device: 'notebook' + model: 'Legion Y720' From e8763fe2826dd5a171703e4932d8a9ff8d57e473 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:00:42 +0200 Subject: [PATCH 03/49] Adds detection for Acer Aspire E5-511 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 35a2990583..71d01b7191 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -16,3 +16,20 @@ model: Legion Y720 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Z5WAL;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: AC + model: Aspire E5-511 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index b9458a4682..d32c1500b4 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -5,6 +5,11 @@ # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later ############### +Acer: + regex: 'FBMD/Z5WAL;' + device: 'notebook' + model: 'Aspire E5-511' + Lenovo: regex: 'FBMD/80VR;' device: 'notebook' From 553afa94574c509c2f53cbc8bd9eb90ab1c9c2c4 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:07:47 +0200 Subject: [PATCH 04/49] Adds detection for Lenovo Ideapad 310-15ISK --- Tests/fixtures/notebook.yml | 34 ++++++++++++++++++++++++++++++++++ regexes/device/notebooks.yml | 13 +++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 71d01b7191..6b18b4c3d0 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -33,3 +33,37 @@ model: Aspire E5-511 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/XPS 15 9530;FBSN/Windows;FBSV/10.0.16299.309;FBSS/2;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: DL + model: XPS 15 9530 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.786; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80SM;FBSN/Windows;FBSV/10.0.16299.309;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: LE + model: Ideapad 310-15ISK + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index d32c1500b4..ecd6c0b6b6 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -10,7 +10,16 @@ Acer: device: 'notebook' model: 'Aspire E5-511' +Dell: + regex: 'FBMD/XPS 15 9530;' + device: 'notebook' + model: 'XPS 15 9530' + Lenovo: - regex: 'FBMD/80VR;' + regex: 'FBMD/(?:80SM|80VR);' device: 'notebook' - model: 'Legion Y720' + models: + - regex: 'FBMD/80SM;' + model: 'Ideapad 310-15ISK' + - regex: 'FBMD/80VR;' + model: 'Legion Y720' From 02f943b0c6dd11628fbf128f55efef7616d5250f Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:14:49 +0200 Subject: [PATCH 05/49] Adds detection for Thomson Prestige TH-360R12.32CTW --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 6b18b4c3d0..eb30239c2d 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -67,3 +67,20 @@ model: Ideapad 310-15ISK os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/TH360R12.32CTW;FBSN/Windows;FBSV/10.0.16299.192;FBSS/1;FBCR/;FBID/desktop;FBLC/fr_FR;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: TN + model: Prestige TH-360R12.32CTW + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index ecd6c0b6b6..14d77cd12b 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -23,3 +23,8 @@ Lenovo: model: 'Ideapad 310-15ISK' - regex: 'FBMD/80VR;' model: 'Legion Y720' + +Thomson: + regex: 'FBMD/TH360R12.32CTW;' + device: 'notebook' + model: 'Prestige TH-360R12.32CTW' From b3489b94bf792f2e2a050bcb981b0759ac512c13 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:21:35 +0200 Subject: [PATCH 06/49] Adds detection for HP Pavilion x2 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 7 +++++++ 2 files changed, 24 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index eb30239c2d..3ca571b58b 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -84,3 +84,20 @@ model: Prestige TH-360R12.32CTW os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.19; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/HP Pavilion x2 Detachable;FBSN/Windows;FBSV/10.0.16299.64;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: notebook + brand: HP + model: Pavilion x2 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 14d77cd12b..3c2682d2b4 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -15,6 +15,13 @@ Dell: device: 'notebook' model: 'XPS 15 9530' +HP: + regex: 'FBMD/HP ' + device: 'notebook' + models: + - regex: 'HP Pavilion x2 Detachable' + model: 'Pavilion x2' + Lenovo: regex: 'FBMD/(?:80SM|80VR);' device: 'notebook' From 767b2db895ecf538190e431daba4bf8540fb3dad Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:27:20 +0200 Subject: [PATCH 07/49] Adds detection for HP 15 Laptop PC --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 2 ++ 2 files changed, 19 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 3ca571b58b..830ca1e274 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -101,3 +101,20 @@ model: Pavilion x2 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/HP Laptop 15-bs0xx;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: notebook + brand: HP + model: 15 Laptop PC + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 3c2682d2b4..2ccd7ea12e 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -21,6 +21,8 @@ HP: models: - regex: 'HP Pavilion x2 Detachable' model: 'Pavilion x2' + - regex: 'HP Laptop 15-bs0xx' + model: '15 Laptop PC' Lenovo: regex: 'FBMD/(?:80SM|80VR);' From b759ae47d4b0d1edad74d127bf6df2bac7d77596 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:31:00 +0200 Subject: [PATCH 08/49] Adds detection for HP ENVY x360 Convertible PC --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 2 ++ 2 files changed, 19 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 830ca1e274..48aa18b77f 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -118,3 +118,20 @@ model: 15 Laptop PC os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP ENVY x360 Convertible 15-bp0xx;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: HP + model: ENVY x360 Convertible PC + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 2ccd7ea12e..5a8c6ab5c8 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -23,6 +23,8 @@ HP: model: 'Pavilion x2' - regex: 'HP Laptop 15-bs0xx' model: '15 Laptop PC' + - regex: 'HP ENVY x360 Convertible 15-bp0xx' + model: 'ENVY x360 Convertible PC' Lenovo: regex: 'FBMD/(?:80SM|80VR);' From df8ae0a3702e467268d655592cf390743ad2c282 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:33:47 +0200 Subject: [PATCH 09/49] Adds detection for HP EliteBook 2570p --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 2 ++ 2 files changed, 19 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 48aa18b77f..0257419127 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -135,3 +135,20 @@ model: ENVY x360 Convertible PC os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP EliteBook 2570p;FBSN/Windows;FBSV/10.0.17134.112;FBSS/1;FBCR/;FBID/desktop;FBLC/it_IT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: HP + model: EliteBook 2570p + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 5a8c6ab5c8..e71f6abc31 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -25,6 +25,8 @@ HP: model: '15 Laptop PC' - regex: 'HP ENVY x360 Convertible 15-bp0xx' model: 'ENVY x360 Convertible PC' + - regex: 'HP EliteBook 2570p' + model: 'EliteBook 2570p' Lenovo: regex: 'FBMD/(?:80SM|80VR);' From b47b95f8a8c8d58998e93687f7e604f95a931016 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:35:33 +0200 Subject: [PATCH 10/49] Adds detection for HP Pavilion dv6 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 2 ++ 2 files changed, 19 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 0257419127..4098c98eb6 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -152,3 +152,20 @@ model: EliteBook 2570p os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/HP Pavilion dv6 Notebook PC;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: notebook + brand: HP + model: Pavilion dv6 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index e71f6abc31..9247473909 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -27,6 +27,8 @@ HP: model: 'ENVY x360 Convertible PC' - regex: 'HP EliteBook 2570p' model: 'EliteBook 2570p' + - regex: 'HP Pavilion dv6 Notebook PC' + model: 'Pavilion dv6' Lenovo: regex: 'FBMD/(?:80SM|80VR);' From ee41617ec59cc18413c1937650630d04436a3081 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:37:04 +0200 Subject: [PATCH 11/49] Adds detection for HP Pavilion --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 2 ++ 2 files changed, 19 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 4098c98eb6..4823272691 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -169,3 +169,20 @@ model: Pavilion dv6 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP Pavilion Notebook;FBSN/Windows;FBSV/10.0.16299.431;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: HP + model: Pavilion + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 9247473909..c12e1cc36c 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -29,6 +29,8 @@ HP: model: 'EliteBook 2570p' - regex: 'HP Pavilion dv6 Notebook PC' model: 'Pavilion dv6' + - regex: 'HP Pavilion Notebook' + model: 'Pavilion' Lenovo: regex: 'FBMD/(?:80SM|80VR);' From 0b7a10abb16edc3f2fc003553a7b10d9976375d8 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:39:18 +0200 Subject: [PATCH 12/49] Adds detection for HP Spectre x360 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 2 ++ 2 files changed, 19 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 4823272691..68a03ce0c3 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -186,3 +186,20 @@ model: Pavilion os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP Spectre x360 Convertible;FBSN/Windows;FBSV/10.0.16299.309;FBSS/2;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: HP + model: Spectre x360 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index c12e1cc36c..33a6a7d24e 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -31,6 +31,8 @@ HP: model: 'Pavilion dv6' - regex: 'HP Pavilion Notebook' model: 'Pavilion' + - regex: 'HP Spectre x360 Convertible' + model: 'Spectre x360' Lenovo: regex: 'FBMD/(?:80SM|80VR);' From 3556d19012482588bd7faa1d6eae6f65a3f61d92 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:51:15 +0200 Subject: [PATCH 13/49] Adds detection for Asus Transformer Book --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 7 +++++++ 2 files changed, 24 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 68a03ce0c3..1fb8c0f5d5 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -203,3 +203,20 @@ model: Spectre x360 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.1770; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/T100HAN;FBSN/Windows;FBSV/10.0.14393.1914;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: notebook + brand: AU + model: Transformer Book + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 33a6a7d24e..42d3526a3d 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -10,6 +10,13 @@ Acer: device: 'notebook' model: 'Aspire E5-511' +Asus: + regex: 'FBMD/T100HAN;' + device: 'notebook' + models: + - regex: 'FBMD/T100HAN;' + model: 'Transformer Book' + Dell: regex: 'FBMD/XPS 15 9530;' device: 'notebook' From 1bde21bf85372a62d2c08431f97e7b1ee92264d0 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:54:19 +0200 Subject: [PATCH 14/49] Adds detection for Asus Transformer Mini --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 1fb8c0f5d5..60e7c916b4 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -220,3 +220,20 @@ model: Transformer Book os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.309; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/T103HAF;FBSN/Windows;FBSV/10.0.16299.309;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: AU + model: Transformer Mini + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 42d3526a3d..8ac030bca6 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -11,11 +11,13 @@ Acer: model: 'Aspire E5-511' Asus: - regex: 'FBMD/T100HAN;' + regex: 'FBMD/(?:T100HAN|T103HAF);' device: 'notebook' models: - regex: 'FBMD/T100HAN;' model: 'Transformer Book' + - regex: 'FBMD/T103HAF;' + model: 'Transformer Mini' Dell: regex: 'FBMD/XPS 15 9530;' From 84ec91daaaacfe1b8bef747dbc12266dcc2da6e9 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 18:57:59 +0200 Subject: [PATCH 15/49] Adds detection for Asus X555LN --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 60e7c916b4..ebc7b7248d 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -237,3 +237,20 @@ model: Transformer Mini os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/X555LN;FBSN/Windows;FBSV/10.0.16299.309;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: AU + model: X555LN + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 8ac030bca6..61a2f1065f 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -11,13 +11,15 @@ Acer: model: 'Aspire E5-511' Asus: - regex: 'FBMD/(?:T100HAN|T103HAF);' + regex: 'FBMD/(?:T100HAN|T103HAF|X555LN);' device: 'notebook' models: - regex: 'FBMD/T100HAN;' model: 'Transformer Book' - regex: 'FBMD/T103HAF;' model: 'Transformer Mini' + - regex: 'FBMD/X555LN;' + model: 'X555LN' Dell: regex: 'FBMD/XPS 15 9530;' From a387a55ccf08b8e326c07987e9c13ea4a837dfa9 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:00:26 +0200 Subject: [PATCH 16/49] Adds detection for Asus K50IN --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index ebc7b7248d..1fe82d369e 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -254,3 +254,20 @@ model: X555LN os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.608; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/K50IN;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: notebook + brand: AU + model: K50IN + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 61a2f1065f..b332e6d7b0 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -11,9 +11,11 @@ Acer: model: 'Aspire E5-511' Asus: - regex: 'FBMD/(?:T100HAN|T103HAF|X555LN);' + regex: 'FBMD/(?:K50IN|T100HAN|T103HAF|X555LN);' device: 'notebook' models: + - regex: 'FBMD/K50IN;' + model: 'K50IN' - regex: 'FBMD/T100HAN;' model: 'Transformer Book' - regex: 'FBMD/T103HAF;' From dd904c327f9bf05f5244a76ca06cc01b86046c11 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:06:11 +0200 Subject: [PATCH 17/49] Adds detection for Acer One 10 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 8 ++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 1fe82d369e..93c79ac220 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -271,3 +271,20 @@ model: K50IN os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/One S1003;FBSN/Windows;FBSV/10.0.17134.165;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: AC + model: One 10 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index b332e6d7b0..b0ac4d641e 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -6,9 +6,13 @@ ############### Acer: - regex: 'FBMD/Z5WAL;' + regex: 'FBMD/(?:Z5WAL|One S1003);' device: 'notebook' - model: 'Aspire E5-511' + models: + - regex: 'FBMD/Z5WAL;' + model: 'Aspire E5-511' + - regex: 'FBMD/One S1003;' + model: 'One 10' Asus: regex: 'FBMD/(?:K50IN|T100HAN|T103HAF|X555LN);' From 3925b822660642a2aed0108041ee9467a178dd13 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:07:58 +0200 Subject: [PATCH 18/49] Adds detection for Asus X556UQK --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 93c79ac220..5de11d394a 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -288,3 +288,20 @@ model: One 10 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/X556UQK;FBSN/Windows;FBSV/10.0.16299.431;FBSS/1;FBCR/;FBID/desktop;FBLC/sv_SE;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: AU + model: X556UQK + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index b0ac4d641e..1f148f0f3c 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -15,7 +15,7 @@ Acer: model: 'One 10' Asus: - regex: 'FBMD/(?:K50IN|T100HAN|T103HAF|X555LN);' + regex: 'FBMD/(?:K50IN|T100HAN|T103HAF|X555LN|X556UQK);' device: 'notebook' models: - regex: 'FBMD/K50IN;' @@ -26,6 +26,8 @@ Asus: model: 'Transformer Mini' - regex: 'FBMD/X555LN;' model: 'X555LN' + - regex: 'FBMD/X556UQK;' + model: 'X556UQK' Dell: regex: 'FBMD/XPS 15 9530;' From 88c8336aebc3637c1982a5dde6bade1230cd38a7 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:11:32 +0200 Subject: [PATCH 19/49] Adds detection for Asus K54L --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 5de11d394a..98366287d7 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -305,3 +305,20 @@ model: X556UQK os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/K54L;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: AU + model: K54L + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 1f148f0f3c..26f92be893 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -15,11 +15,13 @@ Acer: model: 'One 10' Asus: - regex: 'FBMD/(?:K50IN|T100HAN|T103HAF|X555LN|X556UQK);' + regex: 'FBMD/(?:K50IN|K54L|T100HAN|T103HAF|X555LN|X556UQK);' device: 'notebook' models: - regex: 'FBMD/K50IN;' model: 'K50IN' + - regex: 'FBMD/K54L;' + model: 'K54L' - regex: 'FBMD/T100HAN;' model: 'Transformer Book' - regex: 'FBMD/T103HAF;' From a473ab2b5c881cd40257a5b85fac571567446410 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:13:55 +0200 Subject: [PATCH 20/49] Adds detection for Lenovo G50-80 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 98366287d7..f4732b4cf9 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -322,3 +322,20 @@ model: K54L os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.81; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80E5;FBSN/Windows;FBSV/10.0.17134.191;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: LE + model: G50-80 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 26f92be893..01eae578f8 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -56,9 +56,11 @@ HP: model: 'Spectre x360' Lenovo: - regex: 'FBMD/(?:80SM|80VR);' + regex: 'FBMD/(?:80E5|80SM|80VR);' device: 'notebook' models: + - regex: 'FBMD/80E5;' + model: 'G50-80' - regex: 'FBMD/80SM;' model: 'Ideapad 310-15ISK' - regex: 'FBMD/80VR;' From dffbe4be3ea352793b483f91251378b657a3ec8b Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:15:47 +0200 Subject: [PATCH 21/49] Adds detection for Asus X550LB --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index f4732b4cf9..667681a051 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -339,3 +339,20 @@ model: G50-80 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/X550LB;FBSN/Windows;FBSV/10.0.16299.64;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: notebook + brand: AU + model: X550LB + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 01eae578f8..b8c204d143 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -15,7 +15,7 @@ Acer: model: 'One 10' Asus: - regex: 'FBMD/(?:K50IN|K54L|T100HAN|T103HAF|X555LN|X556UQK);' + regex: 'FBMD/(?:K50IN|K54L|T100HAN|T103HAF|X550LB|X555LN|X556UQK);' device: 'notebook' models: - regex: 'FBMD/K50IN;' @@ -26,6 +26,8 @@ Asus: model: 'Transformer Book' - regex: 'FBMD/T103HAF;' model: 'Transformer Mini' + - regex: 'FBMD/X550LB;' + model: 'X550LB' - regex: 'FBMD/X555LN;' model: 'X555LN' - regex: 'FBMD/X556UQK;' From a14ffde1edefba891f8eeb1e8d7eed258088d6ff Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:18:07 +0200 Subject: [PATCH 22/49] Adds detection for Asus X553MA --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 667681a051..8ef63a3673 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -356,3 +356,20 @@ model: X550LB os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.693; osmeta 8.3.47029472) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.47029472 Build/47029472 [FBAN/FBW;FBAV/75.0.0.50.22;FBBV/47052341;FBRV/0;FBDV/WindowsDevice;FBMD/X553MA;FBSN/Windows;FBSV/10.0.14393.693;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "75.0.0.50.22" + device: + type: notebook + brand: AU + model: X553MA + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index b8c204d143..f0f81b682d 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -15,7 +15,7 @@ Acer: model: 'One 10' Asus: - regex: 'FBMD/(?:K50IN|K54L|T100HAN|T103HAF|X550LB|X555LN|X556UQK);' + regex: 'FBMD/(?:K50IN|K54L|T100HAN|T103HAF|X550LB|X553MA|X555LN|X556UQK);' device: 'notebook' models: - regex: 'FBMD/K50IN;' @@ -28,6 +28,8 @@ Asus: model: 'Transformer Mini' - regex: 'FBMD/X550LB;' model: 'X550LB' + - regex: 'FBMD/X553MA;' + model: 'X553MA' - regex: 'FBMD/X555LN;' model: 'X555LN' - regex: 'FBMD/X556UQK;' From 219f7c042d7e74e4a3c98636dc65530facbded5b Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:26:54 +0200 Subject: [PATCH 23/49] Adds detection for Schneider Notebook 14" Cherry Trail --- Parser/Device/DeviceParserAbstract.php | 1 + Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 5 +++++ 3 files changed, 23 insertions(+) diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php index 389cb9e3f6..3e2fbdf582 100644 --- a/Parser/Device/DeviceParserAbstract.php +++ b/Parser/Device/DeviceParserAbstract.php @@ -517,6 +517,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'SQ' => 'Santin', 'SA' => 'Samsung', 'S0' => 'Sanei', + 'C0' => 'Schneider', 'SD' => 'Sega', 'SL' => 'Selfix', 'SE' => 'Sony Ericsson', diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 8ef63a3673..d770302c3e 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -373,3 +373,20 @@ model: X553MA os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.98; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/SCL141CTP;FBSN/Windows;FBSV/10.0.16299.192;FBSS/2;FBCR/;FBID/desktop;FBLC/fr_FR;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: C0 + model: Notebook 14" Cherry Trail + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index f0f81b682d..f385ce4e16 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -70,6 +70,11 @@ Lenovo: - regex: 'FBMD/80VR;' model: 'Legion Y720' +Schneider: + regex: 'FBMD/SCL141CTP;' + device: 'notebook' + model: 'Notebook 14" Cherry Trail' + Thomson: regex: 'FBMD/TH360R12.32CTW;' device: 'notebook' From 25bcc24c332e3c31ccd5f0a47f01517a87e0bdc2 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:29:12 +0200 Subject: [PATCH 24/49] Adds detection for Lenovo ThinkPad Helix 3702 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index d770302c3e..1d43085cdf 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -390,3 +390,20 @@ model: Notebook 14" Cherry Trail os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/37021C5;FBSN/Windows;FBSV/10.0.16299.334;FBSS/2;FBCR/;FBID/desktop;FBLC/fr_FR;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: LE + model: ThinkPad Helix 3702 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index f385ce4e16..1233b501e3 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -60,9 +60,11 @@ HP: model: 'Spectre x360' Lenovo: - regex: 'FBMD/(?:80E5|80SM|80VR);' + regex: 'FBMD/(?:37021C5|80E5|80SM|80VR);' device: 'notebook' models: + - regex: 'FBMD/37021C5;' + model: 'ThinkPad Helix 3702' - regex: 'FBMD/80E5;' model: 'G50-80' - regex: 'FBMD/80SM;' From 7f1192caf0907fcac636d459474f5286317a26c0 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:33:41 +0200 Subject: [PATCH 25/49] Adds detection for Dell Latitude E4300 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 8 ++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 1d43085cdf..2bea165428 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -407,3 +407,20 @@ model: ThinkPad Helix 3702 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.1914; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Latitude E4300;FBSN/Windows;FBSV/10.0.14393.1914;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: notebook + brand: DL + model: Latitude E4300 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 1233b501e3..4f906e5cd3 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -36,9 +36,13 @@ Asus: model: 'X556UQK' Dell: - regex: 'FBMD/XPS 15 9530;' + regex: 'FBMD/(?:Latitude E4300|XPS 15 9530);' device: 'notebook' - model: 'XPS 15 9530' + models: + - regex: 'Latitude E4300' + model: 'Latitude E4300' + - regex: 'XPS 15 9530' + model: 'XPS 15 9530' HP: regex: 'FBMD/HP ' From d34e88108892848e6ec3a5ce71477e8220214b87 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:43:42 +0200 Subject: [PATCH 26/49] Adds detection for HP ProBook 6560b --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 2 ++ 2 files changed, 19 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 2bea165428..55e509393c 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -424,3 +424,20 @@ model: Latitude E4300 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.10586.494; osmeta 8.3.34265222) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.34265222 Build/34265222 [FBAN/FBW;FBAV/60.0.0.36.138;FBBV/34282524;FBRV/0;FBDV/WindowsDevice;FBMD/HP ProBook 6560b;FBSN/Windows;FBSV/10.0.10586.494;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "60.0.0.36.138" + device: + type: notebook + brand: HP + model: ProBook 6560b + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 4f906e5cd3..8830fbdfb2 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -56,6 +56,8 @@ HP: model: 'ENVY x360 Convertible PC' - regex: 'HP EliteBook 2570p' model: 'EliteBook 2570p' + - regex: 'HP ProBook 6560b' + model: 'ProBook 6560b' - regex: 'HP Pavilion dv6 Notebook PC' model: 'Pavilion dv6' - regex: 'HP Pavilion Notebook' From a78b80d0a8f82147eb386a6c21ec656316867cd1 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 19:47:47 +0200 Subject: [PATCH 27/49] Adds detection for HP Pavilion 24-r0xx All-in-One Desktop PC --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 3 +++ 2 files changed, 20 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 55e509393c..2a138a87f2 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -441,3 +441,20 @@ model: ProBook 6560b os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.648; osmeta 10.3.31799) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.31799 Build/31799 [FBAN/FBW;FBAV/186.0.0.83.783;FBBV/143636256;FBMD/HP Pavilion All-in-One 24-r0xx;FBSN/Windows;FBSV/10.0.17134.765;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "186.0.0.83.783" + device: + type: desktop + brand: HP + model: Pavilion 24-r0xx All-in-One Desktop PC + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 8830fbdfb2..e28099edb2 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -64,6 +64,9 @@ HP: 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' Lenovo: regex: 'FBMD/(?:37021C5|80E5|80SM|80VR);' From aa82beb48d887041547db48ed2cdd0d47801df03 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 20:12:34 +0200 Subject: [PATCH 28/49] Adds detection for Dell XPS 15 9550 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 2a138a87f2..3bac7b62a9 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -458,3 +458,20 @@ model: Pavilion 24-r0xx All-in-One Desktop PC os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.19; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/XPS 15 9550;FBSN/Windows;FBSV/10.0.16299.64;FBSS/2;FBCR/;FBID/desktop;FBLC/ko_KR;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: notebook + brand: DL + model: XPS 15 9550 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index e28099edb2..e4bd6bddc7 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -36,13 +36,15 @@ Asus: model: 'X556UQK' Dell: - regex: 'FBMD/(?:Latitude E4300|XPS 15 9530);' + regex: 'FBMD/(?:Latitude E4300|XPS 15 95[35]0);' device: 'notebook' models: - regex: 'Latitude E4300' model: 'Latitude E4300' - regex: 'XPS 15 9530' model: 'XPS 15 9530' + - regex: 'XPS 15 9550' + model: 'XPS 15 9550' HP: regex: 'FBMD/HP ' From 82241bd2675d6d901f89cb54175597c4e03ef974 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 20:19:57 +0200 Subject: [PATCH 29/49] Adds detection for Asus ZenBook Flip --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 3bac7b62a9..f1bc56f867 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -475,3 +475,20 @@ model: XPS 15 9550 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/UX360CAK;FBSN/Windows;FBSV/10.0.16299.248;FBSS/2;FBCR/;FBID/desktop;FBLC/pl_PL;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: AU + model: ZenBook Flip + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index e4bd6bddc7..52b9c8176b 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -15,7 +15,7 @@ Acer: model: 'One 10' Asus: - regex: 'FBMD/(?:K50IN|K54L|T100HAN|T103HAF|X550LB|X553MA|X555LN|X556UQK);' + regex: 'FBMD/(?:K50IN|K54L|T100HAN|T103HAF|UX360CAK|X550LB|X553MA|X555LN|X556UQK);' device: 'notebook' models: - regex: 'FBMD/K50IN;' @@ -26,6 +26,8 @@ Asus: model: 'Transformer Book' - regex: 'FBMD/T103HAF;' model: 'Transformer Mini' + - regex: 'FBMD/UX360CAK;' + model: 'ZenBook Flip' - regex: 'FBMD/X550LB;' model: 'X550LB' - regex: 'FBMD/X553MA;' From 0fd7a3b7e5e817f961dbe2fafe94162bbade7a43 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 20:20:31 +0200 Subject: [PATCH 30/49] Adds detection for Acer Aspire E5-421G --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index f1bc56f867..843b9dc380 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -492,3 +492,20 @@ model: ZenBook Flip os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.187; osmeta 8.3.40109042) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.40109042 Build/40109042 [FBAN/FBW;FBAV/65.0.0.44.139;FBBV/40161482;FBRV/0;FBDV/WindowsDevice;FBMD/Aspire E5-421G;FBSN/Windows;FBSV/10.0.14393.321;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "65.0.0.44.139" + device: + type: notebook + brand: AC + model: Aspire E5-421G + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 52b9c8176b..972d4d45eb 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -6,9 +6,11 @@ ############### Acer: - regex: 'FBMD/(?:Z5WAL|One S1003);' + regex: 'FBMD/(?:Aspire E5-421G|Z5WAL|One S1003);' device: 'notebook' models: + - regex: 'FBMD/Aspire E5-421G;' + model: 'Aspire E5-421G' - regex: 'FBMD/Z5WAL;' model: 'Aspire E5-511' - regex: 'FBMD/One S1003;' From bac8db525cfae0d1fdbd5c2a1b49f66e7f774a1b Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 20:36:16 +0200 Subject: [PATCH 31/49] Adds detection for Dell Inspiron 3541 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 843b9dc380..86fc5c7264 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -509,3 +509,20 @@ model: Aspire E5-421G os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.165; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Inspiron 3541;FBSN/Windows;FBSV/10.0.17134.228;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: DL + model: Inspiron 3541 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 972d4d45eb..86597bc9a4 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -40,11 +40,13 @@ Asus: model: 'X556UQK' Dell: - regex: 'FBMD/(?:Latitude E4300|XPS 15 95[35]0);' + regex: 'FBMD/(?:Latitude E4300|Inspiron 3541|XPS 15 95[35]0);' device: 'notebook' 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' From b06dcf6aa9366176e83b9cfce7eda24d04a004b8 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 20:40:30 +0200 Subject: [PATCH 32/49] Adds detection for HP Compaq Presario CQ61 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 86fc5c7264..c467041f55 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -526,3 +526,20 @@ model: Inspiron 3541 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.608; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Compaq Presario CQ61 Notebook PC;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: notebook + brand: HP + model: Compaq Presario CQ61 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 86597bc9a4..4f635db8fe 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -53,9 +53,11 @@ Dell: model: 'XPS 15 9550' HP: - regex: 'FBMD/HP ' + regex: 'FBMD/(?:Compaq|HP) ' device: 'notebook' models: + - regex: 'Compaq Presario CQ61 Notebook PC' + model: 'Compaq Presario CQ61' - regex: 'HP Pavilion x2 Detachable' model: 'Pavilion x2' - regex: 'HP Laptop 15-bs0xx' From c9426997088aa00c12bee5dba03e1bf0895e8dd9 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 20:46:58 +0200 Subject: [PATCH 33/49] Adds detection for HP Pavilion TouchSmart 23-f364 All-in-One Desktop PC --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index c467041f55..ecdfb6815e 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -543,3 +543,20 @@ model: Compaq Presario CQ61 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.10586.494; osmeta 8.3.35371798) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.35371798 Build/35371798 [FBAN/FBW;FBAV/61.0.0.46.152;FBBV/35404853;FBRV/0;FBDV/WindowsDevice;FBMD/23-f364;FBSN/Windows;FBSV/10.0.10586.494;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "61.0.0.46.152" + device: + type: desktop + brand: HP + model: Pavilion TouchSmart 23-f364 All-in-One Desktop PC + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 4f635db8fe..86a4f6557a 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -53,7 +53,7 @@ Dell: model: 'XPS 15 9550' HP: - regex: 'FBMD/(?:Compaq|HP) ' + regex: 'FBMD/((?:Compaq|HP) |23-f364)' device: 'notebook' models: - regex: 'Compaq Presario CQ61 Notebook PC' @@ -77,6 +77,9 @@ HP: - 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);' From cb2b2ca2dc4c6a2de387d00a49c225013c351027 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 20:50:58 +0200 Subject: [PATCH 34/49] Adds detection for Toshiba Satellite L650 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 7 +++++++ 2 files changed, 24 insertions(+) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index ecdfb6815e..4c680b77bb 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -560,3 +560,20 @@ model: Pavilion TouchSmart 23-f364 All-in-One Desktop PC os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Satellite L650;FBSN/Windows;FBSV/10.0.15063.729;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: notebook + brand: TS + model: Satellite L650 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 86a4f6557a..2bda7a59be 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -103,3 +103,10 @@ Thomson: regex: 'FBMD/TH360R12.32CTW;' device: 'notebook' model: 'Prestige TH-360R12.32CTW' + +Toshiba: + regex: 'FBMD/Satellite ' + device: 'notebook' + models: + - regex: 'Satellite L650' + model: 'Satellite L650' From dd96eac65efce5b3bbe3a224e925a6dbe91f0e5d Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 21:08:15 +0200 Subject: [PATCH 35/49] Adds detection for Toshiba Satellite S855 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 4c680b77bb..acdbcdb646 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -577,3 +577,20 @@ model: Satellite L650 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Satellite S855;FBSN/Windows;FBSV/10.0.16299.64;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: notebook + brand: TS + model: Satellite S855 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 2bda7a59be..7bfb416aea 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -108,5 +108,5 @@ Toshiba: regex: 'FBMD/Satellite ' device: 'notebook' models: - - regex: 'Satellite L650' - model: 'Satellite L650' + - regex: 'Satellite (L650|S855)' + model: 'Satellite $1' From b9284953a8ba82bee16ab1244ab5fe337ee16ee7 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 21:09:41 +0200 Subject: [PATCH 36/49] Adds detection for Toshiba Satellite C650 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index acdbcdb646..4abac5ec12 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -594,3 +594,20 @@ model: Satellite S855 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.786; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Satellite C650;FBSN/Windows;FBSV/10.0.16299.125;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: TS + model: Satellite C650 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 7bfb416aea..862a17e075 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -108,5 +108,5 @@ Toshiba: regex: 'FBMD/Satellite ' device: 'notebook' models: - - regex: 'Satellite (L650|S855)' + - regex: 'Satellite (C650|L650|S855)' model: 'Satellite $1' From fa688caf6dd2d63c1b9cb0355a0dcde74bccb3ad Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 21:14:54 +0200 Subject: [PATCH 37/49] Adds detection for Toshiba Satellite A200 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/mobiles.yml | 2 +- regexes/device/notebooks.yml | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 4abac5ec12..aee76db62a 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -611,3 +611,20 @@ model: Satellite C650 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.248; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Satellite A200;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: notebook + brand: TS + model: Satellite A200 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index bcaee1f2e7..bd6f574687 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -774,7 +774,7 @@ Bravis: # Acer Acer: - regex: 'acer|(? Date: Tue, 5 May 2020 21:23:11 +0200 Subject: [PATCH 38/49] Adds generic detection for Toshiba Satellite notebooks --- regexes/device/notebooks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index d62d2dbe1f..1497e0b895 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -110,3 +110,5 @@ Toshiba: models: - regex: 'Satellite (A200|C650|L650|S855)' model: 'Satellite $1' + - regex: 'Satellite ([^;\)]+);' + model: 'Satellite $1' From 6aaa34bd8ecd1201f591bc25b767d36c5d43451a Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 21:24:51 +0200 Subject: [PATCH 39/49] Adds detection for Toshiba Satellite C855 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index aee76db62a..b558bac5c8 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -628,3 +628,20 @@ model: Satellite A200 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.10586.545; osmeta 8.3.35371798) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.35371798 Build/35371798 [FBAN/FBW;FBAV/61.0.0.46.152;FBBV/35404853;FBRV/0;FBDV/WindowsDevice;FBMD/Satellite C855;FBSN/Windows;FBSV/10.0.10586.545;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "61.0.0.46.152" + device: + type: notebook + brand: TS + model: Satellite C855 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 1497e0b895..59cbb3034b 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -108,7 +108,7 @@ Toshiba: regex: 'FBMD/Satellite ' device: 'notebook' models: - - regex: 'Satellite (A200|C650|L650|S855)' + - regex: 'Satellite (A200|C650|C855|L650|S855)' model: 'Satellite $1' - regex: 'Satellite ([^;\)]+);' model: 'Satellite $1' From 3aa74b2772d93f8cd4cadf8ac2fe7f14f062ac23 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 21:26:31 +0200 Subject: [PATCH 40/49] Adds detection for Toshiba Satellite A500 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index b558bac5c8..709ef393a3 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -645,3 +645,20 @@ model: Satellite C855 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.321; osmeta 8.3.41395199) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.41395199 Build/41395199 [FBAN/FBW;FBAV/67.0.0.13.140;FBBV/41468129;FBRV/0;FBDV/WindowsDevice;FBMD/Satellite A500;FBSN/Windows;FBSV/10.0.14393.321;FBSS/1;FBCR/;FBID/desktop;FBLC/en_GB;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "67.0.0.13.140" + device: + type: notebook + brand: TS + model: Satellite A500 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 59cbb3034b..b84a0ac6b8 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -108,7 +108,7 @@ Toshiba: regex: 'FBMD/Satellite ' device: 'notebook' models: - - regex: 'Satellite (A200|C650|C855|L650|S855)' + - regex: 'Satellite (A[25]00|C650|C855|L650|S855)' model: 'Satellite $1' - regex: 'Satellite ([^;\)]+);' model: 'Satellite $1' From 79613fb6e129ea357039c50874f7384b6e1ff91e Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 21:42:25 +0200 Subject: [PATCH 41/49] Adds detection for HP ProBook 6360b --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 709ef393a3..e30f8a5657 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -662,3 +662,20 @@ model: Satellite A500 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.765; osmeta 10.3.31799) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.31799 Build/31799 [FBAN/FBW;FBAV/186.0.0.83.783;FBBV/143636256;FBDV/HPProBook6360bLG633EA#AK8;FBMD/HP ProBook 6360b;FBSN/Windows;FBSV/10.0.17134.765;FBSS/1;FBCR/;FBID/desktop;FBLC/sv_SE;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "186.0.0.83.783" + device: + type: notebook + brand: HP + model: ProBook 6360b + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index b84a0ac6b8..452bef514d 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -66,8 +66,8 @@ HP: model: 'ENVY x360 Convertible PC' - regex: 'HP EliteBook 2570p' model: 'EliteBook 2570p' - - regex: 'HP ProBook 6560b' - model: 'ProBook 6560b' + - regex: 'HP ProBook (6[35]60b)' + model: 'ProBook $1' - regex: 'HP Pavilion dv6 Notebook PC' model: 'Pavilion dv6' - regex: 'HP Pavilion Notebook' From 288c7905cf2e9b4eb74e489ea26cd1dcd174d4b2 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 21:46:23 +0200 Subject: [PATCH 42/49] Adds detection for HP ProBook 440 G5 --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index e30f8a5657..62291f1bae 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -679,3 +679,20 @@ model: ProBook 6360b os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.285; osmeta 10.3.8763) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.8763 Build/8763 [FBAN/FBW;FBAV/171.0.0.36.0;FBBV/123386314;FBDV/HPProBook440G52SZ73AV;FBMD/HP ProBook 440 G5;FBSN/Wind' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "171.0.0.36.0" + device: + type: notebook + brand: HP + model: ProBook 440 G5 + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 452bef514d..84c39da011 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -66,7 +66,7 @@ HP: model: 'ENVY x360 Convertible PC' - regex: 'HP EliteBook 2570p' model: 'EliteBook 2570p' - - regex: 'HP ProBook (6[35]60b)' + - regex: 'HP ProBook (440 G5|6[35]60b)' model: 'ProBook $1' - regex: 'HP Pavilion dv6 Notebook PC' model: 'Pavilion dv6' From 398d45eef4ec274f5ed0c3dd1ea52b7163f2a04d Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 21:50:10 +0200 Subject: [PATCH 43/49] Adds detection for HP EliteBook 2560p --- Tests/fixtures/notebook.yml | 17 +++++++++++++++++ regexes/device/notebooks.yml | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/notebook.yml index 62291f1bae..83562388ef 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/notebook.yml @@ -696,3 +696,20 @@ model: ProBook 440 G5 os_family: Windows browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17763.379; osmeta 10.3.31799) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.31799 Build/31799 [FBAN/FBW;FBAV/186.0.0.83.783;FBBV/143636256;FBDV/HPEliteBook2560pLG669EA#AK8;FBMD/HP EliteBook 2560p;FBSN/Windows;FBSV/10.0.17763.503;FBSS/1;FBCR/;FBID/desktop;FBLC/sv_SE;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "186.0.0.83.783" + device: + type: notebook + brand: HP + model: EliteBook 2560p + os_family: Windows + browser_family: Unknown diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 84c39da011..8de9285f9e 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -64,8 +64,8 @@ HP: model: '15 Laptop PC' - regex: 'HP ENVY x360 Convertible 15-bp0xx' model: 'ENVY x360 Convertible PC' - - regex: 'HP EliteBook 2570p' - model: 'EliteBook 2570p' + - 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' From 81a1dc4ec312901f03da65b2e27ff271e6aa7d87 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Tue, 5 May 2020 23:18:12 +0200 Subject: [PATCH 44/49] Fix --- misc/statistics.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/statistics.php b/misc/statistics.php index 36e03ea0b5..73ea95efc8 100644 --- a/misc/statistics.php +++ b/misc/statistics.php @@ -110,6 +110,6 @@ function format($str, $length) format($deviceTypes[8], $parsedUAs), getPercentage($deviceTypes[8], $parsedUAs), format($deviceTypes[9], $parsedUAs), getPercentage($deviceTypes[9], $parsedUAs), format($deviceTypes[10], $parsedUAs), getPercentage($deviceTypes[10], $parsedUAs), - format($deviceTypes[10], $parsedUAs), getPercentage($deviceTypes[13], $parsedUAs), + format($deviceTypes[13], $parsedUAs), getPercentage($deviceTypes[13], $parsedUAs), format($unknownDeviceTypes, $parsedUAs), getPercentage($unknownDeviceTypes, $parsedUAs) ); From 2d039b65826beec6fcd175b66b4c69f970f67b6a Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 11 Aug 2020 22:29:26 +0200 Subject: [PATCH 45/49] detect notebooks as desktop devices --- DeviceDetector.php | 1 - Parser/Device/DeviceParserAbstract.php | 4 +- Parser/Device/Notebook.php | 4 +- Tests/DeviceDetectorTest.php | 1 - Tests/Parser/Devices/fixtures/notebook.yml | 2 +- .../fixtures/{notebook.yml => desktop-1.yml} | 80 +++++++++---------- Tests/fixtures/smartphone-3.yml | 14 ++-- regexes/device/notebooks.yml | 16 ++-- 8 files changed, 59 insertions(+), 63 deletions(-) rename Tests/fixtures/{notebook.yml => desktop-1.yml} (97%) diff --git a/DeviceDetector.php b/DeviceDetector.php index 83249772c1..780f1bae51 100644 --- a/DeviceDetector.php +++ b/DeviceDetector.php @@ -34,7 +34,6 @@ * @method boolean isTV() * @method boolean isSmartDisplay() * @method boolean isCamera() - * @method boolean isNotebook() * * Magic Client Type Methods * @method boolean isBrowser() diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php index bbd2deef22..0bb7223650 100644 --- a/Parser/Device/DeviceParserAbstract.php +++ b/Parser/Device/DeviceParserAbstract.php @@ -35,7 +35,6 @@ abstract class DeviceParserAbstract extends ParserAbstract const DEVICE_TYPE_PHABLET = 10; const DEVICE_TYPE_SMART_SPEAKER = 11; const DEVICE_TYPE_WEARABLE = 12; // including set watches, headsets - const DEVICE_TYPE_NOTEBOOK = 13; /** * Detectable device types @@ -56,7 +55,6 @@ abstract class DeviceParserAbstract extends ParserAbstract 'phablet' => self::DEVICE_TYPE_PHABLET, 'smart speaker' => self::DEVICE_TYPE_SMART_SPEAKER, 'wearable' => self::DEVICE_TYPE_WEARABLE, - 'notebook' => self::DEVICE_TYPE_NOTEBOOK, ); /** @@ -154,7 +152,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'CH' => 'Cherry Mobile', '1C' => 'Chuwi', 'L8' => 'Clarmin', - 'C0' => 'Clout', + 'CZ' => 'Clout', 'CK' => 'Cricket', 'C1' => 'Crosscall', 'CL' => 'Compal', diff --git a/Parser/Device/Notebook.php b/Parser/Device/Notebook.php index e76528d79a..fea7ee08d4 100644 --- a/Parser/Device/Notebook.php +++ b/Parser/Device/Notebook.php @@ -10,7 +10,7 @@ /** * Class Notebook * - * Device parser for notebook detection + * Device parser for notebook detection in Facebook useragents * * @package DeviceDetector\Parser\Device */ @@ -21,7 +21,7 @@ class Notebook extends DeviceParserAbstract public function parse() { - if (!$this->preMatchOverall()) { + if (!$this->matchUserAgent('FBMD/')) { return false; } diff --git a/Tests/DeviceDetectorTest.php b/Tests/DeviceDetectorTest.php index c27c2764f5..041b81b85d 100644 --- a/Tests/DeviceDetectorTest.php +++ b/Tests/DeviceDetectorTest.php @@ -313,7 +313,6 @@ public function testMagicMMethods() $this->assertFalse($dd->isConsole()); $this->assertFalse($dd->isPortableMediaPlayer()); $this->assertFalse($dd->isCamera()); - $this->assertFalse($dd->isNotebook()); $this->assertTrue($dd->isBrowser()); $this->assertFalse($dd->isLibrary()); diff --git a/Tests/Parser/Devices/fixtures/notebook.yml b/Tests/Parser/Devices/fixtures/notebook.yml index b3e981555d..816d14881f 100644 --- a/Tests/Parser/Devices/fixtures/notebook.yml +++ b/Tests/Parser/Devices/fixtures/notebook.yml @@ -2,6 +2,6 @@ - user_agent: Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80VR;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0] device: - type: 13 + type: 0 brand: LE model: Legion Y720 diff --git a/Tests/fixtures/notebook.yml b/Tests/fixtures/desktop-1.yml similarity index 97% rename from Tests/fixtures/notebook.yml rename to Tests/fixtures/desktop-1.yml index 83562388ef..1251f3d896 100644 --- a/Tests/fixtures/notebook.yml +++ b/Tests/fixtures/desktop-1.yml @@ -11,7 +11,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: LE model: Legion Y720 os_family: Windows @@ -28,7 +28,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: AC model: Aspire E5-511 os_family: Windows @@ -45,7 +45,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: DL model: XPS 15 9530 os_family: Windows @@ -62,7 +62,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: LE model: Ideapad 310-15ISK os_family: Windows @@ -79,7 +79,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: TN model: Prestige TH-360R12.32CTW os_family: Windows @@ -96,7 +96,7 @@ name: Facebook version: "140.0.0.205.179" device: - type: notebook + type: desktop brand: HP model: Pavilion x2 os_family: Windows @@ -113,7 +113,7 @@ name: Facebook version: "140.0.0.205.179" device: - type: notebook + type: desktop brand: HP model: 15 Laptop PC os_family: Windows @@ -130,7 +130,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: HP model: ENVY x360 Convertible PC os_family: Windows @@ -147,7 +147,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: HP model: EliteBook 2570p os_family: Windows @@ -164,7 +164,7 @@ name: Facebook version: "140.0.0.205.179" device: - type: notebook + type: desktop brand: HP model: Pavilion dv6 os_family: Windows @@ -181,7 +181,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: HP model: Pavilion os_family: Windows @@ -198,7 +198,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: HP model: Spectre x360 os_family: Windows @@ -215,7 +215,7 @@ name: Facebook version: "140.0.0.205.179" device: - type: notebook + type: desktop brand: AU model: Transformer Book os_family: Windows @@ -232,7 +232,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: AU model: Transformer Mini os_family: Windows @@ -249,7 +249,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: AU model: X555LN os_family: Windows @@ -266,7 +266,7 @@ name: Facebook version: "140.0.0.205.179" device: - type: notebook + type: desktop brand: AU model: K50IN os_family: Windows @@ -283,7 +283,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: AC model: One 10 os_family: Windows @@ -300,7 +300,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: AU model: X556UQK os_family: Windows @@ -317,7 +317,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: AU model: K54L os_family: Windows @@ -334,7 +334,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: LE model: G50-80 os_family: Windows @@ -351,7 +351,7 @@ name: Facebook version: "140.0.0.205.179" device: - type: notebook + type: desktop brand: AU model: X550LB os_family: Windows @@ -368,7 +368,7 @@ name: Facebook version: "75.0.0.50.22" device: - type: notebook + type: desktop brand: AU model: X553MA os_family: Windows @@ -385,7 +385,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: C0 model: Notebook 14" Cherry Trail os_family: Windows @@ -402,7 +402,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: LE model: ThinkPad Helix 3702 os_family: Windows @@ -419,7 +419,7 @@ name: Facebook version: "140.0.0.205.179" device: - type: notebook + type: desktop brand: DL model: Latitude E4300 os_family: Windows @@ -436,7 +436,7 @@ name: Facebook version: "60.0.0.36.138" device: - type: notebook + type: desktop brand: HP model: ProBook 6560b os_family: Windows @@ -470,7 +470,7 @@ name: Facebook version: "140.0.0.205.179" device: - type: notebook + type: desktop brand: DL model: XPS 15 9550 os_family: Windows @@ -487,7 +487,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: AU model: ZenBook Flip os_family: Windows @@ -504,7 +504,7 @@ name: Facebook version: "65.0.0.44.139" device: - type: notebook + type: desktop brand: AC model: Aspire E5-421G os_family: Windows @@ -521,7 +521,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: DL model: Inspiron 3541 os_family: Windows @@ -538,7 +538,7 @@ name: Facebook version: "140.0.0.205.179" device: - type: notebook + type: desktop brand: HP model: Compaq Presario CQ61 os_family: Windows @@ -572,7 +572,7 @@ name: Facebook version: "140.0.0.205.179" device: - type: notebook + type: desktop brand: TS model: Satellite L650 os_family: Windows @@ -589,7 +589,7 @@ name: Facebook version: "140.0.0.205.179" device: - type: notebook + type: desktop brand: TS model: Satellite S855 os_family: Windows @@ -606,7 +606,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: TS model: Satellite C650 os_family: Windows @@ -623,7 +623,7 @@ name: Facebook version: "140.0.0.232.179" device: - type: notebook + type: desktop brand: TS model: Satellite A200 os_family: Windows @@ -640,7 +640,7 @@ name: Facebook version: "61.0.0.46.152" device: - type: notebook + type: desktop brand: TS model: Satellite C855 os_family: Windows @@ -657,7 +657,7 @@ name: Facebook version: "67.0.0.13.140" device: - type: notebook + type: desktop brand: TS model: Satellite A500 os_family: Windows @@ -674,7 +674,7 @@ name: Facebook version: "186.0.0.83.783" device: - type: notebook + type: desktop brand: HP model: ProBook 6360b os_family: Windows @@ -691,7 +691,7 @@ name: Facebook version: "171.0.0.36.0" device: - type: notebook + type: desktop brand: HP model: ProBook 440 G5 os_family: Windows @@ -708,7 +708,7 @@ name: Facebook version: "186.0.0.83.783" device: - type: notebook + type: desktop brand: HP model: EliteBook 2560p os_family: Windows diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml index a6e2835ce1..beafce9ba8 100644 --- a/Tests/fixtures/smartphone-3.yml +++ b/Tests/fixtures/smartphone-3.yml @@ -155,7 +155,7 @@ engine_version: "" device: type: smartphone - brand: C0 + brand: CZ model: Hind 5.1 os_family: Android browser_family: Chrome @@ -175,7 +175,7 @@ engine_version: "528.5" device: type: smartphone - brand: C0 + brand: CZ model: X417 Amaze os_family: Android browser_family: Unknown @@ -192,7 +192,7 @@ version: "176.0.0.42.87" device: type: smartphone - brand: C0 + brand: CZ model: X418 Zest os_family: Android browser_family: Unknown @@ -212,7 +212,7 @@ engine_version: "" device: type: smartphone - brand: C0 + brand: CZ model: X421 Nova os_family: Android browser_family: Opera @@ -232,7 +232,7 @@ engine_version: "" device: type: smartphone - brand: C0 + brand: CZ model: X422 Exotic os_family: Android browser_family: Chrome @@ -252,7 +252,7 @@ engine_version: "" device: type: smartphone - brand: C0 + brand: CZ model: X425 Shavit os_family: Android browser_family: Chrome @@ -272,7 +272,7 @@ engine_version: "" device: type: smartphone - brand: C0 + brand: CZ model: X428 Astute os_family: Android browser_family: Chrome diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 8de9285f9e..860cd995bf 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -7,7 +7,7 @@ Acer: regex: 'FBMD/(?:Aspire E5-421G|Z5WAL|One S1003);' - device: 'notebook' + device: 'desktop' models: - regex: 'FBMD/Aspire E5-421G;' model: 'Aspire E5-421G' @@ -18,7 +18,7 @@ Acer: Asus: regex: 'FBMD/(?:K50IN|K54L|T100HAN|T103HAF|UX360CAK|X550LB|X553MA|X555LN|X556UQK);' - device: 'notebook' + device: 'desktop' models: - regex: 'FBMD/K50IN;' model: 'K50IN' @@ -41,7 +41,7 @@ Asus: Dell: regex: 'FBMD/(?:Latitude E4300|Inspiron 3541|XPS 15 95[35]0);' - device: 'notebook' + device: 'desktop' models: - regex: 'Latitude E4300' model: 'Latitude E4300' @@ -54,7 +54,7 @@ Dell: HP: regex: 'FBMD/((?:Compaq|HP) |23-f364)' - device: 'notebook' + device: 'desktop' models: - regex: 'Compaq Presario CQ61 Notebook PC' model: 'Compaq Presario CQ61' @@ -83,7 +83,7 @@ HP: Lenovo: regex: 'FBMD/(?:37021C5|80E5|80SM|80VR);' - device: 'notebook' + device: 'desktop' models: - regex: 'FBMD/37021C5;' model: 'ThinkPad Helix 3702' @@ -96,17 +96,17 @@ Lenovo: Schneider: regex: 'FBMD/SCL141CTP;' - device: 'notebook' + device: 'desktop' model: 'Notebook 14" Cherry Trail' Thomson: regex: 'FBMD/TH360R12.32CTW;' - device: 'notebook' + device: 'desktop' model: 'Prestige TH-360R12.32CTW' Toshiba: regex: 'FBMD/Satellite ' - device: 'notebook' + device: 'desktop' models: - regex: 'Satellite (A[25]00|C650|C855|L650|S855)' model: 'Satellite $1' From 255332d9548e271f040b7dd83696a5f9efad1754 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 11 Aug 2020 22:34:18 +0200 Subject: [PATCH 46/49] sort test fixtures --- Tests/fixtures/desktop-1.yml | 715 ------------------------------ Tests/fixtures/desktop.yml | 730 ++++++++++++++++++++++++++++++- Tests/fixtures/phablet.yml | 28 +- Tests/fixtures/smartphone-1.yml | 40 +- Tests/fixtures/smartphone-11.yml | 40 +- Tests/fixtures/smartphone-13.yml | 34 +- Tests/fixtures/smartphone-3.yml | 274 ++++++------ Tests/fixtures/smartphone-6.yml | 40 +- Tests/fixtures/smartphone-9.yml | 358 +++++++-------- 9 files changed, 1129 insertions(+), 1130 deletions(-) delete mode 100644 Tests/fixtures/desktop-1.yml diff --git a/Tests/fixtures/desktop-1.yml b/Tests/fixtures/desktop-1.yml deleted file mode 100644 index 1251f3d896..0000000000 --- a/Tests/fixtures/desktop-1.yml +++ /dev/null @@ -1,715 +0,0 @@ ---- -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80VR;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: LE - model: Legion Y720 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Z5WAL;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: AC - model: Aspire E5-511 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/XPS 15 9530;FBSN/Windows;FBSV/10.0.16299.309;FBSS/2;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: DL - model: XPS 15 9530 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.786; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80SM;FBSN/Windows;FBSV/10.0.16299.309;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: LE - model: Ideapad 310-15ISK - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/TH360R12.32CTW;FBSN/Windows;FBSV/10.0.16299.192;FBSS/1;FBCR/;FBID/desktop;FBLC/fr_FR;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: TN - model: Prestige TH-360R12.32CTW - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.19; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/HP Pavilion x2 Detachable;FBSN/Windows;FBSV/10.0.16299.64;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.205.179" - device: - type: desktop - brand: HP - model: Pavilion x2 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/HP Laptop 15-bs0xx;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.205.179" - device: - type: desktop - brand: HP - model: 15 Laptop PC - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP ENVY x360 Convertible 15-bp0xx;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: HP - model: ENVY x360 Convertible PC - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP EliteBook 2570p;FBSN/Windows;FBSV/10.0.17134.112;FBSS/1;FBCR/;FBID/desktop;FBLC/it_IT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: HP - model: EliteBook 2570p - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/HP Pavilion dv6 Notebook PC;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.205.179" - device: - type: desktop - brand: HP - model: Pavilion dv6 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP Pavilion Notebook;FBSN/Windows;FBSV/10.0.16299.431;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: HP - model: Pavilion - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP Spectre x360 Convertible;FBSN/Windows;FBSV/10.0.16299.309;FBSS/2;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: HP - model: Spectre x360 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.1770; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/T100HAN;FBSN/Windows;FBSV/10.0.14393.1914;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.205.179" - device: - type: desktop - brand: AU - model: Transformer Book - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.309; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/T103HAF;FBSN/Windows;FBSV/10.0.16299.309;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: AU - model: Transformer Mini - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/X555LN;FBSN/Windows;FBSV/10.0.16299.309;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: AU - model: X555LN - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.608; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/K50IN;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.205.179" - device: - type: desktop - brand: AU - model: K50IN - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/One S1003;FBSN/Windows;FBSV/10.0.17134.165;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: AC - model: One 10 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/X556UQK;FBSN/Windows;FBSV/10.0.16299.431;FBSS/1;FBCR/;FBID/desktop;FBLC/sv_SE;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: AU - model: X556UQK - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/K54L;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: AU - model: K54L - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.81; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80E5;FBSN/Windows;FBSV/10.0.17134.191;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: LE - model: G50-80 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/X550LB;FBSN/Windows;FBSV/10.0.16299.64;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.205.179" - device: - type: desktop - brand: AU - model: X550LB - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.693; osmeta 8.3.47029472) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.47029472 Build/47029472 [FBAN/FBW;FBAV/75.0.0.50.22;FBBV/47052341;FBRV/0;FBDV/WindowsDevice;FBMD/X553MA;FBSN/Windows;FBSV/10.0.14393.693;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "75.0.0.50.22" - device: - type: desktop - brand: AU - model: X553MA - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.98; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/SCL141CTP;FBSN/Windows;FBSV/10.0.16299.192;FBSS/2;FBCR/;FBID/desktop;FBLC/fr_FR;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: C0 - model: Notebook 14" Cherry Trail - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/37021C5;FBSN/Windows;FBSV/10.0.16299.334;FBSS/2;FBCR/;FBID/desktop;FBLC/fr_FR;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: LE - model: ThinkPad Helix 3702 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.1914; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Latitude E4300;FBSN/Windows;FBSV/10.0.14393.1914;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.205.179" - device: - type: desktop - brand: DL - model: Latitude E4300 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.10586.494; osmeta 8.3.34265222) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.34265222 Build/34265222 [FBAN/FBW;FBAV/60.0.0.36.138;FBBV/34282524;FBRV/0;FBDV/WindowsDevice;FBMD/HP ProBook 6560b;FBSN/Windows;FBSV/10.0.10586.494;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "60.0.0.36.138" - device: - type: desktop - brand: HP - model: ProBook 6560b - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.648; osmeta 10.3.31799) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.31799 Build/31799 [FBAN/FBW;FBAV/186.0.0.83.783;FBBV/143636256;FBMD/HP Pavilion All-in-One 24-r0xx;FBSN/Windows;FBSV/10.0.17134.765;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "186.0.0.83.783" - device: - type: desktop - brand: HP - model: Pavilion 24-r0xx All-in-One Desktop PC - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.19; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/XPS 15 9550;FBSN/Windows;FBSV/10.0.16299.64;FBSS/2;FBCR/;FBID/desktop;FBLC/ko_KR;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.205.179" - device: - type: desktop - brand: DL - model: XPS 15 9550 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/UX360CAK;FBSN/Windows;FBSV/10.0.16299.248;FBSS/2;FBCR/;FBID/desktop;FBLC/pl_PL;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: AU - model: ZenBook Flip - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.187; osmeta 8.3.40109042) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.40109042 Build/40109042 [FBAN/FBW;FBAV/65.0.0.44.139;FBBV/40161482;FBRV/0;FBDV/WindowsDevice;FBMD/Aspire E5-421G;FBSN/Windows;FBSV/10.0.14393.321;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "65.0.0.44.139" - device: - type: desktop - brand: AC - model: Aspire E5-421G - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.165; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Inspiron 3541;FBSN/Windows;FBSV/10.0.17134.228;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: DL - model: Inspiron 3541 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.608; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Compaq Presario CQ61 Notebook PC;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.205.179" - device: - type: desktop - brand: HP - model: Compaq Presario CQ61 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.10586.494; osmeta 8.3.35371798) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.35371798 Build/35371798 [FBAN/FBW;FBAV/61.0.0.46.152;FBBV/35404853;FBRV/0;FBDV/WindowsDevice;FBMD/23-f364;FBSN/Windows;FBSV/10.0.10586.494;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "61.0.0.46.152" - device: - type: desktop - brand: HP - model: Pavilion TouchSmart 23-f364 All-in-One Desktop PC - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Satellite L650;FBSN/Windows;FBSV/10.0.15063.729;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.205.179" - device: - type: desktop - brand: TS - model: Satellite L650 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Satellite S855;FBSN/Windows;FBSV/10.0.16299.64;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.205.179" - device: - type: desktop - brand: TS - model: Satellite S855 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.786; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Satellite C650;FBSN/Windows;FBSV/10.0.16299.125;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: TS - model: Satellite C650 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.248; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Satellite A200;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: TS - model: Satellite A200 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.10586.545; osmeta 8.3.35371798) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.35371798 Build/35371798 [FBAN/FBW;FBAV/61.0.0.46.152;FBBV/35404853;FBRV/0;FBDV/WindowsDevice;FBMD/Satellite C855;FBSN/Windows;FBSV/10.0.10586.545;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "61.0.0.46.152" - device: - type: desktop - brand: TS - model: Satellite C855 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.321; osmeta 8.3.41395199) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.41395199 Build/41395199 [FBAN/FBW;FBAV/67.0.0.13.140;FBBV/41468129;FBRV/0;FBDV/WindowsDevice;FBMD/Satellite A500;FBSN/Windows;FBSV/10.0.14393.321;FBSS/1;FBCR/;FBID/desktop;FBLC/en_GB;FBOP/45]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "67.0.0.13.140" - device: - type: desktop - brand: TS - model: Satellite A500 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.765; osmeta 10.3.31799) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.31799 Build/31799 [FBAN/FBW;FBAV/186.0.0.83.783;FBBV/143636256;FBDV/HPProBook6360bLG633EA#AK8;FBMD/HP ProBook 6360b;FBSN/Windows;FBSV/10.0.17134.765;FBSS/1;FBCR/;FBID/desktop;FBLC/sv_SE;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "186.0.0.83.783" - device: - type: desktop - brand: HP - model: ProBook 6360b - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.285; osmeta 10.3.8763) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.8763 Build/8763 [FBAN/FBW;FBAV/171.0.0.36.0;FBBV/123386314;FBDV/HPProBook440G52SZ73AV;FBMD/HP ProBook 440 G5;FBSN/Wind' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "171.0.0.36.0" - device: - type: desktop - brand: HP - model: ProBook 440 G5 - os_family: Windows - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.17763.379; osmeta 10.3.31799) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.31799 Build/31799 [FBAN/FBW;FBAV/186.0.0.83.783;FBBV/143636256;FBDV/HPEliteBook2560pLG669EA#AK8;FBMD/HP EliteBook 2560p;FBSN/Windows;FBSV/10.0.17763.503;FBSS/1;FBCR/;FBID/desktop;FBLC/sv_SE;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "186.0.0.83.783" - device: - type: desktop - brand: HP - model: EliteBook 2560p - os_family: Windows - browser_family: Unknown diff --git a/Tests/fixtures/desktop.yml b/Tests/fixtures/desktop.yml index 5af095df99..062ddf8820 100644 --- a/Tests/fixtures/desktop.yml +++ b/Tests/fixtures/desktop.yml @@ -3877,6 +3877,40 @@ model: "" os_family: Windows browser_family: Internet Explorer +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.187; osmeta 8.3.40109042) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.40109042 Build/40109042 [FBAN/FBW;FBAV/65.0.0.44.139;FBBV/40161482;FBRV/0;FBDV/WindowsDevice;FBMD/Aspire E5-421G;FBSN/Windows;FBSV/10.0.14393.321;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "65.0.0.44.139" + device: + type: desktop + brand: AC + model: Aspire E5-421G + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Z5WAL;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: AC + model: Aspire E5-511 + os_family: Windows + browser_family: Unknown - user_agent: Mozilla/5.0 (Linux; Android 4.4.4; Aspire V5-121 Build/KTU84Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.89 Safari/537.36 os: @@ -3937,6 +3971,23 @@ model: Chromebook R13 os_family: Android browser_family: Android Browser +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/One S1003;FBSN/Windows;FBSV/10.0.17134.165;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: AC + model: One 10 + os_family: Windows + browser_family: Unknown - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.98; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Predator G9-793;FBSN/Windows;FBSV/10.0.16299.125;FBSS/1;FBCR/;FBID/desktop;FBLC/de_DE;FBOP/45;FBRV/0]' os: @@ -4565,6 +4616,176 @@ model: "" os_family: Windows browser_family: Internet Explorer +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.608; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/K50IN;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: desktop + brand: AU + model: K50IN + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/K54L;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: AU + model: K54L + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.1770; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/T100HAN;FBSN/Windows;FBSV/10.0.14393.1914;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: desktop + brand: AU + model: Transformer Book + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.309; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/T103HAF;FBSN/Windows;FBSV/10.0.16299.309;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: AU + model: Transformer Mini + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/X550LB;FBSN/Windows;FBSV/10.0.16299.64;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: desktop + brand: AU + model: X550LB + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.693; osmeta 8.3.47029472) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.47029472 Build/47029472 [FBAN/FBW;FBAV/75.0.0.50.22;FBBV/47052341;FBRV/0;FBDV/WindowsDevice;FBMD/X553MA;FBSN/Windows;FBSV/10.0.14393.693;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "75.0.0.50.22" + device: + type: desktop + brand: AU + model: X553MA + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/X555LN;FBSN/Windows;FBSV/10.0.16299.309;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: AU + model: X555LN + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/X556UQK;FBSN/Windows;FBSV/10.0.16299.431;FBSS/1;FBCR/;FBID/desktop;FBLC/sv_SE;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: AU + model: X556UQK + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/UX360CAK;FBSN/Windows;FBSV/10.0.16299.248;FBSS/2;FBCR/;FBID/desktop;FBLC/pl_PL;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: AU + model: ZenBook Flip + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.98; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/SCL141CTP;FBSN/Windows;FBSV/10.0.16299.192;FBSS/2;FBCR/;FBID/desktop;FBLC/fr_FR;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: C0 + model: Notebook 14" Cherry Trail + os_family: Windows + browser_family: Unknown - user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; WOW64; Trident/7.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; CPDTDF; .NET4.0C; InfoPath.3; .NET4.0E; Microsoft Outlook 14.0.7113; ms-office; MSOffice 14) os: @@ -4722,6 +4943,74 @@ model: "" os_family: Windows browser_family: Internet Explorer +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.165; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Inspiron 3541;FBSN/Windows;FBSV/10.0.17134.228;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: DL + model: Inspiron 3541 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.1914; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Latitude E4300;FBSN/Windows;FBSV/10.0.14393.1914;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: desktop + brand: DL + model: Latitude E4300 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/XPS 15 9530;FBSN/Windows;FBSV/10.0.16299.309;FBSS/2;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: DL + model: XPS 15 9530 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.19; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/XPS 15 9550;FBSN/Windows;FBSV/10.0.16299.64;FBSS/2;FBCR/;FBID/desktop;FBLC/ko_KR;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: desktop + brand: DL + model: XPS 15 9550 + os_family: Windows + browser_family: Unknown - user_agent: Mozilla/5.0 (Linux; U; Android 4.04; pt-pt; H135 Build/MocorDroid2.3.5) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 os: @@ -4860,19 +5149,257 @@ os_family: Windows browser_family: Internet Explorer - - user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/6.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; MANM; .NET4.0C; InfoPath.3; .NET4.0E) + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/HP Laptop 15-bs0xx;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' os: name: Windows short_name: WIN - version: "7" + version: "10" platform: "" client: - type: browser - name: Internet Explorer - short_name: IE - version: "10.0" - engine: Trident - engine_version: "6.0" + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: desktop + brand: HP + model: 15 Laptop PC + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.608; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Compaq Presario CQ61 Notebook PC;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: desktop + brand: HP + model: Compaq Presario CQ61 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17763.379; osmeta 10.3.31799) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.31799 Build/31799 [FBAN/FBW;FBAV/186.0.0.83.783;FBBV/143636256;FBDV/HPEliteBook2560pLG669EA#AK8;FBMD/HP EliteBook 2560p;FBSN/Windows;FBSV/10.0.17763.503;FBSS/1;FBCR/;FBID/desktop;FBLC/sv_SE;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "186.0.0.83.783" + device: + type: desktop + brand: HP + model: EliteBook 2560p + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP EliteBook 2570p;FBSN/Windows;FBSV/10.0.17134.112;FBSS/1;FBCR/;FBID/desktop;FBLC/it_IT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: HP + model: EliteBook 2570p + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP ENVY x360 Convertible 15-bp0xx;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: HP + model: ENVY x360 Convertible PC + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.64; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP Pavilion Notebook;FBSN/Windows;FBSV/10.0.16299.431;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: HP + model: Pavilion + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.648; osmeta 10.3.31799) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.31799 Build/31799 [FBAN/FBW;FBAV/186.0.0.83.783;FBBV/143636256;FBMD/HP Pavilion All-in-One 24-r0xx;FBSN/Windows;FBSV/10.0.17134.765;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "186.0.0.83.783" + device: + type: desktop + brand: HP + model: Pavilion 24-r0xx All-in-One Desktop PC + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/HP Pavilion dv6 Notebook PC;FBSN/Windows;FBSV/10.0.15063.726;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: desktop + brand: HP + model: Pavilion dv6 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.10586.494; osmeta 8.3.35371798) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.35371798 Build/35371798 [FBAN/FBW;FBAV/61.0.0.46.152;FBBV/35404853;FBRV/0;FBDV/WindowsDevice;FBMD/23-f364;FBSN/Windows;FBSV/10.0.10586.494;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "61.0.0.46.152" + device: + type: desktop + brand: HP + model: Pavilion TouchSmart 23-f364 All-in-One Desktop PC + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.19; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/HP Pavilion x2 Detachable;FBSN/Windows;FBSV/10.0.16299.64;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: desktop + brand: HP + model: Pavilion x2 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.285; osmeta 10.3.8763) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.8763 Build/8763 [FBAN/FBW;FBAV/171.0.0.36.0;FBBV/123386314;FBDV/HPProBook440G52SZ73AV;FBMD/HP ProBook 440 G5;FBSN/Wind' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "171.0.0.36.0" + device: + type: desktop + brand: HP + model: ProBook 440 G5 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.765; osmeta 10.3.31799) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.31799 Build/31799 [FBAN/FBW;FBAV/186.0.0.83.783;FBBV/143636256;FBDV/HPProBook6360bLG633EA#AK8;FBMD/HP ProBook 6360b;FBSN/Windows;FBSV/10.0.17134.765;FBSS/1;FBCR/;FBID/desktop;FBLC/sv_SE;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "186.0.0.83.783" + device: + type: desktop + brand: HP + model: ProBook 6360b + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.10586.494; osmeta 8.3.34265222) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.34265222 Build/34265222 [FBAN/FBW;FBAV/60.0.0.36.138;FBBV/34282524;FBRV/0;FBDV/WindowsDevice;FBMD/HP ProBook 6560b;FBSN/Windows;FBSV/10.0.10586.494;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "60.0.0.36.138" + device: + type: desktop + brand: HP + model: ProBook 6560b + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.726; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/HP Spectre x360 Convertible;FBSN/Windows;FBSV/10.0.16299.309;FBSS/2;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: HP + model: Spectre x360 + os_family: Windows + browser_family: Unknown +- + user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/6.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; MANM; .NET4.0C; InfoPath.3; .NET4.0E) + os: + name: Windows + short_name: WIN + version: "7" + platform: "" + client: + type: browser + name: Internet Explorer + short_name: IE + version: "10.0" + engine: Trident + engine_version: "6.0" device: type: desktop brand: HY @@ -4999,6 +5526,23 @@ model: "" os_family: Windows browser_family: Internet Explorer +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.17134.81; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80E5;FBSN/Windows;FBSV/10.0.17134.191;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: LE + model: G50-80 + os_family: Windows + browser_family: Unknown - user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.111 Safari/537.36 SailfishBrowser/Rulz ~LenovoG780 os: @@ -5019,6 +5563,57 @@ model: G780 os_family: GNU/Linux browser_family: Sailfish Browser +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.786; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80SM;FBSN/Windows;FBSV/10.0.16299.309;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: LE + model: Ideapad 310-15ISK + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80VR;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: LE + model: Legion Y720 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/37021C5;FBSN/Windows;FBSV/10.0.16299.334;FBSS/2;FBCR/;FBID/desktop;FBLC/fr_FR;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: LE + model: ThinkPad Helix 3702 + os_family: Windows + browser_family: Unknown - user_agent: Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Win64; x64; Trident/5.0; MAMD) os: @@ -5339,6 +5934,23 @@ model: "" os_family: Windows browser_family: Internet Explorer +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/TH360R12.32CTW;FBSN/Windows;FBSV/10.0.16299.192;FBSS/1;FBCR/;FBID/desktop;FBLC/fr_FR;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: TN + model: Prestige TH-360R12.32CTW + os_family: Windows + browser_family: Unknown - user_agent: Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0; MATMJS) os: @@ -5459,3 +6071,105 @@ model: "" os_family: Windows browser_family: Internet Explorer +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.248; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Satellite A200;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: TS + model: Satellite A200 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.14393.321; osmeta 8.3.41395199) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.41395199 Build/41395199 [FBAN/FBW;FBAV/67.0.0.13.140;FBBV/41468129;FBRV/0;FBDV/WindowsDevice;FBMD/Satellite A500;FBSN/Windows;FBSV/10.0.14393.321;FBSS/1;FBCR/;FBID/desktop;FBLC/en_GB;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "67.0.0.13.140" + device: + type: desktop + brand: TS + model: Satellite A500 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.786; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/Satellite C650;FBSN/Windows;FBSV/10.0.16299.125;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: TS + model: Satellite C650 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.10586.545; osmeta 8.3.35371798) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/8.3.35371798 Build/35371798 [FBAN/FBW;FBAV/61.0.0.46.152;FBBV/35404853;FBRV/0;FBDV/WindowsDevice;FBMD/Satellite C855;FBSN/Windows;FBSV/10.0.10586.545;FBSS/1;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "61.0.0.46.152" + device: + type: desktop + brand: TS + model: Satellite C855 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Satellite L650;FBSN/Windows;FBSV/10.0.15063.729;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: desktop + brand: TS + model: Satellite L650 + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.15063.674; osmeta 10.3.2535) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.2535 Build/2535 [FBAN/FBW;FBAV/140.0.0.205.179;FBBV/74431143;FBDV/WindowsDevice;FBMD/Satellite S855;FBSN/Windows;FBSV/10.0.16299.64;FBSS/1;FBCR/;FBID/desktop;FBLC/pt_PT;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.205.179" + device: + type: desktop + brand: TS + model: Satellite S855 + os_family: Windows + browser_family: Unknown diff --git a/Tests/fixtures/phablet.yml b/Tests/fixtures/phablet.yml index 2e840c8bc9..e7dd96a81f 100644 --- a/Tests/fixtures/phablet.yml +++ b/Tests/fixtures/phablet.yml @@ -1252,6 +1252,20 @@ model: Lumia 640 XL os_family: Windows browser_family: Internet Explorer +- + user_agent: Windows Phone Ad Client/6.2.960.0 (Silverlight; MS_ORMMA_1_0; Windows Phone OS 10.0.13384.0; Microsoft; RM-1067_1005) + os: + name: Windows Phone + short_name: WPH + version: "10.0.13384.0" + platform: "" + client: null + device: + type: phablet + brand: MS + model: Lumia 640 XL + os_family: Windows Mobile + browser_family: Unknown - user_agent: Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; Microsoft; Lumia 640 XL Dual SIM) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/533.1 os: @@ -1312,20 +1326,6 @@ model: Lumia 640 XL os_family: Windows Mobile browser_family: Unknown -- - user_agent: Windows Phone Ad Client/6.2.960.0 (Silverlight; MS_ORMMA_1_0; Windows Phone OS 10.0.13384.0; Microsoft; RM-1067_1005) - os: - name: Windows Phone - short_name: WPH - version: "10.0.13384.0" - platform: "" - client: null - device: - type: phablet - brand: MS - model: Lumia 640 XL - os_family: Windows Mobile - browser_family: Unknown - user_agent: Mozilla/5.0 (Windows NT 10.0; ARM; Lumia 950 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Safari/537.36 Edge/14.14295 os: diff --git a/Tests/fixtures/smartphone-1.yml b/Tests/fixtures/smartphone-1.yml index 0bb941be3c..4bc8bc1503 100644 --- a/Tests/fixtures/smartphone-1.yml +++ b/Tests/fixtures/smartphone-1.yml @@ -7148,26 +7148,6 @@ model: iPhone os_family: iOS browser_family: Safari -- - user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Mobile/14E5260b Version/10.3 Safari/8536.25 Mobicip/1947694464 - os: - name: iOS - short_name: IOS - version: "10.3" - platform: "" - client: - type: browser - name: Mobicip - short_name: MO - version: "" - engine: Gecko - engine_version: "" - device: - type: smartphone - brand: AP - model: iPhone - os_family: iOS - browser_family: Firefox - user_agent: Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; ar) AppleWebKit/533.17.9 (KHTML, like Gecko) Mobile/8C148 os: @@ -7419,6 +7399,26 @@ model: iPhone os_family: iOS browser_family: Unknown +- + user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Mobile/14E5260b Version/10.3 Safari/8536.25 Mobicip/1947694464 + os: + name: iOS + short_name: IOS + version: "10.3" + platform: "" + client: + type: browser + name: Mobicip + short_name: MO + version: "" + engine: Gecko + engine_version: "" + device: + type: smartphone + brand: AP + model: iPhone + os_family: iOS + browser_family: Firefox - user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0 Mobile/15E148 Safari/605.1 NAVER(inapp; search; 700; 10.20.2; 11) os: diff --git a/Tests/fixtures/smartphone-11.yml b/Tests/fixtures/smartphone-11.yml index e41708f593..306046c5a7 100644 --- a/Tests/fixtures/smartphone-11.yml +++ b/Tests/fixtures/smartphone-11.yml @@ -1099,26 +1099,6 @@ model: GALAXY A6 os_family: Android browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 10; SM-A6058 Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/80.0.3987.132 Mobile Safari/537.36 - os: - name: Android - short_name: AND - version: "10" - platform: "" - client: - type: browser - name: Chrome Webview - short_name: CV - version: "80.0.3987.132" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: SA - model: GALAXY A6+ - os_family: Android - browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-A605G Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.0 Chrome/59.0.3071.125 Mobile Safari/537.36 os: @@ -1219,6 +1199,26 @@ model: GALAXY A6+ os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 10; SM-A6058 Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/80.0.3987.132 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "10" + platform: "" + client: + type: browser + name: Chrome Webview + short_name: CV + version: "80.0.3987.132" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: SA + model: GALAXY A6+ + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 Linux; Android 9; SM-A6060 AppleWebKit/537.36 KHTML, like Gecko Chrome/75.0.3770.143 Mobile Safari/537.36 os: diff --git a/Tests/fixtures/smartphone-13.yml b/Tests/fixtures/smartphone-13.yml index e4b1df36b9..b18688c038 100644 --- a/Tests/fixtures/smartphone-13.yml +++ b/Tests/fixtures/smartphone-13.yml @@ -3688,17 +3688,17 @@ os_family: Android browser_family: Opera - - user_agent: Mozilla/5.0 (Linux; Android 10; SO-03K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8216 Build/51.1.A.2.183) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36 os: name: Android short_name: AND - version: "10" + version: "8.0.0" platform: "" client: type: browser name: Chrome Mobile short_name: CM - version: "83.0.4103.106" + version: "62.0.3202.84" engine: Blink engine_version: "" device: @@ -3708,7 +3708,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8216 Build/51.1.A.2.183) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8276 Build/51.1.A.3.159) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 os: name: Android short_name: AND @@ -3718,7 +3718,7 @@ type: browser name: Chrome Mobile short_name: CM - version: "62.0.3202.84" + version: "67.0.3396.87" engine: Blink engine_version: "" device: @@ -3728,7 +3728,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8276 Build/51.1.A.3.159) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8324 Build/51.1.A.4.225) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 os: name: Android short_name: AND @@ -3748,7 +3748,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8324 Build/51.1.A.4.225) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SOV37 Build/51.1.C.0.374) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36 os: name: Android short_name: AND @@ -3758,7 +3758,7 @@ type: browser name: Chrome Mobile short_name: CM - version: "67.0.3396.87" + version: "69.0.3497.100" engine: Blink engine_version: "" device: @@ -3768,7 +3768,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SOV37 Build/51.1.C.0.374) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8314 Build/51.1.A.11.51) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.105 Mobile Safari/537.36 os: name: Android short_name: AND @@ -3778,7 +3778,7 @@ type: browser name: Chrome Mobile short_name: CM - version: "69.0.3497.100" + version: "72.0.3626.105" engine: Blink engine_version: "" device: @@ -3788,17 +3788,17 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8314 Build/51.1.A.11.51) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.105 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 9; H8296) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36 os: name: Android short_name: AND - version: "8.0.0" + version: "9" platform: "" client: type: browser name: Chrome Mobile short_name: CM - version: "72.0.3626.105" + version: "75.0.3770.101" engine: Blink engine_version: "" device: @@ -3808,7 +3808,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 9; H8296) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 9; 702SO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36 os: name: Android short_name: AND @@ -3818,7 +3818,7 @@ type: browser name: Chrome Mobile short_name: CM - version: "75.0.3770.101" + version: "83.0.4103.106" engine: Blink engine_version: "" device: @@ -3828,11 +3828,11 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 9; 702SO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 10; SO-03K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36 os: name: Android short_name: AND - version: "9" + version: "10" platform: "" client: type: browser diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml index beafce9ba8..5ec9ff2c0e 100644 --- a/Tests/fixtures/smartphone-3.yml +++ b/Tests/fixtures/smartphone-3.yml @@ -139,143 +139,6 @@ model: BK-RAM2 os_family: Android browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Hind 5.1 Build/OPM2.171019.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.73 Mobile Safari/537.36 - os: - name: Android - short_name: AND - version: "8.1.0" - platform: "" - client: - type: browser - name: Chrome Webview - short_name: CV - version: "77.0.3865.73" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: CZ - model: Hind 5.1 - os_family: Android - browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux;U;Android 7.0;en-US;X417_Amaze Build/NRD90M) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1 UCBrowser/11.0.0.1016 Mobile - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: browser - name: UC Browser - short_name: UC - version: "11.0.0.1016" - engine: WebKit - engine_version: "528.5" - device: - type: smartphone - brand: CZ - model: X417 Amaze - os_family: Android - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Linux; Android 7.0; X418 Zest Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/67.0.3396.87 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/176.0.0.42.87;]' - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: mobile app - name: Facebook - version: "176.0.0.42.87" - device: - type: smartphone - brand: CZ - model: X418 Zest - os_family: Android - browser_family: Unknown -- - user_agent: Mozilla/5.0 (Linux; U; Android 7.0; X421 Nova Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/65.0.3325.109 Mobile Safari/537.36 OPR/33.0.2254.125672 - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: browser - name: Opera Mobile - short_name: OM - version: "33.0.2254.125672" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: CZ - model: X421 Nova - os_family: Android - browser_family: Opera -- - user_agent: Mozilla/5.0 (Linux; Android 7.0; X422 Exotic Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.111 Mobile Safari/537.36 - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: browser - name: Chrome Webview - short_name: CV - version: "63.0.3239.111" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: CZ - model: X422 Exotic - os_family: Android - browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 7.0; X425 Shavit Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: browser - name: Chrome Mobile - short_name: CM - version: "63.0.3239.111" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: CZ - model: X425 Shavit - os_family: Android - browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 7.0; X428 Astute Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36 - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: browser - name: Chrome Webview - short_name: CV - version: "68.0.3440.91" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: CZ - model: X428 Astute - os_family: Android - browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 7.1.2; Action-X3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36 os: @@ -4463,6 +4326,143 @@ model: Wing 9 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Hind 5.1 Build/OPM2.171019.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.73 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "8.1.0" + platform: "" + client: + type: browser + name: Chrome Webview + short_name: CV + version: "77.0.3865.73" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: CZ + model: Hind 5.1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux;U;Android 7.0;en-US;X417_Amaze Build/NRD90M) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1 UCBrowser/11.0.0.1016 Mobile + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: UC Browser + short_name: UC + version: "11.0.0.1016" + engine: WebKit + engine_version: "528.5" + device: + type: smartphone + brand: CZ + model: X417 Amaze + os_family: Android + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Linux; Android 7.0; X418 Zest Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/67.0.3396.87 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/176.0.0.42.87;]' + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: mobile app + name: Facebook + version: "176.0.0.42.87" + device: + type: smartphone + brand: CZ + model: X418 Zest + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 7.0; X421 Nova Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/65.0.3325.109 Mobile Safari/537.36 OPR/33.0.2254.125672 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Opera Mobile + short_name: OM + version: "33.0.2254.125672" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: CZ + model: X421 Nova + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; X422 Exotic Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.111 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Webview + short_name: CV + version: "63.0.3239.111" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: CZ + model: X422 Exotic + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; X425 Shavit Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "63.0.3239.111" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: CZ + model: X425 Shavit + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; X428 Astute Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Webview + short_name: CV + version: "68.0.3440.91" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: CZ + model: X428 Astute + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 7.0; DATSUN_D5500) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36 os: diff --git a/Tests/fixtures/smartphone-6.yml b/Tests/fixtures/smartphone-6.yml index 869219226c..74969b789c 100644 --- a/Tests/fixtures/smartphone-6.yml +++ b/Tests/fixtures/smartphone-6.yml @@ -1016,6 +1016,26 @@ model: P20 Lite os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 10; CLT-TL01) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.99 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "10" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "80.0.3987.99" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: HU + model: P20 Pro + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 8.1.0; CLT-AL01) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36 os: @@ -1173,26 +1193,6 @@ model: P20 Pro os_family: Android browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 10; CLT-TL01) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.99 Mobile Safari/537.36 - os: - name: Android - short_name: AND - version: "10" - platform: "" - client: - type: browser - name: Chrome Mobile - short_name: CM - version: "80.0.3987.99" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: HU - model: P20 Pro - os_family: Android - browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 9; ELE-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.67 Mobile Safari/537.36 os: diff --git a/Tests/fixtures/smartphone-9.yml b/Tests/fixtures/smartphone-9.yml index 6c5d309313..3d2045c3ec 100644 --- a/Tests/fixtures/smartphone-9.yml +++ b/Tests/fixtures/smartphone-9.yml @@ -2000,6 +2000,26 @@ model: "2.1" os_family: Android browser_family: Chrome +- + user_agent: NOKIA-RH-17/V F100V1403.nep.0 UP.Browser/4.1.26l1.c.2.100 + os: + name: Symbian + short_name: SYM + version: "" + platform: "" + client: + type: browser + name: Openwave Mobile Browser + short_name: OV + version: "4.1.26" + engine: "" + engine_version: "" + device: + type: smartphone + brand: NK + model: "2280" + os_family: Symbian + browser_family: Unknown - user_agent: Nokia2323c-2/2.0 (08.20) Profile/MIDP-2.1 Configuration/CLDC-1.1 os: @@ -2140,6 +2160,66 @@ model: "5.1" os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Nokia 5.1 Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "8.1.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "71.0.3578.99" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: NK + model: 5.1 Plus + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 5.1 Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "9" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "77.0.3865.92" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: NK + model: 5.1 Plus + os_family: Android + browser_family: Chrome +- + user_agent: iBrowser/Mini2.8 (Nokia5130c-2/07.97) + os: + name: Symbian + short_name: SYM + version: "" + platform: "" + client: + type: browser + name: IBrowse + short_name: IB + version: "" + engine: "" + engine_version: "" + device: + type: smartphone + brand: NK + model: 5130 XpressMusic + os_family: Symbian + browser_family: Unknown - user_agent: Mozilla/5.0 (Linux; Android 7.1.1; TA-1003 Build/NMF26F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.116 Mobile Safari/537.36 os: @@ -2241,27 +2321,27 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.1.0; TA-1041 Build/OPR1.170623.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 6.1 Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.83 Mobile Safari/537.36 os: name: Android short_name: AND - version: "8.1.0" + version: "9" platform: "" client: type: browser name: Chrome Mobile short_name: CM - version: "71.0.3578.99" + version: "71.0.3578.83" engine: Blink engine_version: "" device: type: smartphone brand: NK - model: "7" + model: 6.1 Plus os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 7.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 6.1 Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.105 Mobile Safari/537.36 os: name: Android short_name: AND @@ -2271,57 +2351,57 @@ type: browser name: Chrome Mobile short_name: CM - version: "70.0.3538.80" + version: "72.0.3626.105" engine: Blink engine_version: "" device: type: smartphone brand: NK - model: "7.1" + model: 6.1 Plus os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 7.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.75 Mobile Safari/537.36 + user_agent: Nokia6120c/3.83; Profile/MIDP-2.0 Configuration/CLDC-1.1 Google os: - name: Android - short_name: AND - version: "9" + name: Symbian + short_name: SYM + version: "" platform: "" client: type: browser - name: Chrome Mobile - short_name: CM - version: "73.0.3683.75" - engine: Blink + name: Nokia Browser + short_name: NB + version: "" + engine: "" engine_version: "" device: type: smartphone brand: NK - model: "7.1" - os_family: Android - browser_family: Chrome + model: 6120 Classic + os_family: Symbian + browser_family: Nokia Browser - - user_agent: Mozilla/5.0 (Linux; Android 7.1.1; TA-1004 Build/NMF26F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.116 Mobile Safari/537.36 + user_agent: UCWEB/2.0 (Symbian; U; S60 V3; ru; NOKIA6700s) U2/1.0.0 UCBrowser/9.0.1.317 U2/1.0.0 Mobile os: - name: Android - short_name: AND - version: "7.1.1" + name: Symbian OS Series 60 + short_name: S60 + version: "V3" platform: "" client: type: browser - name: Chrome Mobile - short_name: CM - version: "60.0.3112.116" - engine: Blink + name: UC Browser + short_name: UC + version: "9.0.1.317" + engine: "" engine_version: "" device: type: smartphone brand: NK - model: "8" - os_family: Android - browser_family: Chrome + model: 6700 Slide + os_family: Symbian + browser_family: Unknown - - user_agent: Mozilla/5.0 (Linux; Android 8.1.0; TA-1052 Build/OPR1.170623.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; TA-1041 Build/OPR1.170623.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36 os: name: Android short_name: AND @@ -2337,31 +2417,31 @@ device: type: smartphone brand: NK - model: "8" + model: "7" os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 8.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.105 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Nokia 7 plus Build/OPR1.170623.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Mobile Safari/537.36 os: name: Android short_name: AND - version: "9" + version: "8.1.0" platform: "" client: type: browser name: Chrome Mobile short_name: CM - version: "72.0.3626.105" + version: "65.0.3325.109" engine: Blink engine_version: "" device: type: smartphone brand: NK - model: "8.1" + model: 7 plus os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 8.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 7 plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36 os: name: Android short_name: AND @@ -2371,157 +2451,97 @@ type: browser name: Chrome Mobile short_name: CM - version: "73.0.3683.90" + version: "70.0.3538.80" engine: Blink engine_version: "" device: type: smartphone brand: NK - model: "8.1" + model: 7 plus os_family: Android browser_family: Chrome - - user_agent: NOKIA-RH-17/V F100V1403.nep.0 UP.Browser/4.1.26l1.c.2.100 - os: - name: Symbian - short_name: SYM - version: "" - platform: "" - client: - type: browser - name: Openwave Mobile Browser - short_name: OV - version: "4.1.26" - engine: "" - engine_version: "" - device: - type: smartphone - brand: NK - model: "2280" - os_family: Symbian - browser_family: Unknown -- - user_agent: Nokia2720a-2/2.0 (09.85) Profile/MIDP-2.1 Configuration/CLDC-1.1 - os: - name: Symbian - short_name: SYM - version: "" - platform: "" - client: - type: browser - name: Nokia Browser - short_name: NB - version: "" - engine: "" - engine_version: "" - device: - type: smartphone - brand: NK - model: "2720" - os_family: Symbian - browser_family: Nokia Browser -- - user_agent: NOKIA-RH-48/V J190V0600.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 - os: - name: Symbian - short_name: SYM - version: "" - platform: "" - client: - type: browser - name: Openwave Mobile Browser - short_name: OV - version: "6.2.2.1" - engine: "" - engine_version: "" - device: - type: smartphone - brand: NK - model: "3105" - os_family: Symbian - browser_family: Unknown -- - user_agent: NOKIA-RM-11/V H190V0700.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 + user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 7.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36 os: - name: Symbian - short_name: SYM - version: "" + name: Android + short_name: AND + version: "9" platform: "" client: type: browser - name: Openwave Mobile Browser - short_name: OV - version: "6.2.2.1" - engine: "" + name: Chrome Mobile + short_name: CM + version: "70.0.3538.80" + engine: Blink engine_version: "" device: type: smartphone brand: NK - model: "3205" - os_family: Symbian - browser_family: Unknown + model: "7.1" + os_family: Android + browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Nokia 5.1 Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 7.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.75 Mobile Safari/537.36 os: name: Android short_name: AND - version: "8.1.0" + version: "9" platform: "" client: type: browser name: Chrome Mobile short_name: CM - version: "71.0.3578.99" + version: "73.0.3683.75" engine: Blink engine_version: "" device: type: smartphone brand: NK - model: 5.1 Plus + model: "7.1" os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 5.1 Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 7.1.1; TA-1004 Build/NMF26F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.116 Mobile Safari/537.36 os: name: Android short_name: AND - version: "9" + version: "7.1.1" platform: "" client: type: browser name: Chrome Mobile short_name: CM - version: "77.0.3865.92" + version: "60.0.3112.116" engine: Blink engine_version: "" device: type: smartphone brand: NK - model: 5.1 Plus + model: "8" os_family: Android browser_family: Chrome - - user_agent: iBrowser/Mini2.8 (Nokia5130c-2/07.97) + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; TA-1052 Build/OPR1.170623.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36 os: - name: Symbian - short_name: SYM - version: "" + name: Android + short_name: AND + version: "8.1.0" platform: "" client: type: browser - name: IBrowse - short_name: IB - version: "" - engine: "" + name: Chrome Mobile + short_name: CM + version: "71.0.3578.99" + engine: Blink engine_version: "" device: type: smartphone brand: NK - model: 5130 XpressMusic - os_family: Symbian - browser_family: Unknown + model: "8" + os_family: Android + browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 6.1 Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.83 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 8.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.105 Mobile Safari/537.36 os: name: Android short_name: AND @@ -2531,17 +2551,17 @@ type: browser name: Chrome Mobile short_name: CM - version: "71.0.3578.83" + version: "72.0.3626.105" engine: Blink engine_version: "" device: type: smartphone brand: NK - model: 6.1 Plus + model: "8.1" os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 6.1 Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.105 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 8.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36 os: name: Android short_name: AND @@ -2551,17 +2571,17 @@ type: browser name: Chrome Mobile short_name: CM - version: "72.0.3626.105" + version: "73.0.3683.90" engine: Blink engine_version: "" device: type: smartphone brand: NK - model: 6.1 Plus + model: "8.1" os_family: Android browser_family: Chrome - - user_agent: Nokia6120c/3.83; Profile/MIDP-2.0 Configuration/CLDC-1.1 Google + user_agent: Nokia2720a-2/2.0 (09.85) Profile/MIDP-2.1 Configuration/CLDC-1.1 os: name: Symbian short_name: SYM @@ -2577,11 +2597,11 @@ device: type: smartphone brand: NK - model: 6120 Classic + model: "2720" os_family: Symbian browser_family: Nokia Browser - - user_agent: NOKIA-RH-27/V H190V0800.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 + user_agent: NOKIA-RH-48/V J190V0600.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 os: name: Symbian short_name: SYM @@ -2597,11 +2617,11 @@ device: type: smartphone brand: NK - model: "6225" + model: "3105" os_family: Symbian browser_family: Unknown - - user_agent: NOKIA-RH-34/V H190V0800.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 + user_agent: NOKIA-RM-11/V H190V0700.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 os: name: Symbian short_name: SYM @@ -2617,69 +2637,49 @@ device: type: smartphone brand: NK - model: "6585" + model: "3205" os_family: Symbian browser_family: Unknown - - user_agent: UCWEB/2.0 (Symbian; U; S60 V3; ru; NOKIA6700s) U2/1.0.0 UCBrowser/9.0.1.317 U2/1.0.0 Mobile + user_agent: NOKIA-RH-27/V H190V0800.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 os: - name: Symbian OS Series 60 - short_name: S60 - version: "V3" + name: Symbian + short_name: SYM + version: "" platform: "" client: type: browser - name: UC Browser - short_name: UC - version: "9.0.1.317" + name: Openwave Mobile Browser + short_name: OV + version: "6.2.2.1" engine: "" engine_version: "" device: type: smartphone brand: NK - model: 6700 Slide + model: "6225" os_family: Symbian browser_family: Unknown - - user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Nokia 7 plus Build/OPR1.170623.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Mobile Safari/537.36 - os: - name: Android - short_name: AND - version: "8.1.0" - platform: "" - client: - type: browser - name: Chrome Mobile - short_name: CM - version: "65.0.3325.109" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: NK - model: 7 plus - os_family: Android - browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 9; Nokia 7 plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36 + user_agent: NOKIA-RH-34/V H190V0800.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 os: - name: Android - short_name: AND - version: "9" + name: Symbian + short_name: SYM + version: "" platform: "" client: type: browser - name: Chrome Mobile - short_name: CM - version: "70.0.3538.80" - engine: Blink + name: Openwave Mobile Browser + short_name: OV + version: "6.2.2.1" + engine: "" engine_version: "" device: type: smartphone brand: NK - model: 7 plus - os_family: Android - browser_family: Chrome + model: "6585" + os_family: Symbian + browser_family: Unknown - user_agent: OneBrowser/3.1 (Nokia7230/06.90) os: From f2b69a5db19b69337416f43c726583a8364bac38 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 11 Aug 2020 22:34:31 +0200 Subject: [PATCH 47/49] update statistics script --- misc/statistics.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/misc/statistics.php b/misc/statistics.php index 73ea95efc8..b6815011f4 100644 --- a/misc/statistics.php +++ b/misc/statistics.php @@ -94,7 +94,8 @@ function format($str, $length) Camera: %s (%s%%) Media Player: %s (%s%%) Phablet: %s (%s%%) -Notebook: %s (%s%%) +Smart Speaker: %s (%s%%) +Wearable: %s (%s%%) Unknown: %s (%s%%) ---------------------------------- ", @@ -110,6 +111,7 @@ function format($str, $length) format($deviceTypes[8], $parsedUAs), getPercentage($deviceTypes[8], $parsedUAs), format($deviceTypes[9], $parsedUAs), getPercentage($deviceTypes[9], $parsedUAs), format($deviceTypes[10], $parsedUAs), getPercentage($deviceTypes[10], $parsedUAs), - format($deviceTypes[13], $parsedUAs), getPercentage($deviceTypes[13], $parsedUAs), + format($deviceTypes[11], $parsedUAs), getPercentage($deviceTypes[11], $parsedUAs), + format($deviceTypes[12], $parsedUAs), getPercentage($deviceTypes[12], $parsedUAs), format($unknownDeviceTypes, $parsedUAs), getPercentage($unknownDeviceTypes, $parsedUAs) ); From bf932a6f5fedba6a6a4d9e3673bda499e56f11e0 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 11 Aug 2020 22:41:19 +0200 Subject: [PATCH 48/49] avoid brand short code rename --- Parser/Device/DeviceParserAbstract.php | 4 +- Tests/fixtures/desktop.yml | 34 +-- Tests/fixtures/phablet.yml | 64 +++--- Tests/fixtures/smartphone-1.yml | 40 ++-- Tests/fixtures/smartphone-11.yml | 64 +++--- Tests/fixtures/smartphone-13.yml | 34 +-- Tests/fixtures/smartphone-3.yml | 274 ++++++++++++------------- Tests/fixtures/smartphone-9.yml | 200 +++++++++--------- 8 files changed, 357 insertions(+), 357 deletions(-) diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php index 0bb7223650..80edf08a4f 100644 --- a/Parser/Device/DeviceParserAbstract.php +++ b/Parser/Device/DeviceParserAbstract.php @@ -152,7 +152,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'CH' => 'Cherry Mobile', '1C' => 'Chuwi', 'L8' => 'Clarmin', - 'CZ' => 'Clout', + 'C0' => 'Clout', 'CK' => 'Cricket', 'C1' => 'Crosscall', 'CL' => 'Compal', @@ -555,7 +555,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'SQ' => 'Santin', 'SA' => 'Samsung', 'S0' => 'Sanei', - 'C0' => 'Schneider', + 'CZ' => 'Schneider', 'SD' => 'Sega', 'SL' => 'Selfix', 'SE' => 'Sony Ericsson', diff --git a/Tests/fixtures/desktop.yml b/Tests/fixtures/desktop.yml index 062ddf8820..9684dac8bc 100644 --- a/Tests/fixtures/desktop.yml +++ b/Tests/fixtures/desktop.yml @@ -4769,23 +4769,6 @@ model: ZenBook Flip os_family: Windows browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.98; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/SCL141CTP;FBSN/Windows;FBSV/10.0.16299.192;FBSS/2;FBCR/;FBID/desktop;FBLC/fr_FR;FBOP/45;FBRV/0]' - os: - name: Windows - short_name: WIN - version: "10" - platform: "" - client: - type: mobile app - name: Facebook - version: "140.0.0.232.179" - device: - type: desktop - brand: C0 - model: Notebook 14" Cherry Trail - os_family: Windows - browser_family: Unknown - user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; WOW64; Trident/7.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; CPDTDF; .NET4.0C; InfoPath.3; .NET4.0E; Microsoft Outlook 14.0.7113; ms-office; MSOffice 14) os: @@ -4843,6 +4826,23 @@ model: "" os_family: Windows browser_family: Internet Explorer +- + user_agent: 'Mozilla/5.0 (Windows NT 10.0.16299.98; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/SCL141CTP;FBSN/Windows;FBSV/10.0.16299.192;FBSS/2;FBCR/;FBID/desktop;FBLC/fr_FR;FBOP/45;FBRV/0]' + os: + name: Windows + short_name: WIN + version: "10" + platform: "" + client: + type: mobile app + name: Facebook + version: "140.0.0.232.179" + device: + type: desktop + brand: CZ + model: Notebook 14" Cherry Trail + os_family: Windows + browser_family: Unknown - user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Win64; x64; Trident/4.0; .NET CLR 2.0.50727; SLCC2; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; MDDC; .NET4.0C; .NET4.0E) os: diff --git a/Tests/fixtures/phablet.yml b/Tests/fixtures/phablet.yml index e7dd96a81f..71b3e4447a 100644 --- a/Tests/fixtures/phablet.yml +++ b/Tests/fixtures/phablet.yml @@ -1253,79 +1253,79 @@ os_family: Windows browser_family: Internet Explorer - - user_agent: Windows Phone Ad Client/6.2.960.0 (Silverlight; MS_ORMMA_1_0; Windows Phone OS 10.0.13384.0; Microsoft; RM-1067_1005) + user_agent: Mozilla/5.0 (Windows Phone 10.0; Android 6.0.1; Microsoft; RM-1096) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Mobile Safari/537.36 Edge/15.15063 os: name: Windows Phone short_name: WPH - version: "10.0.13384.0" + version: "10.0" platform: "" - client: null + client: + type: browser + name: Microsoft Edge + short_name: PS + version: "15.15063" + engine: Edge + engine_version: "15.15063" device: type: phablet brand: MS model: Lumia 640 XL os_family: Windows Mobile - browser_family: Unknown + browser_family: Internet Explorer - - user_agent: Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; Microsoft; Lumia 640 XL Dual SIM) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/533.1 + user_agent: UCWEB/2.0 (Windows; U; wds 10.0; en-IN; Microsoft; RM-1065_1008) U2/1.0.0 UCBrowser/4.2.1.541 U2/1.0.0 Mobile os: name: Windows Phone short_name: WPH - version: "8.1" - platform: ARM + version: "10.0" + platform: "" client: type: browser - name: IE Mobile - short_name: IM - version: "11.0" - engine: Trident - engine_version: "7.0" + name: UC Browser + short_name: UC + version: "4.2.1.541" + engine: "" + engine_version: "" device: type: phablet brand: MS model: Lumia 640 XL os_family: Windows Mobile - browser_family: Internet Explorer + browser_family: Unknown - - user_agent: Mozilla/5.0 (Windows Phone 10.0; Android 6.0.1; Microsoft; RM-1096) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Mobile Safari/537.36 Edge/15.15063 + user_agent: Windows Phone Ad Client/6.2.960.0 (Silverlight; MS_ORMMA_1_0; Windows Phone OS 10.0.13384.0; Microsoft; RM-1067_1005) os: name: Windows Phone short_name: WPH - version: "10.0" + version: "10.0.13384.0" platform: "" - client: - type: browser - name: Microsoft Edge - short_name: PS - version: "15.15063" - engine: Edge - engine_version: "15.15063" + client: null device: type: phablet brand: MS model: Lumia 640 XL os_family: Windows Mobile - browser_family: Internet Explorer + browser_family: Unknown - - user_agent: UCWEB/2.0 (Windows; U; wds 10.0; en-IN; Microsoft; RM-1065_1008) U2/1.0.0 UCBrowser/4.2.1.541 U2/1.0.0 Mobile + user_agent: Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; Microsoft; Lumia 640 XL Dual SIM) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/533.1 os: name: Windows Phone short_name: WPH - version: "10.0" - platform: "" + version: "8.1" + platform: ARM client: type: browser - name: UC Browser - short_name: UC - version: "4.2.1.541" - engine: "" - engine_version: "" + name: IE Mobile + short_name: IM + version: "11.0" + engine: Trident + engine_version: "7.0" device: type: phablet brand: MS model: Lumia 640 XL os_family: Windows Mobile - browser_family: Unknown + browser_family: Internet Explorer - user_agent: Mozilla/5.0 (Windows NT 10.0; ARM; Lumia 950 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Safari/537.36 Edge/14.14295 os: diff --git a/Tests/fixtures/smartphone-1.yml b/Tests/fixtures/smartphone-1.yml index 4bc8bc1503..e0565eda7b 100644 --- a/Tests/fixtures/smartphone-1.yml +++ b/Tests/fixtures/smartphone-1.yml @@ -7268,6 +7268,26 @@ model: iPhone os_family: iOS browser_family: Unknown +- + user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Mobile/14E5260b Version/10.3 Safari/8536.25 Mobicip/1947694464 + os: + name: iOS + short_name: IOS + version: "10.3" + platform: "" + client: + type: browser + name: Mobicip + short_name: MO + version: "" + engine: Gecko + engine_version: "" + device: + type: smartphone + brand: AP + model: iPhone + os_family: iOS + browser_family: Firefox - user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 7_0_4 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11B554a Safari/9537.53 os: @@ -7399,26 +7419,6 @@ model: iPhone os_family: iOS browser_family: Unknown -- - user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Mobile/14E5260b Version/10.3 Safari/8536.25 Mobicip/1947694464 - os: - name: iOS - short_name: IOS - version: "10.3" - platform: "" - client: - type: browser - name: Mobicip - short_name: MO - version: "" - engine: Gecko - engine_version: "" - device: - type: smartphone - brand: AP - model: iPhone - os_family: iOS - browser_family: Firefox - user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0 Mobile/15E148 Safari/605.1 NAVER(inapp; search; 700; 10.20.2; 11) os: diff --git a/Tests/fixtures/smartphone-11.yml b/Tests/fixtures/smartphone-11.yml index 306046c5a7..23b73e7231 100644 --- a/Tests/fixtures/smartphone-11.yml +++ b/Tests/fixtures/smartphone-11.yml @@ -1100,19 +1100,19 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-A605G Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.0 Chrome/59.0.3071.125 Mobile Safari/537.36 + user_agent: Mozilla/5.0 Linux; Android 9; SM-A6050 AppleWebKit/537.36 KHTML, like Gecko Chrome/71.0.3578.99 Mobile Safari/537.36 os: name: Android short_name: AND - version: "8.0.0" + version: "9" platform: "" client: type: browser - name: Samsung Browser - short_name: SB - version: "7.0" - engine: WebKit - engine_version: "537.36" + name: Chrome Mobile + short_name: CM + version: "71.0.3578.99" + engine: Blink + engine_version: "" device: type: smartphone brand: SA @@ -1120,19 +1120,19 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-A605F Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.2 Chrome/59.0.3071.125 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 10; SM-A6058 Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/80.0.3987.132 Mobile Safari/537.36 os: name: Android short_name: AND - version: "8.0.0" + version: "10" platform: "" client: type: browser - name: Samsung Browser - short_name: SB - version: "7.2" - engine: WebKit - engine_version: "537.36" + name: Chrome Webview + short_name: CV + version: "80.0.3987.132" + engine: Blink + engine_version: "" device: type: smartphone brand: SA @@ -1140,7 +1140,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-A605FN/A605FNXXU1ARD7 Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.2 Chrome/59.0.3071.125 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-A605G Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.0 Chrome/59.0.3071.125 Mobile Safari/537.36 os: name: Android short_name: AND @@ -1150,7 +1150,7 @@ type: browser name: Samsung Browser short_name: SB - version: "7.2" + version: "7.0" engine: WebKit engine_version: "537.36" device: @@ -1160,7 +1160,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-A605GN Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.4 Chrome/59.0.3071.125 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-A605F Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.2 Chrome/59.0.3071.125 Mobile Safari/537.36 os: name: Android short_name: AND @@ -1170,7 +1170,7 @@ type: browser name: Samsung Browser short_name: SB - version: "7.4" + version: "7.2" engine: WebKit engine_version: "537.36" device: @@ -1180,19 +1180,19 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 Linux; Android 9; SM-A6050 AppleWebKit/537.36 KHTML, like Gecko Chrome/71.0.3578.99 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-A605FN/A605FNXXU1ARD7 Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.2 Chrome/59.0.3071.125 Mobile Safari/537.36 os: name: Android short_name: AND - version: "9" + version: "8.0.0" platform: "" client: type: browser - name: Chrome Mobile - short_name: CM - version: "71.0.3578.99" - engine: Blink - engine_version: "" + name: Samsung Browser + short_name: SB + version: "7.2" + engine: WebKit + engine_version: "537.36" device: type: smartphone brand: SA @@ -1200,19 +1200,19 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 10; SM-A6058 Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/80.0.3987.132 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-A605GN Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.4 Chrome/59.0.3071.125 Mobile Safari/537.36 os: name: Android short_name: AND - version: "10" + version: "8.0.0" platform: "" client: type: browser - name: Chrome Webview - short_name: CV - version: "80.0.3987.132" - engine: Blink - engine_version: "" + name: Samsung Browser + short_name: SB + version: "7.4" + engine: WebKit + engine_version: "537.36" device: type: smartphone brand: SA diff --git a/Tests/fixtures/smartphone-13.yml b/Tests/fixtures/smartphone-13.yml index b18688c038..e4b1df36b9 100644 --- a/Tests/fixtures/smartphone-13.yml +++ b/Tests/fixtures/smartphone-13.yml @@ -3688,17 +3688,17 @@ os_family: Android browser_family: Opera - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8216 Build/51.1.A.2.183) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 10; SO-03K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36 os: name: Android short_name: AND - version: "8.0.0" + version: "10" platform: "" client: type: browser name: Chrome Mobile short_name: CM - version: "62.0.3202.84" + version: "83.0.4103.106" engine: Blink engine_version: "" device: @@ -3708,7 +3708,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8276 Build/51.1.A.3.159) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8216 Build/51.1.A.2.183) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36 os: name: Android short_name: AND @@ -3718,7 +3718,7 @@ type: browser name: Chrome Mobile short_name: CM - version: "67.0.3396.87" + version: "62.0.3202.84" engine: Blink engine_version: "" device: @@ -3728,7 +3728,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8324 Build/51.1.A.4.225) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8276 Build/51.1.A.3.159) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 os: name: Android short_name: AND @@ -3748,7 +3748,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SOV37 Build/51.1.C.0.374) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8324 Build/51.1.A.4.225) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 os: name: Android short_name: AND @@ -3758,7 +3758,7 @@ type: browser name: Chrome Mobile short_name: CM - version: "69.0.3497.100" + version: "67.0.3396.87" engine: Blink engine_version: "" device: @@ -3768,7 +3768,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8314 Build/51.1.A.11.51) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.105 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SOV37 Build/51.1.C.0.374) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36 os: name: Android short_name: AND @@ -3778,7 +3778,7 @@ type: browser name: Chrome Mobile short_name: CM - version: "72.0.3626.105" + version: "69.0.3497.100" engine: Blink engine_version: "" device: @@ -3788,17 +3788,17 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 9; H8296) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; H8314 Build/51.1.A.11.51) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.105 Mobile Safari/537.36 os: name: Android short_name: AND - version: "9" + version: "8.0.0" platform: "" client: type: browser name: Chrome Mobile short_name: CM - version: "75.0.3770.101" + version: "72.0.3626.105" engine: Blink engine_version: "" device: @@ -3808,7 +3808,7 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 9; 702SO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 9; H8296) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36 os: name: Android short_name: AND @@ -3818,7 +3818,7 @@ type: browser name: Chrome Mobile short_name: CM - version: "83.0.4103.106" + version: "75.0.3770.101" engine: Blink engine_version: "" device: @@ -3828,11 +3828,11 @@ os_family: Android browser_family: Chrome - - user_agent: Mozilla/5.0 (Linux; Android 10; SO-03K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36 + user_agent: Mozilla/5.0 (Linux; Android 9; 702SO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36 os: name: Android short_name: AND - version: "10" + version: "9" platform: "" client: type: browser diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml index 5ec9ff2c0e..a6e2835ce1 100644 --- a/Tests/fixtures/smartphone-3.yml +++ b/Tests/fixtures/smartphone-3.yml @@ -139,6 +139,143 @@ model: BK-RAM2 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Hind 5.1 Build/OPM2.171019.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.73 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "8.1.0" + platform: "" + client: + type: browser + name: Chrome Webview + short_name: CV + version: "77.0.3865.73" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: C0 + model: Hind 5.1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux;U;Android 7.0;en-US;X417_Amaze Build/NRD90M) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1 UCBrowser/11.0.0.1016 Mobile + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: UC Browser + short_name: UC + version: "11.0.0.1016" + engine: WebKit + engine_version: "528.5" + device: + type: smartphone + brand: C0 + model: X417 Amaze + os_family: Android + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Linux; Android 7.0; X418 Zest Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/67.0.3396.87 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/176.0.0.42.87;]' + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: mobile app + name: Facebook + version: "176.0.0.42.87" + device: + type: smartphone + brand: C0 + model: X418 Zest + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 7.0; X421 Nova Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/65.0.3325.109 Mobile Safari/537.36 OPR/33.0.2254.125672 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Opera Mobile + short_name: OM + version: "33.0.2254.125672" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: C0 + model: X421 Nova + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; X422 Exotic Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.111 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Webview + short_name: CV + version: "63.0.3239.111" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: C0 + model: X422 Exotic + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; X425 Shavit Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "63.0.3239.111" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: C0 + model: X425 Shavit + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; X428 Astute Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Webview + short_name: CV + version: "68.0.3440.91" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: C0 + model: X428 Astute + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 7.1.2; Action-X3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36 os: @@ -4326,143 +4463,6 @@ model: Wing 9 os_family: Android browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Hind 5.1 Build/OPM2.171019.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.73 Mobile Safari/537.36 - os: - name: Android - short_name: AND - version: "8.1.0" - platform: "" - client: - type: browser - name: Chrome Webview - short_name: CV - version: "77.0.3865.73" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: CZ - model: Hind 5.1 - os_family: Android - browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux;U;Android 7.0;en-US;X417_Amaze Build/NRD90M) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1 UCBrowser/11.0.0.1016 Mobile - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: browser - name: UC Browser - short_name: UC - version: "11.0.0.1016" - engine: WebKit - engine_version: "528.5" - device: - type: smartphone - brand: CZ - model: X417 Amaze - os_family: Android - browser_family: Unknown -- - user_agent: 'Mozilla/5.0 (Linux; Android 7.0; X418 Zest Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/67.0.3396.87 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/176.0.0.42.87;]' - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: mobile app - name: Facebook - version: "176.0.0.42.87" - device: - type: smartphone - brand: CZ - model: X418 Zest - os_family: Android - browser_family: Unknown -- - user_agent: Mozilla/5.0 (Linux; U; Android 7.0; X421 Nova Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/65.0.3325.109 Mobile Safari/537.36 OPR/33.0.2254.125672 - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: browser - name: Opera Mobile - short_name: OM - version: "33.0.2254.125672" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: CZ - model: X421 Nova - os_family: Android - browser_family: Opera -- - user_agent: Mozilla/5.0 (Linux; Android 7.0; X422 Exotic Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.111 Mobile Safari/537.36 - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: browser - name: Chrome Webview - short_name: CV - version: "63.0.3239.111" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: CZ - model: X422 Exotic - os_family: Android - browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 7.0; X425 Shavit Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: browser - name: Chrome Mobile - short_name: CM - version: "63.0.3239.111" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: CZ - model: X425 Shavit - os_family: Android - browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 7.0; X428 Astute Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36 - os: - name: Android - short_name: AND - version: "7.0" - platform: "" - client: - type: browser - name: Chrome Webview - short_name: CV - version: "68.0.3440.91" - engine: Blink - engine_version: "" - device: - type: smartphone - brand: CZ - model: X428 Astute - os_family: Android - browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 7.0; DATSUN_D5500) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36 os: diff --git a/Tests/fixtures/smartphone-9.yml b/Tests/fixtures/smartphone-9.yml index 3d2045c3ec..a28622fb88 100644 --- a/Tests/fixtures/smartphone-9.yml +++ b/Tests/fixtures/smartphone-9.yml @@ -2000,26 +2000,6 @@ model: "2.1" os_family: Android browser_family: Chrome -- - user_agent: NOKIA-RH-17/V F100V1403.nep.0 UP.Browser/4.1.26l1.c.2.100 - os: - name: Symbian - short_name: SYM - version: "" - platform: "" - client: - type: browser - name: Openwave Mobile Browser - short_name: OV - version: "4.1.26" - engine: "" - engine_version: "" - device: - type: smartphone - brand: NK - model: "2280" - os_family: Symbian - browser_family: Unknown - user_agent: Nokia2323c-2/2.0 (08.20) Profile/MIDP-2.1 Configuration/CLDC-1.1 os: @@ -2160,6 +2140,86 @@ model: "5.1" os_family: Android browser_family: Chrome +- + user_agent: NOKIA-RH-17/V F100V1403.nep.0 UP.Browser/4.1.26l1.c.2.100 + os: + name: Symbian + short_name: SYM + version: "" + platform: "" + client: + type: browser + name: Openwave Mobile Browser + short_name: OV + version: "4.1.26" + engine: "" + engine_version: "" + device: + type: smartphone + brand: NK + model: "2280" + os_family: Symbian + browser_family: Unknown +- + user_agent: Nokia2720a-2/2.0 (09.85) Profile/MIDP-2.1 Configuration/CLDC-1.1 + os: + name: Symbian + short_name: SYM + version: "" + platform: "" + client: + type: browser + name: Nokia Browser + short_name: NB + version: "" + engine: "" + engine_version: "" + device: + type: smartphone + brand: NK + model: "2720" + os_family: Symbian + browser_family: Nokia Browser +- + user_agent: NOKIA-RH-48/V J190V0600.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 + os: + name: Symbian + short_name: SYM + version: "" + platform: "" + client: + type: browser + name: Openwave Mobile Browser + short_name: OV + version: "6.2.2.1" + engine: "" + engine_version: "" + device: + type: smartphone + brand: NK + model: "3105" + os_family: Symbian + browser_family: Unknown +- + user_agent: NOKIA-RM-11/V H190V0700.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 + os: + name: Symbian + short_name: SYM + version: "" + platform: "" + client: + type: browser + name: Openwave Mobile Browser + short_name: OV + version: "6.2.2.1" + engine: "" + engine_version: "" + device: + type: smartphone + brand: NK + model: "3205" + os_family: Symbian + browser_family: Unknown - user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Nokia 5.1 Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36 os: @@ -2380,6 +2440,26 @@ model: 6120 Classic os_family: Symbian browser_family: Nokia Browser +- + user_agent: NOKIA-RH-27/V H190V0800.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 + os: + name: Symbian + short_name: SYM + version: "" + platform: "" + client: + type: browser + name: Openwave Mobile Browser + short_name: OV + version: "6.2.2.1" + engine: "" + engine_version: "" + device: + type: smartphone + brand: NK + model: "6225" + os_family: Symbian + browser_family: Unknown - user_agent: UCWEB/2.0 (Symbian; U; S60 V3; ru; NOKIA6700s) U2/1.0.0 UCBrowser/9.0.1.317 U2/1.0.0 Mobile os: @@ -2580,86 +2660,6 @@ model: "8.1" os_family: Android browser_family: Chrome -- - user_agent: Nokia2720a-2/2.0 (09.85) Profile/MIDP-2.1 Configuration/CLDC-1.1 - os: - name: Symbian - short_name: SYM - version: "" - platform: "" - client: - type: browser - name: Nokia Browser - short_name: NB - version: "" - engine: "" - engine_version: "" - device: - type: smartphone - brand: NK - model: "2720" - os_family: Symbian - browser_family: Nokia Browser -- - user_agent: NOKIA-RH-48/V J190V0600.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 - os: - name: Symbian - short_name: SYM - version: "" - platform: "" - client: - type: browser - name: Openwave Mobile Browser - short_name: OV - version: "6.2.2.1" - engine: "" - engine_version: "" - device: - type: smartphone - brand: NK - model: "3105" - os_family: Symbian - browser_family: Unknown -- - user_agent: NOKIA-RM-11/V H190V0700.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 - os: - name: Symbian - short_name: SYM - version: "" - platform: "" - client: - type: browser - name: Openwave Mobile Browser - short_name: OV - version: "6.2.2.1" - engine: "" - engine_version: "" - device: - type: smartphone - brand: NK - model: "3205" - os_family: Symbian - browser_family: Unknown -- - user_agent: NOKIA-RH-27/V H190V0800.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 - os: - name: Symbian - short_name: SYM - version: "" - platform: "" - client: - type: browser - name: Openwave Mobile Browser - short_name: OV - version: "6.2.2.1" - engine: "" - engine_version: "" - device: - type: smartphone - brand: NK - model: "6225" - os_family: Symbian - browser_family: Unknown - user_agent: NOKIA-RH-34/V H190V0800.nep.0 UP.Browser/6.2.2.1.c.1.102 (GUI) MMP/2.0 os: From 7909817bc9edfd6ea37a96ac04bdf2b4ea9984bf Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 11 Aug 2020 22:43:40 +0200 Subject: [PATCH 49/49] use facebook notebook detection earlier --- DeviceDetector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DeviceDetector.php b/DeviceDetector.php index 780f1bae51..dc9f146e6f 100644 --- a/DeviceDetector.php +++ b/DeviceDetector.php @@ -181,12 +181,12 @@ public function __construct($userAgent = '') $this->addClientParser('Library'); $this->addDeviceParser('HbbTv'); + $this->addDeviceParser('Notebook'); $this->addDeviceParser('Console'); $this->addDeviceParser('CarBrowser'); $this->addDeviceParser('Camera'); $this->addDeviceParser('PortableMediaPlayer'); $this->addDeviceParser('Mobile'); - $this->addDeviceParser('Notebook'); $this->addBotParser(new Bot()); }