diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index c8d9e4450b..44846b97bf 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1117,6 +1117,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'MEG' => 'MEGA VISION', 'MCA' => 'Megacable', 'MP' => 'MegaFon', + 'MGX' => 'MEGAMAX', 'X0' => 'mPhone', '3M' => 'Meitu', 'M1' => 'Meizu', @@ -1360,6 +1361,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'PND' => 'Panodic', 'PA1' => 'Panoramic', 'PLT' => 'Platoon', + 'PLD' => 'PLDT', '94' => 'Packard Bell', 'H9' => 'Parrot Mobile', 'PAR' => 'Partner Mobile', diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml index 0f4b0b03a2..68e9283836 100644 --- a/Tests/fixtures/peripheral.yml +++ b/Tests/fixtures/peripheral.yml @@ -1576,3 +1576,21 @@ model: StandbyME os_family: Other Mobile browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; Aura_TELPAD_MT7_tablet) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Mobile Safari/537.36 OPR/76.0.4017.107 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Opera Mobile + version: 76.0.4017.107 + engine: Blink + engine_version: 90.0.4430.93 + device: + type: peripheral + brand: PLDT + model: TelPad MT7 + os_family: Android + browser_family: Opera diff --git a/Tests/fixtures/phablet-1.yml b/Tests/fixtures/phablet-1.yml index bc46ef95a5..f3c9e3884f 100644 --- a/Tests/fixtures/phablet-1.yml +++ b/Tests/fixtures/phablet-1.yml @@ -5544,3 +5544,39 @@ model: Galaxy Note 10+ os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-F7310) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.120 YaSearchBrowser/24.66.1 BroPP/1.0 YaSearchApp/24.66.1 webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.66.1 + engine: Blink + engine_version: 124.0.6367.120 + device: + type: phablet + brand: Samsung + model: Galaxy Z Flip 5 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 12; SM-N970W) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 130.0.0.0 + engine: Blink + engine_version: 130.0.0.0 + device: + type: phablet + brand: Samsung + model: Galaxy Note 10 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/portable_media_player.yml b/Tests/fixtures/portable_media_player.yml index 29223fa9cd..a939e89583 100644 --- a/Tests/fixtures/portable_media_player.yml +++ b/Tests/fixtures/portable_media_player.yml @@ -1007,3 +1007,21 @@ model: M8 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 9; Oilsky M303-Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.279 YaBrowser/24.12.0.279.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.12.0.279.00 + engine: Blink + engine_version: 130.0.6723.279 + device: + type: portable media player + brand: Oilsky + model: M303 Pro + os_family: Android + browser_family: Unknown diff --git a/Tests/fixtures/smart_speaker.yml b/Tests/fixtures/smart_speaker.yml index 32cb329ea6..639d7f6f56 100644 --- a/Tests/fixtures/smart_speaker.yml +++ b/Tests/fixtures/smart_speaker.yml @@ -329,3 +329,21 @@ model: Echo Show (Gen 2) os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 9; yandexstation_2 Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/118.0.5993.550 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 118.0.5993.550 + engine: Blink + engine_version: 118.0.5993.550 + device: + type: smart speaker + brand: Yandex + model: Station 2 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index 02a3483a13..93cade206a 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -3472,3 +3472,273 @@ model: "403" os_family: Android browser_family: Chrome +- + user_agent: DNS-DNS-S3504/1.0 Linux/2.6.35.7 Android/2.3.5 Release/05.30.2014 Browser/AppleWebKit533.1 (KHTML, like Gecko) Mozilla/5.0 Mobile + os: + name: Android + version: 2.3.5 + platform: "" + client: + type: browser + name: Android Browser + version: "" + engine: WebKit + engine_version: "533.1" + device: + type: smartphone + brand: DNS + model: S3504 Meteor 3.5" + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-A256N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.503 YaApp_Android/24.65.1 YaSearchBrowser/24.65.1 BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.65.1 + engine: Blink + engine_version: 124.0.6367.503 + device: + type: smartphone + brand: Samsung + model: Galaxy A25 5G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-A256U1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.991 YaApp_Android/24.43.1 YaSearchBrowser/24.43.1 BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.43.1 + engine: Blink + engine_version: 122.0.6261.991 + device: + type: smartphone + brand: Samsung + model: Galaxy A25 5G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-A3560) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.702 YaApp_Android/24.43.1 YaSearchBrowser/24.43.1 BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.43.1 + engine: Blink + engine_version: 122.0.6261.702 + device: + type: smartphone + brand: Samsung + model: Galaxy A35 5G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 10; Meizu 15 Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.5790.171 Mobile Safari/537.36 OPR/101.0.4843.43 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Opera Mobile + version: 101.0.4843.43 + engine: Blink + engine_version: 115.0.5790.171 + device: + type: smartphone + brand: Meizu + model: 15 Plus + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 15; V2415A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "15" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 130.0.0.0 + engine: Blink + engine_version: 130.0.0.0 + device: + type: smartphone + brand: Vivo + model: X200 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 15; TCL 10 5G UW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "15" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 117.0.0.0 + engine: Blink + engine_version: 117.0.0.0 + device: + type: smartphone + brand: TCL + model: 10 5G UW + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; meizu X8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 131.0.0.0 + engine: Blink + engine_version: 131.0.0.0 + device: + type: smartphone + brand: Meizu + model: X8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 15; V2419A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "15" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 131.0.0.0 + engine: Blink + engine_version: 131.0.0.0 + device: + type: smartphone + brand: Vivo + model: X200 Pro Mini + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; Cyber 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.33 YaBrowser/24.10.6.33.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.10.6.33.00 + engine: Blink + engine_version: 128.0.6613.33 + device: + type: smartphone + brand: Hotwav + model: Cyber 13 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 15; PJZ110) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "15" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 131.0.0.0 + engine: Blink + engine_version: 131.0.0.0 + device: + type: smartphone + brand: OnePlus + model: "13" + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; KINGKONG STAR 2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 131.0.0.0 + engine: Blink + engine_version: 131.0.0.0 + device: + type: smartphone + brand: CUBOT + model: King Kong Star 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; TECNO CL7k) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 131.0.0.0 + engine: Blink + engine_version: 131.0.0.0 + device: + type: smartphone + brand: Tecno Mobile + model: Camon 30 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 10; Multilaser_Elite_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.67 YaSearchBrowser/24.106.1 BroPP/1.0 YaSearchApp/24.106.1 webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "10" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.106.1 + engine: Blink + engine_version: 128.0.6613.67 + device: + type: smartphone + brand: Multilaser + model: Elite 2 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 15; zh-CN; 2410DPN6CC Build/AQ3A.240812.002) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/123.0.6312.80 Quark/7.5.1.691 Mobile Safari/537.36 + os: + name: Android + version: "15" + platform: "" + client: + type: browser + name: Quark + version: 7.5.1.691 + engine: Blink + engine_version: 123.0.6312.80 + device: + type: smartphone + brand: Xiaomi + model: 15 Pro + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-12.yml b/Tests/fixtures/tablet-12.yml index 70d0dd5af7..b7ce57b517 100644 --- a/Tests/fixtures/tablet-12.yml +++ b/Tests/fixtures/tablet-12.yml @@ -1061,3 +1061,39 @@ model: Tab M10 HD os_family: Android browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (Linux; Android 10; QTab Y2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.101 Mobile Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 85.0.4183.101 + engine: Blink + engine_version: 85.0.4183.101 + device: + type: tablet + brand: QMobile + model: Y2 Tab + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; 98 (M1E3)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome + version: 71.0.3578.99 + engine: Blink + engine_version: 71.0.3578.99 + device: + type: tablet + brand: Teclast + model: "98" + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index b53357d2c4..d88415a409 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -5340,3 +5340,111 @@ model: 50HYN3205 os_family: Other Mobile browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; MLT55USD02G Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.120 YaBrowser/24.1.2.182 (lite) Safari/537.36 TV + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.1.2.182 + engine: Blink + engine_version: 83.0.4103.120 + device: + type: tv + brand: Maunfeld + model: MLT55USD02G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; 32LH1212-V Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/104.0.5112.102 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 104.0.5112.102 + engine: Blink + engine_version: 104.0.5112.102 + device: + type: tv + brand: Vityaz + model: 32LH1212 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; MEGAMAX_W_42MG11FSM Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.120 YaBrowser/23.1.0.39 (lite) Safari/537.36 TV + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 23.1.0.39 + engine: Blink + engine_version: 83.0.4103.120 + device: + type: tv + brand: MEGAMAX + model: 42MG11FSM + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 9; U55F8000QG Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.11.0.385 (lite) TV Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.11.0.385 + engine: Blink + engine_version: 113.0.5672.163 + device: + type: tv + brand: DEXP + model: U55F8000QG + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; MLT43FSX02 Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/104.0.5112.102 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 104.0.5112.102 + engine: Blink + engine_version: 104.0.5112.102 + device: + type: tv + brand: Maunfeld + model: MLT43FSX02 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; TD55UFGHV1 Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.11.0.385 (lite) TV Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.11.0.385 + engine: Blink + engine_version: 113.0.5672.163 + device: + type: tv + brand: Tuvio + model: TD55UFGHV1 + os_family: Android + browser_family: Unknown diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 260e168b39..2259abb683 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -4469,7 +4469,7 @@ VGO TEL: # Vivo (vivo.com.cn, vivo.com) Vivo: - regex: '((?:VIV-|BBG-)?(?