diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 894cdcd5df..dfde6ec325 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -197,6 +197,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'ATE' => 'Atlantic Electrics', '5Q' => 'Atmaca Elektronik', 'YH' => 'ATMAN', + 'ATM' => 'ATMPC', '2A' => 'Atom', 'AT1' => 'Atozee', 'ATO' => 'ATOL', @@ -1477,6 +1478,7 @@ abstract class AbstractDeviceParser extends AbstractParser '89' => 'Seatel', 'SEW' => 'Sewoo', 'SE1' => 'SEEWO', + 'SEN' => 'SENNA', 'Y7' => 'Saiet', 'SLF' => 'SAILF', 'X1' => 'Safaricom', @@ -1938,6 +1940,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'XN' => 'Xion', 'XO' => 'Xolo', 'XR' => 'Xoro', + 'XRL' => 'XREAL', 'XS' => 'Xshitou', 'XSM' => 'Xsmart', '4X' => 'Xtouch', diff --git a/Tests/fixtures/console.yml b/Tests/fixtures/console.yml index 90c8c2b14d..b8594ed4a5 100644 --- a/Tests/fixtures/console.yml +++ b/Tests/fixtures/console.yml @@ -666,3 +666,21 @@ model: 4 Pro os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 11; en-US; Retroid Pocket 3 Plus Build/RP1A.201005.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 UCBrowser/13.4.5.1308 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: UC Browser + version: 13.4.5.1308 + engine: Blink + engine_version: 78.0.3904.108 + device: + type: console + brand: Retroid Pocket + model: 3 Plus + os_family: Android + browser_family: Unknown diff --git a/Tests/fixtures/smartphone-40.yml b/Tests/fixtures/smartphone-40.yml index d4b0ba1cc0..f9f8e8fb1c 100644 --- a/Tests/fixtures/smartphone-40.yml +++ b/Tests/fixtures/smartphone-40.yml @@ -5123,3 +5123,485 @@ model: Yuva 2 Pro os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; zh-cn; PKA110 Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.61 Mobile Safari/537.36 HeyTapBrowser/40.8.30.9 + os: + name: Android + version: "14" + platform: "" + client: + type: mobile app + name: HeyTapBrowser + version: 40.8.30.9 + device: + type: smartphone + brand: OPPO + model: A3 5G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; zh-CN; PJX110 Build/UKQ1.231108.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 Quark/7.1.0.610 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Quark + version: 7.1.0.610 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: OnePlus + model: Ace 3 Pro 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; fr-fr; TECNO CL6k Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.6167.178 Mobile Safari/537.36 PHX/16.3 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Phoenix Browser + version: "16.3" + engine: Blink + engine_version: 121.0.6167.178 + device: + type: smartphone + brand: Tecno Mobile + model: Camon 30 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; X4000 Build/UKQ1.231222.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/13.7.8.1322 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: XREAL + model: Beam Pro + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-us; I2306 Build/JOP24G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.111 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Webview + version: 76.0.3809.111 + engine: Blink + engine_version: 76.0.3809.111 + device: + type: smartphone + brand: Vivo + model: iQOO Z9 Lite 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-us; moto g64 5G Build/JOP24G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.111 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Webview + version: 76.0.3809.111 + engine: Blink + engine_version: 76.0.3809.111 + device: + type: smartphone + brand: Motorola + model: Moto G64 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 13; en-us; SH-54D Build/JOP24G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.111 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome Webview + version: 76.0.3809.111 + engine: Blink + engine_version: 76.0.3809.111 + device: + type: smartphone + brand: Sharp + model: Aquos Sense 8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 11; en-US; PRIMO RX9 Build/RP1A.200720.011) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/13.7.8.1322 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: Walton + model: Primo RX9 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 10; Pearl K3 2021 Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/127.0.6533.64 Mobile Safari/537.36 OPR/82.0.2254.72589 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Opera Mobile + version: 82.0.2254.72589 + engine: Blink + engine_version: 127.0.6533.64 + device: + type: smartphone + brand: Hotwav + model: Pearl K3 (2021) + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; arm; Android 14; RMX3930) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.5993.859 YaSearchBrowser/23.111.1 BroPP/1.0 YaSearchApp/23.111.1 webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 23.111.1 + engine: Blink + engine_version: 118.0.5993.859 + device: + type: smartphone + brand: Realme + model: C61 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 10; ar-; Plume L5 Pro Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.134 Mobile Safari/537.36 PHX/16.2 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Phoenix Browser + version: "16.2" + engine: Blink + engine_version: 126.0.6478.134 + device: + type: smartphone + brand: Condor + model: Plume L5 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 13; HPPL63A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.124 YaBrowser/24.7.3.124.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.7.3.124.00 + engine: Blink + engine_version: 126.0.6478.124 + device: + type: smartphone + brand: Hot Pepper + model: Panca + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; Astro 63R Build/R01005) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 127.0.6533.103 + engine: Blink + engine_version: 127.0.6533.103 + device: + type: smartphone + brand: Maxwest + model: Astro 63R + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; Bharat 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.6045.105 Mobile Safari/537.36 OPR/105.0.4970.48 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Opera Mobile + version: 105.0.4970.48 + engine: Blink + engine_version: 119.0.6045.105 + device: + type: smartphone + brand: MicroMax + model: Bharat 5 + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; mipo_M17) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.116 YaBrowser/24.7.2.116.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.7.2.116.00 + engine: Blink + engine_version: 126.0.6478.116 + device: + type: smartphone + brand: mipo + model: M17 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; KINGKONG X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.616 YaSearchBrowser/24.73.1 BroPP/1.0 YaSearchApp/24.73.1 webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.73.1 + engine: Blink + engine_version: 126.0.6478.616 + device: + type: smartphone + brand: CUBOT + model: King Kong X + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; KINGKONG ACE 3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.740 YaSearchBrowser/24.72.1 BroPP/1.0 YaSearchApp/24.72.1 webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.72.1 + engine: Blink + engine_version: 126.0.6478.740 + device: + type: smartphone + brand: CUBOT + model: King Kong Ace 3 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; iQOO 7 India) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 91.0.4472.101 + engine: Blink + engine_version: 91.0.4472.101 + device: + type: smartphone + brand: Vivo + model: iQOO 7 India + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; iQOO 7 Legend) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3954.146 Mobile Safari/537.36 OPR/55.0.4024.46 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Opera Mobile + version: 55.0.4024.46 + engine: Blink + engine_version: 66.0.3954.146 + device: + type: smartphone + brand: Vivo + model: iQOO 7 Legend + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 11; iQOO 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Mobile Safari/537.36 EdgA/91.0.864.48 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Microsoft Edge + version: 91.0.864.48 + engine: Blink + engine_version: 91.0.4472.101 + device: + type: smartphone + brand: Vivo + model: iQOO 7 + os_family: Android + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (Linux; Android 14; LAVA LZG409) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 120.0.0.0 + engine: Blink + engine_version: 120.0.0.0 + device: + type: smartphone + brand: Lava + model: Yuva Star + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; zh-cn; RMX3995 Build/UKQ1.231108.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.61 Mobile Safari/537.36 HeyTapBrowser/40.8.34.3 + os: + name: Android + version: "14" + platform: "" + client: + type: mobile app + name: HeyTapBrowser + version: 40.8.34.3 + device: + type: smartphone + brand: Realme + model: V60 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; zh-CN; 2407FRK8EC Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 Quark/7.2.0.630 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Quark + version: 7.2.0.630 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: Xiaomi + model: Redmi K70 Ultra + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; zh-cn; 2311BPN23C Build/UKQ1.230804.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/109.0.5414.118 Mobile Safari/537.36 XiaoMi/MiuiBrowser/18.4.410719 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Mi Browser + version: 18.4.410719 + engine: Blink + engine_version: 109.0.5414.118 + device: + type: smartphone + brand: Xiaomi + model: 14 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; ru-ru; Xiaomi 14 Build/UKQ1.230804.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/112.0.5615.136 Mobile Safari/537.36 XiaoMi/MiuiBrowser/14.10.1-gn + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Mi Browser + version: 14.10.1 + engine: Blink + engine_version: 112.0.5615.136 + device: + type: smartphone + brand: Xiaomi + model: "14" + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; ru-ru; Xiaomi 13T Build/UP1A.230905.011) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/112.0.5615.136 Mobile Safari/537.36 XiaoMi/MiuiBrowser/14.10.1-gn + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Mi Browser + version: 14.10.1 + engine: Blink + engine_version: 112.0.5615.136 + device: + type: smartphone + brand: Xiaomi + model: 13T + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; Z2450 Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/13.7.8.1322 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: ZTE + model: Blade A55 + os_family: Android + browser_family: Unknown diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index d600441275..4e613b87c2 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -9099,3 +9099,255 @@ model: KingPad Z10 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 13; en-us; SKY_PAD8PRO Build/JOP24G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.111 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome Webview + version: 76.0.3809.111 + engine: Blink + engine_version: 76.0.3809.111 + device: + type: tablet + brand: Sky + model: Pad 8 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 12; QuartzLITE Build/QuartzLITE; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/127.0.6533.103 Safari/537.36 OPR/83.1.2254.73239 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Opera + version: 83.1.2254.73239 + engine: Blink + engine_version: 127.0.6533.103 + device: + type: tablet + brand: Vorcom + model: Quartz Lite + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; U; Android 10; en-US; V TAB 2 Build/QP1A.190711) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/13.7.8.1322 Mobile Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: tablet + brand: VGO TEL + model: V Tab 2 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; ALFA_10BT_V2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.124 YaBrowser/24.7.3.124.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.7.3.124.00 + engine: Blink + engine_version: 126.0.6478.124 + device: + type: tablet + brand: Hometech + model: ALFA 10BT V2 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; IT_701A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.98 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome + version: 97.0.4692.98 + engine: Blink + engine_version: 97.0.4692.98 + device: + type: tablet + brand: ATMPC + model: IT-701A + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; K113_EEA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.104 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome + version: 96.0.4664.104 + engine: Blink + engine_version: 96.0.4664.104 + device: + type: tablet + brand: FEONAL + model: K113 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; K118 Build/R01005; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/127.0.6533.103 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Webview + version: 127.0.6533.103 + engine: Blink + engine_version: 127.0.6533.103 + device: + type: tablet + brand: Zonko + model: K118 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 12; XT2261-1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 YaBrowser/23.1.2.86.01 Safari/537.36 + os: + name: Android + version: "12" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 23.1.2.86.01 + engine: Blink + engine_version: 108.0.0.0 + device: + type: tablet + brand: Motorola + model: Moto Tab G62 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; F35W_EEA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.116 YaBrowser/24.7.2.116.01 Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.7.2.116.01 + engine: Blink + engine_version: 126.0.6478.116 + device: + type: tablet + brand: Cwowdefu + model: F35W + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; C82W_EEA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.2368 YaApp_Android/24.70/apad YaSearchBrowser/24.70/apad BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Yandex Browser + version: "24.70" + engine: Blink + engine_version: 126.0.6478.2368 + device: + type: tablet + brand: Cwowdefu + model: C82W + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; F21W) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.116 YaBrowser/24.7.2.116.01 Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.7.2.116.01 + engine: Blink + engine_version: 126.0.6478.116 + device: + type: tablet + brand: Weelikeit + model: F21W + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 13; SMART_W31) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome + version: 127.0.0.0 + engine: Blink + engine_version: 127.0.0.0 + device: + type: tablet + brand: iGet + model: Smart W31 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; T28-EEA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Chrome + version: 127.0.0.0 + engine: Blink + engine_version: 127.0.0.0 + device: + type: tablet + brand: TOSCIDO + model: T28 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; T13_EEA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Chrome + version: 127.0.0.0 + engine: Blink + engine_version: 127.0.0.0 + device: + type: tablet + brand: Yestel + model: T13 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 48878ee9c8..448439d367 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -2127,3 +2127,183 @@ model: P5 Pro os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 13; NORDMENDE_55NM6000U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 YaApp_Android/21.111/apad YaSearchBrowser/21.111/apad BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: ARM + client: + type: browser + name: Yandex Browser + version: "21.111" + engine: Blink + engine_version: 94.0.4606.85 + device: + type: tv + brand: Nordmende + model: 55NM6000U + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 13; 32SN6000H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 YaApp_Android/21.111/apad YaSearchBrowser/21.111/apad BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: ARM + client: + type: browser + name: Yandex Browser + version: "21.111" + engine: Blink + engine_version: 94.0.4606.85 + device: + type: tv + brand: SENNA + model: 32SN6000H + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; 32LH8011T Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.1.2.86 (lite) TV Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.1.2.86 + engine: Blink + engine_version: 113.0.5672.163 + device: + type: tv + brand: Asano + model: 32LH8011T 32.0" + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; 32LF7111T Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.120 YaBrowser/24.1.2.250 (lite) Safari/537.36 TV + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.1.2.250 + engine: Blink + engine_version: 83.0.4103.120 + device: + type: tv + brand: Asano + model: 32LF7111T 32.0" + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; 32ST30H Build/RP1A.200720.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.91 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 69.0.3497.91 + engine: Blink + engine_version: 69.0.3497.91 + device: + type: tv + brand: OLTO + model: 32ST30H + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; 42GFS56 Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/22.8.0.12 (lite) TV Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 22.8.0.12 + engine: Blink + engine_version: 113.0.5672.163 + device: + type: tv + brand: Doffler + model: 42GFS56 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; 32F550T Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Webview + version: 113.0.5672.163 + engine: Blink + engine_version: 113.0.5672.163 + device: + type: tv + brand: Leff + model: 32F550T + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; 40F550T Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.1.2.86 (lite) TV Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.1.2.86 + engine: Blink + engine_version: 113.0.5672.163 + device: + type: tv + brand: Leff + model: 40F550T + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; GTKINGII) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome + version: 108.0.0.0 + engine: Blink + engine_version: 108.0.0.0 + device: + type: tv + brand: Beelink + model: GT King II + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; YNDX-00075 Build/RD2A.211001.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/118.0.5993.550 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 118.0.5993.550 + engine: Blink + engine_version: 118.0.5993.550 + device: + type: tv + brand: Yandex + model: YNDX-00075 + os_family: Android + browser_family: Chrome diff --git a/regexes/device/consoles.yml b/regexes/device/consoles.yml index 51f8438c7e..2a8bbf29a7 100644 --- a/regexes/device/consoles.yml +++ b/regexes/device/consoles.yml @@ -72,7 +72,7 @@ Retroid Pocket: regex: 'Retroid Pocket' device: 'console' models: - - regex: 'Retroid Pocket 2(?:Plus|\+)' - model: '2 Plus' + - regex: 'Retroid Pocket ([32]) ?(?:Plus|\+)' + model: '$1 Plus' - regex: 'Retroid Pocket 4 Pro' model: '4 Pro' diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 8f2b1c0031..050c6084bb 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -1687,7 +1687,7 @@ Apple: # micromax (https://micromaxinfo.com/) MicroMax: - regex: '(?:MicroMax[ \-\_]?[a-z0-9]+|Q327)|4560MMX|P70221|(?:YU(?:5012|5040|5530)|AQ5001(?: Canvas Power)?|Android 4(?:[\d.]*);(?: [\w-]+;)? A240|Android 8(?:[\d.]*);(?: [\w-]+;)? B5Pro|N8216|N8301|IN_2[bc]|IN_Note1|ione note|E7446|E7533)(?:[);/ ]|$)' + regex: '(?:MicroMax[ \-\_]?[a-z0-9]+|Q327)|4560MMX|P70221|(?:YU(?:5012|5040|5530)|AQ5001(?: Canvas Power)?|Android 4(?:[\d.]*);(?: [\w-]+;)? A240|Android 8(?:[\d.]*);(?: [\w-]+;)? B5Pro|Bharat 5|N8216|N8301|IN_2[bc]|IN_Note1|ione note|E7446|E7533)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'AQ5001 Canvas Power' @@ -4390,7 +4390,7 @@ Brondi: # VGO TEL (vgotel.com) VGO TEL: - regex: 'VGOTEL|(?:Venture V(?:[278]|12)|VentureV10|Ocean[_ ][689]|Ocean9L|NEW (?:1[01256]|2[024]|[57])|i_Smart)(?:[);/ ]|$)' + regex: 'VGOTEL|(?:Venture V(?:[278]|12)|VentureV10|Ocean[_ ][689]|Ocean9L|NEW (?:1[01256]|2[024]|[57])|V TAB 2|i_Smart)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'Venture ?V([278]|1[02])(?:[);/ ]|$)' @@ -4401,10 +4401,13 @@ VGO TEL: model: 'New $1' - regex: 'i_Smart' model: 'i Smart' + - regex: 'V TAB 2' + device: 'tablet' + model: 'V Tab 2' # Vivo (vivo.com.cn, vivo.com) Vivo: - regex: '((?:VIV-|BBG-)?(?