diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index c1434f1c9a..236031cc26 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -827,6 +827,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'HLL' => 'HLLO', 'HKC' => 'HKC', 'HMD' => 'HMD', + 'HIT' => 'Hi TFG', '8W' => 'HKPro', 'HOF' => 'HOFER', 'HOC' => 'hoco', @@ -911,7 +912,6 @@ abstract class AbstractDeviceParser extends AbstractParser 'FC' => 'INCAR', '2H' => 'Inch', '6I' => 'Inco', - 'INK' => 'Inka', 'IW' => 'iNew', 'IF' => 'Infinix', 'INF' => 'Infiniton', @@ -1146,6 +1146,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'MA1' => 'Mascom', '2M' => 'Masstel', '3X' => 'Mastertech', + 'MTH' => 'Mastertech Home', 'MAS' => 'Master-G', '50' => 'Matrix', 'MAT' => 'Matco Tools', @@ -1252,7 +1253,8 @@ abstract class AbstractDeviceParser extends AbstractParser 'MY' => 'MyPhone (PH)', '51' => 'Myros', 'M8' => 'Myria', - '6M' => 'Mystery', + '6ME' => 'Mystery', + '6M' => 'Mystery Tab', '3T' => 'MyTab', 'MG' => 'MyWigo', 'J3' => 'Mymaga', @@ -1302,12 +1304,12 @@ abstract class AbstractDeviceParser extends AbstractParser 'NX' => 'Nexian', '7X' => 'Nexa', '7XR' => 'Nexar', - 'N8' => 'NEXON', + 'N8' => 'NEXON.UA', 'N2' => 'Nextbit', 'NT' => 'NextBook', 'NTT' => 'NTT West', '4N' => 'NextTab', - 'NEX' => 'NEXT', + 'NEX' => 'Next Translator', 'NST' => 'Next & NextStar', 'NJO' => 'nJoy', 'NG' => 'NGM', @@ -1369,7 +1371,8 @@ abstract class AbstractDeviceParser extends AbstractParser 'OCE' => 'OCEANIC', 'OLT' => 'OLTO', 'OJ' => 'Ookee', - 'OD' => 'Onda', + 'OD' => 'Onda Tablet', + 'ODT' => 'Onda TLC', 'ON' => 'OnePlus', 'ONC' => 'OneClick', 'ONL' => 'OneLern', @@ -1670,7 +1673,8 @@ abstract class AbstractDeviceParser extends AbstractParser '83' => 'Sirin Labs', '5Z' => 'SK Broadband', 'GK' => 'SKG', - 'SW' => 'Sky', + 'SW' => 'Sky Devices', + 'SKU' => 'Sky UK', 'SK' => 'Skyworth', 'SKY' => 'Skyline', 'SK1' => 'SkyStream', @@ -2014,8 +2018,8 @@ abstract class AbstractDeviceParser extends AbstractParser 'VG' => 'Vorago', '2V' => 'Vorke', '8U' => 'Vorcom', - 'JW' => 'Vortex', - 'VRX' => 'VORTEX (RO)', + 'JW' => 'Vortex Cellular', + 'VRX' => 'Vortex', 'VOR' => 'Vormor', 'V1' => 'Voto', 'Z7' => 'VOX', @@ -2090,8 +2094,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'XV' => 'X-View', 'X4' => 'X.Vision', 'X88' => 'X88', - 'X96' => 'X96', - '96Q' => 'X96Q', + 'X96' => 'X96mini', 'A95' => 'A95X', 'XG' => 'Xgody', 'XGE' => 'XGEM', @@ -2176,7 +2179,6 @@ abstract class AbstractDeviceParser extends AbstractParser 'WBF' => 'Webfleet', 'WSS' => 'WS', // legacy brands, might be removed in future versions - 'WB' => 'Web TV', 'XX' => 'Unknown', ]; diff --git a/Tests/fixtures/clienthints.yml b/Tests/fixtures/clienthints.yml index 35bf7cb457..024b6a8619 100644 --- a/Tests/fixtures/clienthints.yml +++ b/Tests/fixtures/clienthints.yml @@ -2552,7 +2552,7 @@ engine_version: 114.0.5735.60 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: HD55 os_family: Android browser_family: Chrome @@ -2577,7 +2577,7 @@ engine_version: 121.0.6167.164 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: HD60 os_family: Android browser_family: Chrome @@ -2602,7 +2602,7 @@ engine_version: 119.0.6045.67 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: HD60i os_family: Android browser_family: Chrome @@ -2627,7 +2627,7 @@ engine_version: 111.0.5563.116 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: HD60L os_family: Android browser_family: Chrome @@ -2652,7 +2652,7 @@ engine_version: 125.0.6422.165 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: HD68 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-12.yml b/Tests/fixtures/smartphone-12.yml index 48987a9df3..ccf59ed79f 100644 --- a/Tests/fixtures/smartphone-12.yml +++ b/Tests/fixtures/smartphone-12.yml @@ -10081,7 +10081,7 @@ engine_version: 105.0.0.0 device: type: smartphone - brand: Hi + brand: Hi TFG model: Boost Max os_family: Android browser_family: Chrome @@ -10099,7 +10099,7 @@ engine_version: 107.0.0.0 device: type: smartphone - brand: Hi + brand: Hi TFG model: Boost os_family: Android browser_family: Chrome @@ -10801,7 +10801,7 @@ engine_version: 107.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite B65 os_family: Android browser_family: Chrome @@ -10819,7 +10819,7 @@ engine_version: 100.0.4896.127 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite G55 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-15.yml b/Tests/fixtures/smartphone-15.yml index dc764050e4..999c264de4 100644 --- a/Tests/fixtures/smartphone-15.yml +++ b/Tests/fixtures/smartphone-15.yml @@ -13,7 +13,7 @@ engine_version: "" device: type: smartphone - brand: Sky + brand: Sky Devices model: "3.5" os_family: Android browser_family: Unknown @@ -31,7 +31,7 @@ engine_version: 56.0.2924.87 device: type: smartphone - brand: Sky + brand: Sky Devices model: 4.0D os_family: Android browser_family: Chrome @@ -49,7 +49,7 @@ engine_version: 39.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: 4.5LM os_family: Android browser_family: Chrome @@ -67,7 +67,7 @@ engine_version: 64.0.3282.137 device: type: smartphone - brand: Sky + brand: Sky Devices model: 5.0LM os_family: Android browser_family: Chrome @@ -83,7 +83,7 @@ version: 45.0.0.38.146 device: type: smartphone - brand: Sky + brand: Sky Devices model: 5.5Q os_family: Android browser_family: Unknown @@ -101,7 +101,7 @@ engine_version: "" device: type: smartphone - brand: Sky + brand: Sky Devices model: 7.0W os_family: Android browser_family: Unknown @@ -119,7 +119,7 @@ engine_version: 50.0.2661.89 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite 5.0M os_family: Android browser_family: Chrome @@ -137,7 +137,7 @@ engine_version: 55.0.2883.91 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite 5.5 Octa os_family: Android browser_family: Chrome @@ -155,7 +155,7 @@ engine_version: 64.0.3282.123 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite 5.5L+ os_family: Android browser_family: Chrome @@ -173,7 +173,7 @@ engine_version: 59.0.3071.125 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite 6.0L os_family: Android browser_family: Chrome @@ -191,7 +191,7 @@ engine_version: 54.0.2840.85 device: type: smartphone - brand: Sky + brand: Sky Devices model: Fuego 4.0T os_family: Android browser_family: Chrome @@ -209,7 +209,7 @@ engine_version: 63.0.3239.111 device: type: smartphone - brand: Sky + brand: Sky Devices model: Fuego 5.0+ os_family: Android browser_family: Chrome @@ -227,7 +227,7 @@ engine_version: 71.0.3578.99 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum 5.0M os_family: Android browser_family: Chrome @@ -245,7 +245,7 @@ engine_version: 71.0.3578.99 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum 5.0M os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-18.yml b/Tests/fixtures/smartphone-18.yml index d7af5073c7..e3ce9ee866 100644 --- a/Tests/fixtures/smartphone-18.yml +++ b/Tests/fixtures/smartphone-18.yml @@ -3467,7 +3467,7 @@ engine_version: 94.0.4606.85 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite L55 os_family: Android browser_family: Chrome @@ -3485,7 +3485,7 @@ engine_version: 113.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite C63 os_family: Android browser_family: Chrome @@ -3503,7 +3503,7 @@ engine_version: 101.0.4951.41 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite A6 os_family: Android browser_family: Chrome @@ -3521,7 +3521,7 @@ engine_version: 102.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite Max os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-19.yml b/Tests/fixtures/smartphone-19.yml index 2c7c3d8e3c..c15482d4e2 100644 --- a/Tests/fixtures/smartphone-19.yml +++ b/Tests/fixtures/smartphone-19.yml @@ -6005,7 +6005,7 @@ engine_version: 79.0.3945.116 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum B4 os_family: Android browser_family: Chrome @@ -6023,7 +6023,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum C4 os_family: Android browser_family: Chrome @@ -6041,7 +6041,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum C55 os_family: Android browser_family: Chrome @@ -6059,7 +6059,7 @@ engine_version: 80.0.3987.149 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum D5 os_family: Android browser_family: Chrome @@ -6077,7 +6077,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum P9 os_family: Android browser_family: Chrome @@ -6095,7 +6095,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum P9 Pro os_family: Android browser_family: Chrome @@ -6113,7 +6113,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum X os_family: Android browser_family: Chrome @@ -6131,7 +6131,7 @@ engine_version: 80.0.3987.99 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum B5 os_family: Android browser_family: Chrome @@ -6149,7 +6149,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum A4 os_family: Android browser_family: Chrome @@ -6167,7 +6167,7 @@ engine_version: 83.0.4103.96 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum E5 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-20.yml b/Tests/fixtures/smartphone-20.yml index c0cfacfa0c..a8895f9277 100644 --- a/Tests/fixtures/smartphone-20.yml +++ b/Tests/fixtures/smartphone-20.yml @@ -13,7 +13,7 @@ engine_version: 83.0.4103.96 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum F5 os_family: Android browser_family: Chrome @@ -31,7 +31,7 @@ engine_version: 80.0.3987.87 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum G5 os_family: Android browser_family: Chrome @@ -49,7 +49,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum G55 os_family: Android browser_family: Chrome @@ -67,7 +67,7 @@ engine_version: 85.0.4183.101 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum UNO os_family: Android browser_family: Chrome @@ -877,7 +877,7 @@ engine_version: 80.0.3987.99 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite M45 os_family: Android browser_family: Chrome @@ -895,7 +895,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite Go os_family: Android browser_family: Chrome @@ -913,7 +913,7 @@ engine_version: 80.0.3987.99 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite M5 Plus os_family: Android browser_family: Chrome @@ -931,7 +931,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite T4 os_family: Android browser_family: Chrome @@ -2701,7 +2701,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: Sky + brand: Sky Devices model: Pro III os_family: Android browser_family: Chrome @@ -2719,7 +2719,7 @@ engine_version: 80.0.3987.87 device: type: smartphone - brand: Sky + brand: Sky Devices model: 55M os_family: Android browser_family: Chrome @@ -3115,7 +3115,7 @@ engine_version: 76.0.3809.89 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite T55 os_family: Android browser_family: Chrome @@ -3133,7 +3133,7 @@ engine_version: 85.0.4183.127 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite B5 os_family: Android browser_family: Chrome @@ -3367,7 +3367,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum O os_family: Android browser_family: Chrome @@ -4879,7 +4879,7 @@ engine_version: 83.0.4103.96 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum A55 os_family: Android browser_family: Chrome @@ -4897,7 +4897,7 @@ engine_version: 80.0.3987.87 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum A5 os_family: Android browser_family: Chrome @@ -4915,7 +4915,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum 4.0 Plus os_family: Android browser_family: Chrome @@ -4933,7 +4933,7 @@ engine_version: 80.0.3987.149 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum 5.5C os_family: Android browser_family: Chrome @@ -4951,7 +4951,7 @@ engine_version: 80.0.3987.99 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum A57 os_family: Android browser_family: Chrome @@ -4969,7 +4969,7 @@ engine_version: 76.0.3809.132 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum M4 os_family: Android browser_family: Chrome @@ -5347,7 +5347,7 @@ engine_version: 80.0.3987.87 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite T6 os_family: Android browser_family: Chrome @@ -5365,7 +5365,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite A5 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-21.yml b/Tests/fixtures/smartphone-21.yml index 02b2b91941..5f990ac615 100644 --- a/Tests/fixtures/smartphone-21.yml +++ b/Tests/fixtures/smartphone-21.yml @@ -2981,7 +2981,7 @@ engine_version: 80.0.3987.99 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite 45T os_family: Android browser_family: Chrome @@ -2999,7 +2999,7 @@ engine_version: 85.0.4183.127 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite 4T os_family: Android browser_family: Chrome @@ -3017,7 +3017,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite 5T os_family: Android browser_family: Chrome @@ -3035,7 +3035,7 @@ engine_version: 81.0.4044.117 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite 5.0T os_family: Android browser_family: Chrome @@ -3053,7 +3053,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite A55 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-22.yml b/Tests/fixtures/smartphone-22.yml index efe6d63983..a8a4afc351 100644 --- a/Tests/fixtures/smartphone-22.yml +++ b/Tests/fixtures/smartphone-22.yml @@ -1021,7 +1021,7 @@ engine_version: 63.0.3239.111 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum 4.0 os_family: Android browser_family: Chrome @@ -1039,7 +1039,7 @@ engine_version: 62.0.3202.84 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum 5.0 Plus os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-23.yml b/Tests/fixtures/smartphone-23.yml index 24a621338d..2611d4a90d 100644 --- a/Tests/fixtures/smartphone-23.yml +++ b/Tests/fixtures/smartphone-23.yml @@ -1021,7 +1021,7 @@ engine_version: 80.0.3987.117 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum 6.0 Plus os_family: Android browser_family: Chrome @@ -1039,7 +1039,7 @@ engine_version: 75.0.3770.67 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum 5.5 Plus os_family: Android browser_family: Chrome @@ -1057,7 +1057,7 @@ engine_version: 79.0.3945.136 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum 6.0 os_family: Android browser_family: Chrome @@ -2893,7 +2893,7 @@ engine_version: 90.0.4430.210 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite C55 os_family: Android browser_family: Chrome @@ -2911,7 +2911,7 @@ engine_version: 90.0.4430.82 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite B55 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-27.yml b/Tests/fixtures/smartphone-27.yml index c40fa06201..776cb31fd3 100644 --- a/Tests/fixtures/smartphone-27.yml +++ b/Tests/fixtures/smartphone-27.yml @@ -6145,7 +6145,7 @@ engine_version: 93.0.4577.82 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite E55 os_family: Android browser_family: Chrome @@ -6199,7 +6199,7 @@ engine_version: 94.0.4606.85 device: type: smartphone - brand: Sky + brand: Sky Devices model: Black os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-28.yml b/Tests/fixtures/smartphone-28.yml index 50e47fe1d3..18a078be14 100644 --- a/Tests/fixtures/smartphone-28.yml +++ b/Tests/fixtures/smartphone-28.yml @@ -3161,7 +3161,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite H5 os_family: Android browser_family: Chrome @@ -5137,7 +5137,7 @@ engine_version: 93.0.4577.62 device: type: smartphone - brand: Hi + brand: Hi TFG model: Boost Go os_family: Android browser_family: Chrome @@ -5839,7 +5839,7 @@ engine_version: 96.0.4664.45 device: type: smartphone - brand: Sky + brand: Sky Devices model: Prestige os_family: Android browser_family: Chrome @@ -6703,7 +6703,7 @@ engine_version: 69.0.3497.100 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum K55 os_family: Android browser_family: Chrome @@ -8193,7 +8193,7 @@ engine_version: 95.0.4638.74 device: type: smartphone - brand: Onda + brand: Onda TLC model: T9 S os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml index 916fb8f457..2c432d7b2e 100644 --- a/Tests/fixtures/smartphone-3.yml +++ b/Tests/fixtures/smartphone-3.yml @@ -11518,7 +11518,7 @@ engine_version: 87.0.4280.141 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum H5 os_family: Android browser_family: Chrome @@ -11536,7 +11536,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum J5 os_family: Android browser_family: Chrome @@ -11770,7 +11770,7 @@ engine_version: 93.0.4577.62 device: type: smartphone - brand: Hi + brand: Hi TFG model: Boost Ultra os_family: Android browser_family: Chrome @@ -11788,7 +11788,7 @@ engine_version: 96.0.4664.45 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite P55 os_family: Android browser_family: Chrome @@ -11806,7 +11806,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite H55 os_family: Android browser_family: Chrome @@ -11824,7 +11824,7 @@ engine_version: 96.0.4664.45 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite C5 os_family: Android browser_family: Chrome @@ -11842,7 +11842,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite P5 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml index fa0760895f..89e63e23a8 100644 --- a/Tests/fixtures/smartphone-30.yml +++ b/Tests/fixtures/smartphone-30.yml @@ -297,7 +297,7 @@ engine_version: 81.0.4044.111 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: SYNQ os_family: Android browser_family: Chrome @@ -5013,7 +5013,7 @@ engine_version: 80.0.3987.99 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite Photo Pro os_family: Android browser_family: Chrome @@ -7498,7 +7498,7 @@ engine_version: 80.0.3987.162 device: type: smartphone - brand: Sky + brand: Sky Devices model: Pro II os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-31.yml b/Tests/fixtures/smartphone-31.yml index 007554f046..ab079b496e 100644 --- a/Tests/fixtures/smartphone-31.yml +++ b/Tests/fixtures/smartphone-31.yml @@ -1327,7 +1327,7 @@ engine_version: 80.0.3987.149 device: type: smartphone - brand: Sky + brand: Sky Devices model: Pro Selfie os_family: Android browser_family: Chrome @@ -1795,7 +1795,7 @@ engine_version: 102.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Black 2 os_family: Android browser_family: Chrome @@ -2387,7 +2387,7 @@ engine_version: 102.0.5005.78 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite J55 os_family: Android browser_family: Chrome @@ -8409,7 +8409,7 @@ engine_version: 102.0.5005.78 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite E55 Max os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-32.yml b/Tests/fixtures/smartphone-32.yml index c306c6f964..1a01d3bf1a 100644 --- a/Tests/fixtures/smartphone-32.yml +++ b/Tests/fixtures/smartphone-32.yml @@ -5611,7 +5611,7 @@ engine_version: 70.0.3538.80 device: type: smartphone - brand: NEXT + brand: Next Translator model: Discovery XT os_family: Android browser_family: Chrome @@ -8653,7 +8653,7 @@ engine_version: 77.0.3865.116 device: type: smartphone - brand: Hi + brand: Hi TFG model: Crusader os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml index b0499a25c9..e750096691 100644 --- a/Tests/fixtures/smartphone-33.yml +++ b/Tests/fixtures/smartphone-33.yml @@ -3033,7 +3033,7 @@ engine_version: 105.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite V55 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-35.yml b/Tests/fixtures/smartphone-35.yml index 1648a481b7..a0827ca32e 100644 --- a/Tests/fixtures/smartphone-35.yml +++ b/Tests/fixtures/smartphone-35.yml @@ -6485,7 +6485,7 @@ engine_version: 81.0.4044.111 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite 6.0L+ os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-36.yml b/Tests/fixtures/smartphone-36.yml index 06805dda9b..6c514bb5ac 100644 --- a/Tests/fixtures/smartphone-36.yml +++ b/Tests/fixtures/smartphone-36.yml @@ -3667,7 +3667,7 @@ engine_version: 113.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite N55 os_family: Android browser_family: Chrome @@ -4297,7 +4297,7 @@ engine_version: 112.0.5615.135 device: type: smartphone - brand: Hi + brand: Hi TFG model: Boost Ultra os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-37.yml b/Tests/fixtures/smartphone-37.yml index aac29380ee..ab79254694 100644 --- a/Tests/fixtures/smartphone-37.yml +++ b/Tests/fixtures/smartphone-37.yml @@ -9251,7 +9251,7 @@ engine_version: 107.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite D55 os_family: Android browser_family: Chrome @@ -9377,7 +9377,7 @@ engine_version: 107.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum B4 os_family: Android browser_family: Chrome @@ -9629,7 +9629,7 @@ engine_version: 104.0.5112.97 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite N55 Max os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-38.yml b/Tests/fixtures/smartphone-38.yml index 6ea0326b42..dacd330c32 100644 --- a/Tests/fixtures/smartphone-38.yml +++ b/Tests/fixtures/smartphone-38.yml @@ -281,7 +281,7 @@ engine_version: 108.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite B63 os_family: Android browser_family: Chrome @@ -6846,7 +6846,7 @@ engine_version: 123.0.0.0 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: HD62 os_family: Android browser_family: Chrome @@ -7800,7 +7800,7 @@ engine_version: 123.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite A63 Max os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-39.yml b/Tests/fixtures/smartphone-39.yml index 68eb71f9c5..42030ec665 100644 --- a/Tests/fixtures/smartphone-39.yml +++ b/Tests/fixtures/smartphone-39.yml @@ -895,7 +895,7 @@ engine_version: 124.0.0.0 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: CM62 os_family: Android browser_family: Chrome @@ -913,7 +913,7 @@ engine_version: 111.0.0.0 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: HD65 Choice os_family: Android browser_family: Chrome @@ -1661,7 +1661,7 @@ engine_version: 123.0.6312.118 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: CG65 os_family: Android browser_family: Chrome @@ -2539,7 +2539,7 @@ engine_version: 105.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite P55 Max os_family: Android browser_family: Chrome @@ -2557,7 +2557,7 @@ engine_version: 94.0.4606.85 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite R55 os_family: Android browser_family: Chrome @@ -3545,7 +3545,7 @@ engine_version: 110.0.0.0 device: type: smartphone - brand: NEXT + brand: Next Translator model: Revolution-X69K os_family: Android browser_family: Unknown @@ -3725,7 +3725,7 @@ engine_version: 76.0.3809.111 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: HD65 Ultra os_family: Android browser_family: Chrome @@ -5717,7 +5717,7 @@ engine_version: 125.0.0.0 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: ZG65 Pro os_family: Android browser_family: Chrome @@ -7365,7 +7365,7 @@ engine_version: 126.0.0.0 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: ZG55 os_family: Android browser_family: Chrome @@ -8529,7 +8529,7 @@ engine_version: 125.0.0.0 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite G63 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-4.yml b/Tests/fixtures/smartphone-4.yml index 8b9df1099e..23a2f8c747 100644 --- a/Tests/fixtures/smartphone-4.yml +++ b/Tests/fixtures/smartphone-4.yml @@ -10640,7 +10640,7 @@ engine_version: 98.0.4758.101 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum P4 os_family: Android browser_family: Chrome @@ -10694,7 +10694,7 @@ engine_version: 98.0.4758.101 device: type: smartphone - brand: Sky + brand: Sky Devices model: Prestige X os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-40.yml b/Tests/fixtures/smartphone-40.yml index 49bbc2376b..d289838b26 100644 --- a/Tests/fixtures/smartphone-40.yml +++ b/Tests/fixtures/smartphone-40.yml @@ -787,7 +787,7 @@ engine_version: 126.0.0.0 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: HD65 Select os_family: Android browser_family: Chrome @@ -805,7 +805,7 @@ engine_version: 126.0.0.0 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: HD65 Plus os_family: Android browser_family: Chrome @@ -823,7 +823,7 @@ engine_version: 126.0.0.0 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: HD65 os_family: Android browser_family: Chrome @@ -4167,7 +4167,7 @@ engine_version: 126.0.6478.186 device: type: smartphone - brand: Vortex + brand: Vortex Cellular model: ZG65 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml index 5602f9ee13..7cc892c2e1 100644 --- a/Tests/fixtures/smartphone-5.yml +++ b/Tests/fixtures/smartphone-5.yml @@ -9088,7 +9088,7 @@ engine_version: 88.0.4324.181 device: type: smartphone - brand: Hi + brand: Hi TFG model: Boost Hypa os_family: Android browser_family: Chrome @@ -9106,7 +9106,7 @@ engine_version: 87.0.4280.141 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite F55 os_family: Android browser_family: Chrome @@ -9124,7 +9124,7 @@ engine_version: 98.0.4758.101 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite A65 os_family: Android browser_family: Chrome @@ -9250,7 +9250,7 @@ engine_version: 99.0.4844.73 device: type: smartphone - brand: Sky + brand: Sky Devices model: Elite D5 os_family: Android browser_family: Chrome @@ -9358,7 +9358,7 @@ engine_version: 99.0.4844.58 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum K5 os_family: Android browser_family: Chrome @@ -9376,7 +9376,7 @@ engine_version: 99.0.4844.88 device: type: smartphone - brand: Sky + brand: Sky Devices model: Platinum A7 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-7.yml b/Tests/fixtures/smartphone-7.yml index 67d4313221..da512bf08a 100644 --- a/Tests/fixtures/smartphone-7.yml +++ b/Tests/fixtures/smartphone-7.yml @@ -9021,7 +9021,7 @@ engine_version: 79.0.3945.116 device: type: smartphone - brand: Hi + brand: Hi TFG model: HMR5450 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-10.yml b/Tests/fixtures/tablet-10.yml index 0288cf8625..7dfdf960a6 100644 --- a/Tests/fixtures/tablet-10.yml +++ b/Tests/fixtures/tablet-10.yml @@ -7559,7 +7559,7 @@ engine_version: 40.0.2214.89 device: type: tablet - brand: Mystery + brand: Mystery Tab model: MID-823G os_family: Android browser_family: Unknown @@ -7775,7 +7775,7 @@ engine_version: 30.0.1599.92 device: type: tablet - brand: Onda + brand: Onda Tablet model: V919 Core 4 os_family: Android browser_family: Chrome @@ -8981,7 +8981,7 @@ engine_version: 80.0.3987.87 device: type: tablet - brand: Sky + brand: Sky Devices model: Platinum View os_family: Android browser_family: Chrome @@ -9179,7 +9179,7 @@ engine_version: 74.0.3729.157 device: type: tablet - brand: Onda + brand: Onda Tablet model: MID os_family: Android browser_family: Chrome @@ -9701,7 +9701,7 @@ engine_version: 81.0.4044.111 device: type: tablet - brand: Sky + brand: Sky Devices model: Platinum View2 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 2fafcdf24e..03be3e348e 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -67,7 +67,7 @@ engine_version: 108.0.0.0 device: type: tablet - brand: Vortex + brand: Vortex Cellular model: CMG101 os_family: Android browser_family: Chrome @@ -193,7 +193,7 @@ engine_version: 103.0.0.0 device: type: tablet - brand: Sky + brand: Sky Devices model: Elite Octa X os_family: Android browser_family: Chrome @@ -1315,7 +1315,7 @@ engine_version: 120.0.6099.111 device: type: tablet - brand: Vortex + brand: Vortex Cellular model: T10M Pro os_family: Android browser_family: Unknown @@ -3329,7 +3329,7 @@ engine_version: 124.0.0.0 device: type: tablet - brand: Vortex + brand: Vortex Cellular model: Z Tab 10 os_family: Android browser_family: Chrome @@ -3347,7 +3347,7 @@ engine_version: 108.0.0.0 device: type: tablet - brand: Vortex + brand: Vortex Cellular model: B Tab 10 os_family: Android browser_family: Chrome @@ -4067,7 +4067,7 @@ engine_version: 124.0.0.0 device: type: tablet - brand: Sky + brand: Sky Devices model: Pad 10 Max os_family: Android browser_family: Chrome @@ -4085,7 +4085,7 @@ engine_version: 124.0.0.0 device: type: tablet - brand: Sky + brand: Sky Devices model: Pad 10 Max os_family: Android browser_family: Chrome @@ -4103,7 +4103,7 @@ engine_version: 124.0.0.0 device: type: tablet - brand: Sky + brand: Sky Devices model: Pad 8 os_family: Android browser_family: Chrome @@ -4121,7 +4121,7 @@ engine_version: 124.0.0.0 device: type: tablet - brand: Sky + brand: Sky Devices model: Pad 8 Pro os_family: Android browser_family: Chrome @@ -4925,7 +4925,7 @@ engine_version: 124.0.6367.113 device: type: tablet - brand: Sky + brand: Sky Devices model: Elite T8 Plus os_family: Android browser_family: Opera @@ -9111,7 +9111,7 @@ engine_version: 76.0.3809.111 device: type: tablet - brand: Sky + brand: Sky Devices model: Pad 8 Pro os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-12.yml b/Tests/fixtures/tablet-12.yml index 12ed02d153..69dd47064a 100644 --- a/Tests/fixtures/tablet-12.yml +++ b/Tests/fixtures/tablet-12.yml @@ -1183,7 +1183,7 @@ engine_version: 130.0.6723.107 device: type: tablet - brand: Sky + brand: Sky Devices model: Elite T10 Pro os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-3.yml b/Tests/fixtures/tablet-3.yml index 5191a914f7..f163bfc198 100644 --- a/Tests/fixtures/tablet-3.yml +++ b/Tests/fixtures/tablet-3.yml @@ -5223,7 +5223,7 @@ engine_version: "534.30" device: type: tablet - brand: Onda + brand: Onda Tablet model: MID os_family: Android browser_family: Android Browser @@ -5241,7 +5241,7 @@ engine_version: 77.0.3865.116 device: type: tablet - brand: Onda + brand: Onda Tablet model: oBook 10 SE os_family: Android browser_family: Chrome @@ -5259,7 +5259,7 @@ engine_version: 78.0.3904.108 device: type: tablet - brand: Onda + brand: Onda Tablet model: oBook 20 Plus Dual OS os_family: Android browser_family: Chrome @@ -5277,7 +5277,7 @@ engine_version: 77.0.3865.92 device: type: tablet - brand: Onda + brand: Onda Tablet model: oBook 20 Plus Dual OS os_family: Android browser_family: Chrome @@ -5295,7 +5295,7 @@ engine_version: 78.0.3904.62 device: type: tablet - brand: Onda + brand: Onda Tablet model: oBook 20 SE os_family: Android browser_family: Chrome @@ -5313,7 +5313,7 @@ engine_version: 78.0.3904.62 device: type: tablet - brand: Onda + brand: Onda Tablet model: V10 10.1" 4G os_family: Android browser_family: Chrome @@ -5331,7 +5331,7 @@ engine_version: 79.0.3945.93 device: type: tablet - brand: Onda + brand: Onda Tablet model: V820W Dual OS os_family: Android browser_family: Chrome @@ -5349,7 +5349,7 @@ engine_version: 48.0.2564.8 device: type: tablet - brand: Onda + brand: Onda Tablet model: V891 Dual OS os_family: Android browser_family: Chrome @@ -5367,7 +5367,7 @@ engine_version: 77.0.3865.116 device: type: tablet - brand: Onda + brand: Onda Tablet model: V891W Dual OS os_family: Android browser_family: Chrome @@ -5385,7 +5385,7 @@ engine_version: 77.0.3865.92 device: type: tablet - brand: Onda + brand: Onda Tablet model: V919 3G Air Dual OS os_family: Android browser_family: Chrome @@ -5403,7 +5403,7 @@ engine_version: 78.0.3904.96 device: type: tablet - brand: Onda + brand: Onda Tablet model: V919 4G Air Core 8 os_family: Android browser_family: Chrome @@ -5421,7 +5421,7 @@ engine_version: 78.0.3904.96 device: type: tablet - brand: Onda + brand: Onda Tablet model: V919 Air CH Dual OS os_family: Android browser_family: Chrome @@ -5439,7 +5439,7 @@ engine_version: 76.0.3809.132 device: type: tablet - brand: Onda + brand: Onda Tablet model: V919 Air Dual OS os_family: Android browser_family: Opera @@ -5457,7 +5457,7 @@ engine_version: 79.0.3945.79 device: type: tablet - brand: Onda + brand: Onda Tablet model: V989 Air Core 8 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-5.yml b/Tests/fixtures/tablet-5.yml index 513f1da56e..041a9d79a2 100644 --- a/Tests/fixtures/tablet-5.yml +++ b/Tests/fixtures/tablet-5.yml @@ -8049,7 +8049,7 @@ engine_version: 77.0.3865.116 device: type: tablet - brand: Onda + brand: Onda Tablet model: V989 Core 8 os_family: Android browser_family: Internet Explorer diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml index ab900a93a0..11d4405ff4 100644 --- a/Tests/fixtures/tablet-6.yml +++ b/Tests/fixtures/tablet-6.yml @@ -1794,7 +1794,7 @@ engine_version: 80.0.3987.87 device: type: tablet - brand: Sky + brand: Sky Devices model: Vision os_family: Android browser_family: Chrome @@ -9652,7 +9652,7 @@ engine_version: 88.0.4324.181 device: type: tablet - brand: Sky + brand: Sky Devices model: Elite Octa os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 81ac5886b8..887af02477 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -6453,7 +6453,7 @@ engine_version: 101.0.0.0 device: type: tablet - brand: Sky + brand: Sky Devices model: Elite Octa XS os_family: Android browser_family: Chrome @@ -6471,7 +6471,7 @@ engine_version: 102.0.5005.78 device: type: tablet - brand: Sky + brand: Sky Devices model: Elite OctaPlus os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index 0a93c898aa..d12ad89f20 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -1111,7 +1111,7 @@ engine_version: 80.0.3987.162 device: type: tablet - brand: Sky + brand: Sky Devices model: Vision 2 os_family: Android browser_family: Chrome @@ -4889,7 +4889,7 @@ engine_version: 101.0.4951.61 device: type: tablet - brand: Sky + brand: Sky Devices model: Elite OctaMax os_family: Android browser_family: Chrome @@ -6813,7 +6813,7 @@ engine_version: 83.0.4103.106 device: type: tablet - brand: Onda + brand: Onda Tablet model: oBook 20 Plus os_family: Android browser_family: Chrome @@ -6831,7 +6831,7 @@ engine_version: 75.0.3770.143 device: type: tablet - brand: Onda + brand: Onda Tablet model: oBook 20 Plus os_family: Android browser_family: Chrome @@ -6849,7 +6849,7 @@ engine_version: 75.0.3770.143 device: type: tablet - brand: Onda + brand: Onda Tablet model: oBook 20 Dual OS os_family: Android browser_family: Chrome @@ -6867,7 +6867,7 @@ engine_version: 75.0.3770.101 device: type: tablet - brand: Onda + brand: Onda Tablet model: oBook 20 Plus os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 7097d37e37..d02cc4c313 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -2755,7 +2755,7 @@ engine_version: 76.0.3809.111 device: type: tablet - brand: Onda + brand: Onda Tablet model: V116w 3G Dual OS os_family: Android browser_family: Chrome @@ -3831,7 +3831,7 @@ engine_version: 84.0.4147.89 device: type: tablet - brand: Onda + brand: Onda Tablet model: V10 4G os_family: Android browser_family: Chrome @@ -4765,7 +4765,7 @@ engine_version: 76.0.3809.132 device: type: tablet - brand: Onda + brand: Onda Tablet model: V80 SE os_family: Android browser_family: Chrome @@ -4783,7 +4783,7 @@ engine_version: 84.0.4147.125 device: type: tablet - brand: Onda + brand: Onda Tablet model: V80 SE os_family: Android browser_family: Chrome @@ -7967,7 +7967,7 @@ engine_version: 112.0.0.0 device: type: tablet - brand: Sky + brand: Sky Devices model: Pad 10 os_family: Android browser_family: Chrome @@ -9389,7 +9389,7 @@ engine_version: 113.0.0.0 device: type: tablet - brand: Sky + brand: Sky Devices model: Elite T10 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet.yml b/Tests/fixtures/tablet.yml index a572d6cfff..9f9bfbabdd 100644 --- a/Tests/fixtures/tablet.yml +++ b/Tests/fixtures/tablet.yml @@ -3361,7 +3361,7 @@ engine_version: 42.0.2311.111 device: type: tablet - brand: Mystery + brand: Mystery Tab model: MID-123G os_family: Android browser_family: Chrome @@ -3379,7 +3379,7 @@ engine_version: "" device: type: tablet - brand: Mystery + brand: Mystery Tab model: MID-703G os_family: Android browser_family: Opera @@ -3397,7 +3397,7 @@ engine_version: "534.30" device: type: tablet - brand: Mystery + brand: Mystery Tab model: MID-713G os_family: Android browser_family: Android Browser @@ -3415,7 +3415,7 @@ engine_version: "534.30" device: type: tablet - brand: Mystery + brand: Mystery Tab model: MID-721 os_family: Android browser_family: Android Browser @@ -3433,7 +3433,7 @@ engine_version: "534.30" device: type: tablet - brand: Mystery + brand: Mystery Tab model: MID-722 os_family: Android browser_family: Android Browser @@ -3451,7 +3451,7 @@ engine_version: "534.30" device: type: tablet - brand: Mystery + brand: Mystery Tab model: MID-733G os_family: Android browser_family: Android Browser @@ -3469,7 +3469,7 @@ engine_version: "534.30" device: type: tablet - brand: Mystery + brand: Mystery Tab model: MID-743G os_family: Android browser_family: Android Browser @@ -3487,7 +3487,7 @@ engine_version: "" device: type: tablet - brand: Mystery + brand: Mystery Tab model: MID-753G os_family: Android browser_family: Unknown @@ -3505,7 +3505,7 @@ engine_version: 57.0.2987.108 device: type: tablet - brand: Mystery + brand: Mystery Tab model: MID-783G os_family: Android browser_family: Unknown @@ -3523,7 +3523,7 @@ engine_version: 57.0.2987.108 device: type: tablet - brand: Mystery + brand: Mystery Tab model: MID-833G os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml index 90717d4adc..c5366e5efb 100644 --- a/Tests/fixtures/tv-1.yml +++ b/Tests/fixtures/tv-1.yml @@ -283,7 +283,7 @@ engine_version: 90.0.4430.91 device: type: tv - brand: NEXON + brand: NEXON.UA model: X2 os_family: Android browser_family: Chrome @@ -2795,7 +2795,7 @@ engine_version: 88.0.4324.152 device: type: tv - brand: NEXON + brand: NEXON.UA model: X3+ os_family: Android browser_family: Chrome @@ -4541,7 +4541,7 @@ engine_version: 49.0.2623.75 device: type: tv - brand: Mastertech + brand: Mastertech Home model: 32D1902 os_family: GNU/Linux browser_family: Chrome @@ -6832,7 +6832,7 @@ engine_version: 84.0.4147.89 device: type: tv - brand: X96 + brand: X96mini model: Air A100 os_family: Android browser_family: Chrome @@ -7475,8 +7475,8 @@ engine_version: 72.0.3626.121 device: type: tv - brand: X96Q - model: "" + brand: X96mini + model: X96Q os_family: Android browser_family: Chrome - @@ -7959,7 +7959,7 @@ engine_version: 104.0.0.0 device: type: tv - brand: X96 + brand: X96mini model: X6i os_family: Android browser_family: Chrome @@ -7977,7 +7977,7 @@ engine_version: 102.0.5005.134 device: type: tv - brand: X96 + brand: X96mini model: Max Plus Ultra os_family: Android browser_family: Opera @@ -8890,7 +8890,7 @@ engine_version: 99.0.4844.88 device: type: tv - brand: X96 + brand: X96mini model: Mate Plus os_family: Android browser_family: Opera diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index 816d21237f..cad51778e9 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -913,7 +913,7 @@ engine_version: 110.0.0.0 device: type: tv - brand: X96 + brand: X96mini model: Mini 11 os_family: Android browser_family: Chrome @@ -931,7 +931,7 @@ engine_version: 110.0.0.0 device: type: tv - brand: NEXON + brand: NEXON.UA model: X1+ os_family: Android browser_family: Chrome @@ -4312,7 +4312,7 @@ engine_version: 108.0.5359.215 device: type: tv - brand: NEXON + brand: NEXON.UA model: X3 os_family: Android browser_family: Opera @@ -5464,7 +5464,8 @@ engine_version: 77.0.3865.120 device: type: tv - brand: NEXT + #Previously "NEXT", but https://www.next.com.tr/start-4k-tv-box suggests that (found with search term ""NEXT" android tv" in images) suggests that it's Next & NextStar and not a separate brand) + brand: Next & NextStar model: Smart TV (2020) os_family: GNU/Linux browser_family: Opera @@ -7142,7 +7143,7 @@ engine_version: 53.0.2785.143 device: type: tv - brand: NEXON + brand: NEXON.UA model: Smart TV (2017) os_family: GNU/Linux browser_family: Opera @@ -7160,7 +7161,7 @@ engine_version: 77.0.3865.120 device: type: tv - brand: NEXON + brand: NEXON.UA model: Smart TV (2020) os_family: GNU/Linux browser_family: Opera @@ -8132,7 +8133,7 @@ engine_version: 85.0.4183.127 device: type: tv - brand: NEXON + brand: NEXON.UA model: X8 os_family: Android browser_family: Chrome @@ -8636,7 +8637,7 @@ engine_version: 79.0.3945.93 device: type: tv - brand: NEXON + brand: NEXON.UA model: X5 os_family: Android browser_family: Chrome @@ -9878,7 +9879,7 @@ engine_version: 71.0.3578.99 device: type: tv - brand: X96 + brand: X96mini model: Air V2 os_family: Android browser_family: Chrome @@ -9896,7 +9897,7 @@ engine_version: 84.0.4147.89 device: type: tv - brand: X96 + brand: X96mini model: Air 100W os_family: Android browser_family: Chrome @@ -9914,7 +9915,7 @@ engine_version: 74.0.3729.136 device: type: tv - brand: X96 + brand: X96mini model: Air P1 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tv-3.yml b/Tests/fixtures/tv-3.yml index 1123cb5156..1f1f71997a 100644 --- a/Tests/fixtures/tv-3.yml +++ b/Tests/fixtures/tv-3.yml @@ -987,7 +987,7 @@ engine_version: 45.0.2454.101 device: type: tv - brand: Sky + brand: Sky UK model: Q 2TB os_family: GNU/Linux browser_family: Chrome @@ -1005,7 +1005,7 @@ engine_version: 45.0.2454.101 device: type: tv - brand: Sky + brand: Sky UK model: Q Mini os_family: GNU/Linux browser_family: Chrome @@ -1023,7 +1023,7 @@ engine_version: 45.0.2454.101 device: type: tv - brand: Sky + brand: Sky UK model: Q 2TB os_family: GNU/Linux browser_family: Chrome @@ -1041,7 +1041,7 @@ engine_version: 45.0.2454.101 device: type: tv - brand: Sky + brand: Sky UK model: Q 1TB os_family: GNU/Linux browser_family: Chrome @@ -1059,7 +1059,7 @@ engine_version: 69.0.3497.113 device: type: tv - brand: Sky + brand: Sky UK model: Q 2TB V3 os_family: GNU/Linux browser_family: Chrome @@ -1077,7 +1077,7 @@ engine_version: "601.1" device: type: tv - brand: Sky + brand: Sky UK model: XiOneUK os_family: GNU/Linux browser_family: Safari @@ -1095,7 +1095,7 @@ engine_version: "601.1" device: type: tv - brand: Sky + brand: Sky UK model: LlamaUK os_family: GNU/Linux browser_family: Safari @@ -2321,7 +2321,7 @@ engine_version: "" device: type: tv - brand: Inka + brand: X96mini model: X96 mini os_family: Android browser_family: Android Browser @@ -3113,7 +3113,7 @@ engine_version: 83.0.4103.120 device: type: tv - brand: NEXON + brand: NEXON.UA model: X10 os_family: Android browser_family: Opera @@ -3887,7 +3887,7 @@ engine_version: 122.0.6261.149 device: type: tv - brand: NEXON + brand: NEXON.UA model: X5+ os_family: Android browser_family: Opera @@ -3995,7 +3995,7 @@ engine_version: 72.0.3626.121 device: type: tv - brand: NEXON + brand: NEXON.UA model: X3 os_family: Android browser_family: Chrome @@ -7595,7 +7595,7 @@ engine_version: 74.0.3729.136 device: type: tv - brand: X96 + brand: X96mini model: Air P2 os_family: Android browser_family: Chrome @@ -7613,7 +7613,7 @@ engine_version: 71.0.3578.99 device: type: tv - brand: X96 + brand: X96mini model: Air P3 os_family: Android browser_family: Chrome @@ -7991,7 +7991,7 @@ engine_version: 76.0.3809.111 device: type: tv - brand: X96 + brand: X96mini model: Max Plus 2 os_family: Android browser_family: Chrome @@ -8009,7 +8009,7 @@ engine_version: 84.0.4147.89 device: type: tv - brand: X96 + brand: X96mini model: Max Plus 5 os_family: Android browser_family: Opera @@ -8027,7 +8027,7 @@ engine_version: 84.0.4147.89 device: type: tv - brand: X96 + brand: X96mini model: Max Plus Q1 os_family: Android browser_family: Opera @@ -8045,7 +8045,7 @@ engine_version: 74.0.3729.136 device: type: tv - brand: X96 + brand: X96mini model: Max Plus os_family: Android browser_family: Opera @@ -8063,7 +8063,7 @@ engine_version: 122.0.6261.39 device: type: tv - brand: X96 + brand: X96mini model: Max Plus Q2 os_family: Android browser_family: Unknown @@ -9251,7 +9251,7 @@ engine_version: 88.0.4324.152 device: type: tv - brand: NEXON + brand: NEXON.UA model: X2+ os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 1a1707bad0..efb284ee55 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -7838,7 +7838,7 @@ engine_version: 108.0.5359.128 device: type: tv - brand: NEXON + brand: NEXON.UA model: "" os_family: GNU/Linux browser_family: Opera @@ -8522,7 +8522,7 @@ engine_version: 108.0.5359.128 device: type: tv - brand: VORTEX (RO) + brand: Vortex model: Smart TV (2023) os_family: GNU/Linux browser_family: Opera diff --git a/Tests/fixtures/tv.yml b/Tests/fixtures/tv.yml index 75cd6a9624..c15b93edf2 100644 --- a/Tests/fixtures/tv.yml +++ b/Tests/fixtures/tv.yml @@ -3343,7 +3343,7 @@ engine_version: 71.0.3578.99 device: type: tv - brand: NEXON + brand: NEXON.UA model: X1 os_family: Android browser_family: Chrome @@ -3361,7 +3361,7 @@ engine_version: 80.0.3987.162 device: type: tv - brand: NEXON + brand: NEXON.UA model: X9 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 6295b43e8c..1040e54a96 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -17537,16 +17537,21 @@ Masstel: - regex: '(?:Masstel[_ ]*)?(Juno[_ ]Q[3567]|Juno_S6|[MNXB]\d+|LT52|N600S)(?:[);/ ]|$)' model: '$1' -# Mastertech (https://mastertechhome.com/) +# Mastertech (https://www.falabella.com.pe/falabella-pe/brand/MASTERTECH http://www.grupomastertech.pe or https://www.facebook.com/grupomastertechperu/) Mastertech: + regex: 'QC77QPS(?:[);/ ]|$)' + device: 'tablet' + models: + - regex: '(QC77QPS)(?:[);/ ]|$)' + model: '$1' + +# Mastertech Home (part of Unicomer Group, https://mastertechhome.com/) +Mastertech Home: regex: 'MASTERTECH,([a-z0-9_ -]+),(?:wired|wireless)|QC77QPS(?:[);/ ]|$)' device: 'tv' models: - regex: 'MASTERTECH,([a-z0-9_ -]+),(?:wired|wireless)' model: '$1' - - regex: '(QC77QPS)(?:[);/ ]|$)' - model: '$1' - device: 'tablet' # Talius Talius: @@ -20228,75 +20233,59 @@ Olympia: - regex: 'TREK(?:[);/ ]|$)' model: 'Trek' -# onda (ondatlc.com) -Onda: - regex: 'Onda|(?:(?:V820w|V891[w]?|V919(?: 3G)? Air)[ _-]DualOS|(?:V919 4G Air|V989 Air|V972) Core[48]|T2101L2B1C| V10 4G|OBOOK20[_ ]PLUS|OBOOK (?:20 SE|20 DualOS|20 PLUS(?: DUALOS)?)|OBOOK10 SE|V10_4G|V919 Air CH DualOS| T9S|V116w-DualOS|V80[ _]SE)(?:[);/ ]|$)' +# Onda TLC (https://ondatlc.com) +Onda TLC: + regex: '(?: T9S)(?:[);/ ]|$)' device: 'smartphone' models: - regex: '(?: T9S)(?:[);/ ]|$)' model: 'T9 S' - # explicit tablet models +# Onda Tablet (https://www.onda-tablet.com/ | https://www.ifixit.com/Device/Onda_Tablet) +Onda Tablet: + regex: 'Onda|(?:(?:V820w|V891[w]?|V919(?: 3G)? Air)[ _-]DualOS|(?:V919 4G Air|V989 Air|V972) Core[48]|T2101L2B1C| V10 4G|OBOOK20[_ ]PLUS|OBOOK (?:20 SE|20 DualOS|20 PLUS(?: DUALOS)?)|OBOOK10 SE|V10_4G|V919 Air CH DualOS|V116w-DualOS|V80[ _]SE)(?:[);/ ]|$)' + device: 'tablet' + models: - regex: 'ONDA[ _]MID' model: 'MID' - device: 'tablet' - regex: 'V820w[ _-]DualOS' model: 'V820W Dual OS' - device: 'tablet' - regex: 'V891W[ _-]DualOS' model: 'V891W Dual OS' - device: 'tablet' - regex: 'V891[ _-]DualOS' model: 'V891 Dual OS' - device: 'tablet' - regex: 'V919 3G Air[ _-]DualOS' model: 'V919 3G Air Dual OS' - device: 'tablet' - regex: 'V116w-DualOS' model: 'V116w 3G Dual OS' - device: 'tablet' - regex: 'V919 Air[ _-]DualOS' model: 'V919 Air Dual OS' - device: 'tablet' - regex: 'V919 Air CH DualOS' model: 'V919 Air CH Dual OS' - device: 'tablet' - regex: 'V919 4G Air Core8' model: 'V919 4G Air Core 8' - device: 'tablet' - regex: 'V972 Core4' model: 'V919 Core 4' - device: 'tablet' - regex: 'V989 Air Core8' model: 'V989 Air Core 8' - device: 'tablet' - regex: 'ONDA V989' model: 'V989 Core 8' - device: 'tablet' - regex: 'T2101L2B1C|OBOOK 20 PLUS DUALOS' model: 'oBook 20 Plus Dual OS' - device: 'tablet' - regex: 'OBOOK[_ ]?20[_ ]PLUS' - device: 'tablet' model: 'oBook 20 Plus' - regex: 'V10 4G(?:[);/ ]|$)' model: 'V10 10.1" 4G' - device: 'tablet' - regex: 'V80[ _]SE(?:[);/ ]|$)' model: 'V80 SE' - device: 'tablet' - regex: 'OBOOK 20 DualOS(?:[);/ ]|$)' model: 'oBook 20 Dual OS' - device: 'tablet' - regex: 'OBOOK 20 SE(?:[);/ ]|$)' model: 'oBook 20 SE' - device: 'tablet' - regex: 'OBOOK10 SE(?:[);/ ]|$)' model: 'oBook 10 SE' - device: 'tablet' - regex: 'V10_4G(?:[);/ ]|$)' model: 'V10 4G' - device: 'tablet' - regex: '([a-z0-9]+)[ _]Onda' model: '$1' @@ -24492,8 +24481,8 @@ UnoPhone: model: 'Premier Pro' # Sky or Sky Devices or SKY EVO (skydevices.com) -Sky: - regex: '(?:SKY|Elite|Fuego)[_ ][3-7]\.[05](?:[A-Z]{1,2})?|Elite[ _](?:Max|PHOTOPRO|5_0T|M45|[45]T|45T|GO|A63Max|M5Plus|T8Plus|T[46]|[ABCDHP]5|A6|5_5_Octa|Octa|[A-HJLNPTVR]55|[AB]65|[CG]63|T10)|Platinum[_ ](?:5\.0M|5\.5C|[56]\.[05]\+?|[ABCMP]4|[ACGKV]55|[ABDEFGHJKM]5|A7|A57|P9|X|UNO|VIEW2|O|4\.0|4_0Plus)|PLATINUMVIEW|SKY[ _](?:55M|Pro_III|PAD10|PAD8)|SKYVISION|SKY B(?:lack|63)| SKY[ _]Prestige|Sky Vision2|PRO_SELFIE|Sky,' +Sky Devices: + regex: '(?:SKY|Elite|Fuego)[_ ][3-7]\.[05](?:[A-Z]{1,2})?|Elite[ _](?:Max|PHOTOPRO|5_0T|M45|[45]T|45T|GO|A63Max|M5Plus|T8Plus|T[46]|[ABCDHP]5|A6|5_5_Octa|Octa|[A-HJLNPTVR]55|[AB]65|[CG]63|T10)|Platinum[_ ](?:5\.0M|5\.5C|[56]\.[05]\+?|[ABCMP]4|[ACGKV]55|[ABDEFGHJKM]5|A7|A57|P9|X|UNO|VIEW2|O|4\.0|4_0Plus)|PLATINUMVIEW|SKY[ _](?:55M|Pro_III|PAD10|PAD8)|SKYVISION|SKY B(?:lack|63)| SKY[ _]Prestige|Sky Vision2|PRO_SELFIE' device: 'smartphone' models: - regex: 'Platinum[_ ](?:5\.0M|M5)' @@ -24591,21 +24580,21 @@ Sky: - regex: 'SKY[_ ]([3-7]\.[05](?:[A-Z]{1,2})?)' model: '$1' +# Sky UK (https://www.sky.com/help/articles/sky-tv-on-demand) +Sky UK: + regex: '(?:EM150|ES130|ES140|ES240|ES340|Sky, (?:XiOneUK|LlamaUK), (?:wired|wireless))' + device: 'tv' + models: - regex: 'EM150' model: 'Q Mini' - device: 'tv' - regex: 'ES130' model: 'Q 1TB' - device: 'tv' - regex: 'ES140' model: 'Q 2TB' - device: 'tv' - regex: 'ES240' model: 'Q 2TB' - device: 'tv' - regex: 'ES340' model: 'Q 2TB V3' - device: 'tv' - regex: 'Sky, (XiOneUK|LlamaUK), (?:wired|wireless)' model: '$1' device: 'tv' @@ -28301,6 +28290,16 @@ Vios: device: 'tablet' model: 'VTAB7' +# Vortex (sub-brand of https://www.altex.ro/) +Vortex: + regex: '(?:VORTEX[;,)]|V39TPHE01S|V32TPHDE1S|V24TPHDE1S)' + device: 'tv' + models: + - regex: '_TV_[A-Z0-9]+_([0-9]{4});' + model: 'Smart TV ($1)' + - regex: '(V39TPHE01S|V32TPHDE1S|V24TPHDE1S)' + model: '$1' + # Vestel (vestel.com) Vestel: regex: 'Vestel[ _,/\-]|Venus[ _](GO|E[2-5]|V[1-9]|Z[1-9]0)|(?