From 2fb37dfbf7118fa03431d6cef9a271e76811c213 Mon Sep 17 00:00:00 2001 From: Tutik Alexsandr Date: Wed, 12 Oct 2022 17:42:16 +0300 Subject: [PATCH] Detect devices for existing brands (#7264) * feat(device) detect brand Maxwest: Nitro 55N, Nitro 5N, Nitro 4N LTE, Nitro Phablet 7N feat(device) detect brand Sico: Nile X feat(device) detect brand Vonino: Navo S * feat(device) detect brand Haier: P2 ref #6517 * feat(device) detect new brand PINE: A64 feat(device) detect brand Sencor: Element P5501, Element P5500 feat(device) detect brand Evertek: Everfancy III * feat(device) detect brand Huawei: Mate 20 Pro (PAN-L29) feat(device) detect brand iLife: Fivo Plus, Fivo Lite feat(device) detect brand Jivi: JSP Q65 feat(device) detect brand Prestigio: PTV32SS04ZCISBK, PTV50SS04XZCISBK feat(device) detect brand Cherry Mobile: Flare XL 2, Flare X Lite, Flare S5 Max, Flare S5, Flare S5 Power, Flare S5 Max, Flare J7, Flare J2, Flare J1s, Flare J1 Plus, Flare J1, Flare Infinity * feat(device) detect brand Starmobile: UP Vision, UP Neo, UP Snap feat(device) detect brand Majestic: Urano 47 feat(device) detect brand Technopc: UltraPad UP918, UltraPad UP778, UltraPad UP768, UltraPad UP1018 * feat(device) detect brand MicroMax: Bolt Warrior 1 Plus (Q4101) feat(device) added test to detect brand BBK: 50LEX-8127/UTS2C feat(device) added test to detect brand Nous: NS5004 feat(device) added test to detect brand Archos: Sense 55 S * feat(device) detect brand Zebra: TC55 feat(device) detect brand ExMobile: Chat 5 Plus feat(device) detect brand Huawei: Ultym 5 feat(device) detect brand RCA Tablets: RLTP5567 feat(device) detect brand M.T.T.: Ideal feat(device) detect brand MyPhone: Infinit 2 feat(device) detect brand Allview: AX4 Nano Plus feat(device) added test to detect brand Panasonic: Eluga A3, Eluga I2 Activ ref #5702 * feat(device) detect brand Leotec: Titanium T355 * fix: test --- Parser/Device/AbstractDeviceParser.php | 1 + Tests/fixtures/peripheral.yml | 18 + Tests/fixtures/smartphone-33.yml | 774 +++++++++++++++++++++++++ Tests/fixtures/tablet-7.yml | 36 ++ Tests/fixtures/tablet-8.yml | 90 +++ Tests/fixtures/tv-1.yml | 54 ++ regexes/device/mobiles.yml | 119 ++-- 7 files changed, 1054 insertions(+), 38 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 3e73ec9eda..92d58608ac 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1048,6 +1048,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'PX' => 'Pixus', 'QP' => 'Pico', 'PIR' => 'PIRANHA', + 'PIN' => 'PINE', '9P' => 'Planet Computers', 'PY' => 'Ployer', 'P4' => 'Plum', diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml index 8cadc12828..4289118651 100644 --- a/Tests/fixtures/peripheral.yml +++ b/Tests/fixtures/peripheral.yml @@ -858,3 +858,21 @@ model: Dolphin CT40 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; PINE A64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Safari/537.36 + os: + name: Android + version: 6.0.1 + platform: "" + client: + type: browser + name: Chrome + version: 75.0.3770.143 + engine: Blink + engine_version: 75.0.3770.143 + device: + type: peripheral + brand: PINE + model: A64 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml index cf333e070c..2d81eda649 100644 --- a/Tests/fixtures/smartphone-33.yml +++ b/Tests/fixtures/smartphone-33.yml @@ -1296,3 +1296,777 @@ model: X10 os_family: Android browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Nitro 55N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.149 + engine: Blink + engine_version: 80.0.3987.149 + device: + type: smartphone + brand: Maxwest + model: Nitro 55N + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Nitro_5N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.89 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 84.0.4147.89 + engine: Blink + engine_version: 84.0.4147.89 + device: + type: smartphone + brand: Maxwest + model: Nitro 5N + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Nitro 4N LTE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 79.0.3945.93 + engine: Blink + engine_version: 79.0.3945.93 + device: + type: smartphone + brand: Maxwest + model: Nitro 4N LTE + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Nile X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.125 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 84.0.4147.125 + engine: Blink + engine_version: 84.0.4147.125 + device: + type: smartphone + brand: Sico + model: Nile X + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 6.0; P2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.114 YaBrowser/22.9.4.79.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 22.9.4.79.00 + engine: Blink + engine_version: 104.0.5112.114 + device: + type: smartphone + brand: Haier + model: P2 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; P2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 103.0.0.0 + engine: Blink + engine_version: 103.0.0.0 + device: + type: smartphone + brand: Haier + model: P2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; ELEMENT-P5501) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 76.0.3809.111 + engine: Blink + engine_version: 76.0.3809.111 + device: + type: smartphone + brand: Sencor + model: Element P5501 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; Element P5500) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 81.0.4044.138 + engine: Blink + engine_version: 81.0.4044.138 + device: + type: smartphone + brand: Sencor + model: Element P5500 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; Everfancy III) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.99 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.99 + engine: Blink + engine_version: 80.0.3987.99 + device: + type: smartphone + brand: Evertek + model: Everfancy III + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; PAN-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.117 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 81.0.4044.117 + engine: Blink + engine_version: 81.0.4044.117 + device: + type: smartphone + brand: Huawei + model: Mate 20 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Flare XL 2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 81.0.4044.138 + engine: Blink + engine_version: 81.0.4044.138 + device: + type: smartphone + brand: Cherry Mobile + model: Flare XL 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Flare X Lite) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.111 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 81.0.4044.111 + engine: Blink + engine_version: 81.0.4044.111 + device: + type: smartphone + brand: Cherry Mobile + model: Flare X Lite + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FLARE_S5_MAX) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.116 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 79.0.3945.116 + engine: Blink + engine_version: 79.0.3945.116 + device: + type: smartphone + brand: Cherry Mobile + model: Flare S5 Max + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Flare_S5 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 69.0.3497.100 + engine: Blink + engine_version: 69.0.3497.100 + device: + type: smartphone + brand: Cherry Mobile + model: Flare S5 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Flare S5 Power) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 83.0.4103.106 + engine: Blink + engine_version: 83.0.4103.106 + device: + type: smartphone + brand: Cherry Mobile + model: Flare S5 Power + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FLARE S5 MAX) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 83.0.4103.106 + engine: Blink + engine_version: 83.0.4103.106 + device: + type: smartphone + brand: Cherry Mobile + model: Flare S5 Max + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Flare J7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.81 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 85.0.4183.81 + engine: Blink + engine_version: 85.0.4183.81 + device: + type: smartphone + brand: Cherry Mobile + model: Flare J7 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FLARE J2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.101 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 83.0.4103.101 + engine: Blink + engine_version: 83.0.4103.101 + device: + type: smartphone + brand: Cherry Mobile + model: Flare J2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Flare J1s) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 85.0.4183.127 + engine: Blink + engine_version: 85.0.4183.127 + device: + type: smartphone + brand: Cherry Mobile + model: Flare J1s + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FLARE J1 PLUS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.111 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 84.0.4147.111 + engine: Blink + engine_version: 84.0.4147.111 + device: + type: smartphone + brand: Cherry Mobile + model: Flare J1 Plus + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FLARE J1 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/50.0.2661.86 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Webview + version: 50.0.2661.86 + engine: Blink + engine_version: 50.0.2661.86 + device: + type: smartphone + brand: Cherry Mobile + model: Flare J1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FLARE INFINITY) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.117 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.117 + engine: Blink + engine_version: 80.0.3987.117 + device: + type: smartphone + brand: Cherry Mobile + model: Flare Infinity + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FIVO PLUS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.125 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 84.0.4147.125 + engine: Blink + engine_version: 84.0.4147.125 + device: + type: smartphone + brand: iLife + model: Fivo Plus + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Fivo Lite) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.119 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.119 + engine: Blink + engine_version: 80.0.3987.119 + device: + type: smartphone + brand: iLife + model: Fivo Lite + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; JSPQ65) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.111 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 84.0.4147.111 + engine: Blink + engine_version: 84.0.4147.111 + device: + type: smartphone + brand: Jivi + model: JSP Q65 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; itel S13 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 87.0.4280.141 + engine: Blink + engine_version: 87.0.4280.141 + device: + type: smartphone + brand: iTel + model: S13 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; itel S13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.101 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 87.0.4280.101 + engine: Blink + engine_version: 87.0.4280.101 + device: + type: smartphone + brand: iTel + model: S13 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; UP Vision) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.111 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 81.0.4044.111 + engine: Blink + engine_version: 81.0.4044.111 + device: + type: smartphone + brand: Starmobile + model: UP Vision + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; UP Neo) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.111 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 81.0.4044.111 + engine: Blink + engine_version: 81.0.4044.111 + device: + type: smartphone + brand: Starmobile + model: UP Neo + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; Up Snap) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.99 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.99 + engine: Blink + engine_version: 80.0.3987.99 + device: + type: smartphone + brand: Starmobile + model: UP Snap + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; URANO 47) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.99 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.99 + engine: Blink + engine_version: 80.0.3987.99 + device: + type: smartphone + brand: Majestic + model: Urano 47 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Micromax Q4101) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.166 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 92.0.4515.166 + engine: Blink + engine_version: 92.0.4515.166 + device: + type: smartphone + brand: MicroMax + model: Bolt Warrior 1 Plus + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; NS5004) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.61 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.61 + engine: Blink + engine_version: 94.0.4606.61 + device: + type: smartphone + brand: Nous + model: NS5004 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Archos Sense 55 S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.166 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 92.0.4515.166 + engine: Blink + engine_version: 92.0.4515.166 + device: + type: smartphone + brand: Archos + model: Sense 55 S + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.1.2; TC55 Build/JZO54K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36 + os: + name: Android + version: 4.1.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 63.0.3239.111 + engine: Blink + engine_version: 63.0.3239.111 + device: + type: smartphone + brand: Zebra + model: TC55 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; CHAT_5+ Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Webview + version: 30.0.0.0 + engine: Blink + engine_version: 30.0.0.0 + device: + type: smartphone + brand: ExMobile + model: Chat 5 Plus + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.3; Ultym5 Build/Ultym5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.98 Mobile Safari/537.36 + os: + name: Android + version: "4.3" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 52.0.2743.98 + engine: Blink + engine_version: 52.0.2743.98 + device: + type: smartphone + brand: Huawei + model: Ultym 5 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; ELUGA_A3 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 63.0.3239.111 + engine: Blink + engine_version: 63.0.3239.111 + device: + type: smartphone + brand: Panasonic + model: Eluga A3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; ELUGA_I2_Activ Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 56.0.2924.87 + engine: Blink + engine_version: 56.0.2924.87 + device: + type: smartphone + brand: Panasonic + model: Eluga I2 Activ + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; RLTP5567 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.111 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Webview + version: 63.0.3239.111 + engine: Blink + engine_version: 63.0.3239.111 + device: + type: smartphone + brand: RCA Tablets + model: RLTP5567 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; MTT IDEAL Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 63.0.3239.111 + engine: Blink + engine_version: 63.0.3239.111 + device: + type: smartphone + brand: M.T.T. + model: Ideal + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Infinit 2 Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.132 Mobile Safari/537.36 + os: + name: Android + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 57.0.2987.132 + engine: Blink + engine_version: 57.0.2987.132 + device: + type: smartphone + brand: MyPhone + model: Infinit 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Titanium T355 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.98 Mobile Safari/537.36 + os: + name: Android + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 61.0.3163.98 + engine: Blink + engine_version: 61.0.3163.98 + device: + type: smartphone + brand: Leotec + model: Titanium T355 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index ad840be7de..e87c30885a 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -6890,3 +6890,39 @@ model: Canvas Tab P802 os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Nitro Phablet 7N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.101 Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome + version: 85.0.4183.101 + engine: Blink + engine_version: 85.0.4183.101 + device: + type: tablet + brand: Maxwest + model: Nitro Phablet 7N + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Navo S Build/NBD91U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.85 Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome + version: 54.0.2840.85 + engine: Blink + engine_version: 54.0.2840.85 + device: + type: tablet + brand: Vonino + model: Navo S + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index 4752ea228b..5211da8b64 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -8579,3 +8579,93 @@ model: T40 Pro os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; UP918) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome + version: 77.0.3865.92 + engine: Blink + engine_version: 77.0.3865.92 + device: + type: tablet + brand: Technopc + model: UltraPad UP918 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; UP778) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome + version: 75.0.3770.101 + engine: Blink + engine_version: 75.0.3770.101 + device: + type: tablet + brand: Technopc + model: UltraPad UP778 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; UP768 Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Webview + version: 30.0.0.0 + engine: Blink + engine_version: 30.0.0.0 + device: + type: tablet + brand: Technopc + model: UltraPad UP768 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; UP1018) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome + version: 77.0.3865.92 + engine: Blink + engine_version: 77.0.3865.92 + device: + type: tablet + brand: Technopc + model: UltraPad UP1018 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; AX4Nano_plus Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.109 Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome + version: 40.0.2214.109 + engine: Blink + engine_version: 40.0.2214.109 + device: + type: tablet + brand: Allview + model: AX4 Nano Plus + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml index 1f5173dcdd..876341f544 100644 --- a/Tests/fixtures/tv-1.yml +++ b/Tests/fixtures/tv-1.yml @@ -8503,3 +8503,57 @@ model: UT8 os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 9; PTV32SS04Z_CIS_BK Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.158 Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome Webview + version: 66.0.3359.158 + engine: Blink + engine_version: 66.0.3359.158 + device: + type: tv + brand: Prestigio + model: PTV32SS04ZCISBK + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; PTV50SS04X_CIS_BK Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.158 Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome Webview + version: 66.0.3359.158 + engine: Blink + engine_version: 66.0.3359.158 + device: + type: tv + brand: Prestigio + model: PTV50SS04XCISBK + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; 50LEX-8127/UTS2C Build/PTT1.190222.001) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.91 Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome + version: 69.0.3497.91 + engine: Blink + engine_version: 69.0.3497.91 + device: + type: tv + brand: BBK + model: 50LEX-8127/UTS2C + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index a1abd83c16..9b481d9849 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -101,7 +101,7 @@ Adronix: # Cherry Mobile (cherrymobile.com) 'Cherry Mobile': - regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(2.[01]|2X|4|A[123]|J[123568]|P[13]|S[4-8]|X2|Y[3567]|S Play|HD|LITE|XL|X_V2|Y3s|Tab)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[68]|Desire_R6_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][43][Cs]?|HD [45]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare_5|Android 1.*Aqua S9|Omega_HD_4|MAIA PAD PLUS' + regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(2.[01]|2X|4|A[123]|J[1235678]|P[13]|S[4-8]|X2|Y[3567]|S Play|HD|LITE|XL|X_V2|Y3s|Tab|INFINITY)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[68]|Desire_R6_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][43][Cs]?|HD [45]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare X Lite|Flare_5|Android 1.*Aqua S9|Omega_HD_4|MAIA PAD PLUS' device: 'smartphone' models: - regex: '(Flare2X|Aqua S9(?: (?:Max|Lite|Pro))?)' @@ -135,10 +135,14 @@ Adronix: model: 'Flare XL Plus' - regex: 'Flare ?J3 ?Plus' model: 'Flare J3 Plus' + - regex: 'Flare X Lite' + model: 'Flare X Lite' - regex: 'Cherry[_ ]X740' model: 'Flare A5' - regex: 'Flare[ _]X[_ ]V2' model: 'Flare X V2' + - regex: 'Flare[ _]XL[_ ]?2' + model: 'Flare XL 2' - regex: 'Flare[ _]([A-Z]\d+)[ _]mini' model: 'Flare $1 Mini' - regex: 'Flare_J2_2018' @@ -151,9 +155,11 @@ Adronix: model: 'Flare S5 Lite DTV' - regex: 'Flare[_ ]J2[_ ]DTV' model: 'Flare S2 DTV' + - regex: 'Flare[_ ]INFINITY' + model: 'Flare Infinity' - regex: 'Flare[_ ]Lite[_ ]3S' model: 'Flare Lite S3' - - regex: 'Flare(?:[ _])?(A1_Roam|A[123]|J8 LTE|J[13568]|P[13]|S[4-8]|X2|Y3s|Y7_LTE|Y[3567]|[45])' + - regex: 'Flare(?:[ _])?(A1_Roam|A[123]|J8 LTE|J1s|J[1235678]|P[13]|S[4-8]|X2|Y3s|Y7_LTE|Y[3567]|[45])' model: 'Flare $1' - regex: 'OMEGA[ _]HD[ _]([45])' model: 'Omega HD $1' @@ -1543,6 +1549,8 @@ MicroMax: model: 'YU Yureka S YU5530' - regex: 'Q424' model: 'Bolt Selfie' + - regex: 'Q4101' + model: 'Bolt Warrior 1 Plus' - regex: 'Q352' model: 'Bolt Supreme 4' - regex: 'Q402 ?Plus' @@ -2722,6 +2730,9 @@ Allview: - regex: 'ALLVIEWSPEED' device: 'tablet' model: 'Speed' + - regex: 'AX4Nano[_ ]plus' + device: 'tablet' + model: 'AX4 Nano Plus' - regex: 'AX4Nano' device: 'tablet' model: 'AX4 Nano' @@ -7547,7 +7558,7 @@ Evoo: # Leotec Leotec: - regex: '(LESPH501[14]|LESPH5003B|SUPERNOVA[ _](?:Qi16|i216|Qi32|i3G96[X]?|iS3G)|PULSAR QI3G|LETAB916)(?:[);/ ]|$)' + regex: '(LESPH501[14]|LESPH5003B|SUPERNOVA[ _](?:Qi16|i216|Qi32|i3G96[X]?|iS3G)|PULSAR QI3G|LETAB916|Titanium T355)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'LESPH5011' @@ -7556,6 +7567,8 @@ Leotec: model: 'Argon A250B' - regex: 'LESPH5014' model: 'Krypton K150' + - regex: 'Titanium T355' + model: 'Titanium T355' - regex: 'SUPERNOVA[ _](i216|Qi16|Qi32|i3G96[X]?|iS3G)' device: 'tablet' model: 'Supernova $1' @@ -8427,7 +8440,7 @@ Hafury: # Haier (www.haier.com) Haier: - regex: 'Haier|(?:M53-52401|I6_Infinity|Titan[ _]T[135]|(?:HW-)?W(?:71[67]|757|86[07]|970)|S5 Silk|(?:HM-)?(N505|N700|G(?:152|303|353|552|70[01])?-FL|HM-(?:I559|N50[15]|I560|G553|N70[01])-FL|HR-V101|G(?:303)?-W|I(?:557)?-FL)|(?:PAD[ _](?:D71|G781|d85))|A2_Lite_NFC|A4_Lite|HL810G|android 8([\d.]*);(?: [\w-]+;)? E13)(?:[);/ ]|$)' + regex: 'Haier|(?:M53-52401|I6_Infinity|Titan[ _]T[135]|(?:HW-)?W(?:71[67]|757|86[07]|970)|S5 Silk|(?:HM-)?(N505|N700|G(?:152|303|353|552|70[01])?-FL|HM-(?:I559|N50[15]|I560|G553|N70[01])-FL|HR-V101|G(?:303)?-W|I(?:557)?-FL)|(?:PAD[ _](?:D71|G781|d85))|A2_Lite_NFC|A4_Lite|HL810G|android 8([\d.]*);(?: [\w-]+;)? E13)(?:[);/ ]|$)|Android [67](?:[\d.]*);(?: [\w-]+;)? P2(?: Build|[;)])' device: 'smartphone' models: - regex: 'A2_Lite_NFC' @@ -8452,6 +8465,8 @@ Haier: model: 'G7s' - regex: 'HM-G553-FL' model: 'G51' + - regex: ' P2(?: Build|[;)])' + model: 'P2' - regex: '(?:HM-)?(G(?:152|353|552|70[01])|G(?:303)|I(?:557))' model: '$1' - regex: '(Titan[_ ]T[135]|I6_Infinity)' @@ -8806,7 +8821,7 @@ TD Tech: # Huawei Huawei: - regex: '(HW-)?(?:Huawei(?!Browser)|MediaPad T1|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANA|ANE|ARE|ARS|ASK|ATH|ATU|AUM|BAC|BAH[234]?|BG2|BGO|B[ZK]K|BKL|BL[ALN]|BND|BTV|CA[GMNZ]|CH[CM]|CHE[12]?|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|FRL|GEM|GRA|HDN|HLK|HMA|Hol|HRY|HWI|H[36]0|INE|JAT|JEF|JDN|JDN2|JKM|JMM|JSN|KII|KIW|KNT|KOB|KSA|LDN|LEO|LIO|LLD|LND|LON|LRA|LUA|LY[AO]|MAR|MHA|MRD|MYA|NCE|NEN|NEM|NEO|NXT|PAR(?!-[AH]0)|PCT|PIC|PLE|PLK|POT|PPA|PRA|RIO|RNE|RVL|SCC|SCL|SCM|SEA|SHT|SLA|SNE|SPN|STF|STK|TAG|TIT|TNY|TRT|VCE|VEN|VIE|VKY|VNS|VOG|VRD|VTR|WAS|YAL|G(?:527|620S|621|630|735)|Y(?:221|330|550|6[23]5))-(?:[A-Z]{0,2}[0-9]{1,4}[A-Z]{0,3}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))(?:[);/ ]|$))|hi6210sft|PE-(UL00|TL[12]0|TL00M)|T1-(A21?[Lw]|A2[23]L|701u|823L)|G7-(?:L01|TL00)|HW-01K|JNY-(LX[12]|AL10)|OXF-AN[01]0|TAS-(A[LN]00|L29|TL00)|WLZ-(AL10|AN00)|YOK-AN[10]0|NIC-LX1A|MRX-(AN19|AL[01]9|W[0-3]9)|CDY-(?:[AT]N00|AN[29][05]|NX9[AB]|TN[29]0)|GLK-(?:[AT]L00|LX1U)|JER-(?:[AT]N20|[AT]N10)|ELS-(?:[AT]N[10]0|NX9|N39|N04)|AKA-(AL10|L29)|MON-(W|AL)19|BMH-AN[12]0|AQM-([AT]L[01]0|LX1)|MOA-([AT]L[02]0|LX9N)|NTS-AL00|ART-(?:[AT]L00[xm]|L29N?|L28)|MED-(?:[AT]L00|LX[29]N?|AL20)|EBG-(?:AN[01]0|TN00)|ANA-(?:[AT]N00|NX9)|BZ[AK]-W00|BZT-(W09|AL[01]0)|HDL-(AL09|W09)|HWV3[123]|HW-02L|TEL-[AT]N(?:00a?|10)|KKG-AN[07]0|MXW-[AT]N00|JKM-AL00[ab]|TAH-(?:N29|AN00)m?|C8817D|T1-821W|d-01[JKH]|d-02[HK]|KRJ-(?:W09|AN00)|HWT31|Y320-U10|Y541-U02|VAT-L19|70[14]HW|60[58]HW|NOH-(?:NX9|AN0[01]|AN50|AL[01]0)|TNNH?-AN00|LIO-(?:[TA]L00|[LN]29|AN00)|KOB2-(?:AL00|[LW]09)|AGS3-(?:[WL]09|AL0[09]|W00[DE])|DNN-LX9|NEY-NX9|LON-AL00|HLK-L41|503HW|AGR-(?:[LW]09|AL09)|PPA-LX[12]|ANG-(?:AN00|LX[12])|NOP-AN00|ALA-AN70|DVC-[AT]N[02]0|302HW|Nexus 6P|DBY-W09|WKG-(?:LX9|[AT]N00)|JSC-(?:AN00|AL50)|OCE-A[NL][015]0|NZA-AL00|BRQ-A[LN]00|BZC-(?:AL|W)00|NEN-L(?:X1|22)|KOZ-AL[04]0|NTH-(?:AN00|NX9)|MRR-W[23]9|WGR-(?:W[10]9|AN19)|TET-AN[10]0|SCMR-(?:W09|AL09)|OXP-AN00|HJC-(?:AN90|LX9)|CDL-AN50|CND-AN00|NTN-(?:LX[13]|AN20|L22)|RNA-[AT]N00|CHL-(?:A[LN]00|AL60)|ELZ-AN[012]0|NAM-(?:LX9|AL00)|JLH-AN00|JAD-(?:AL[056]0|LX9)|AGS3K-[WL]09|AGRK-[WL]09|MT2L03|LSA-AN00|KJR-W09|TET-A[NL][05]0|TYH601M|RTE-AL00|BAL-(?:AL00|L49)|BZI-(?:AL00|W00)|BZT3-(?:AL00|W09)|BZD-(?:W00|AL00)|MLD-AL[01]0|AGM3-(?:W09|AL09)HN|ABR-(?:AL[06]0|LX9)|GIA-AN00|LEO-DLXXE?|BZA-L00|MGI-AN00|CMA-(?:LX[123]|AN[04]0)|NEW-AN90|KRJ2-(?:W09|AN00)|BRT-(?:W09|AN09)|ANY-(?:[LN]X1|AN00)|JLN-(?:LX[13]|AL00)|LGE-(?:NX[19]|AN[012]0)|TNA-AN00|TFY-(?:LX[123]|AN00)|DIO-AN00|BZW-AL[01]0|MOGOLIA|CM990|MGA-LX9|60[56]HW|Peppa-(?:L2[23]B|L0[23]B)|KANT-\d{3}[BCS]?|Kobe3-L09|FNE-(?:NX9|AN00)|Mate ?(?:[34]0 RS|Xs|30)|Y530|SDY-AN00|EC6108V[89]|CTR-LX1|VNE-N41|HMW-W09|GLA-AL00|HEY-W09|GOT-AL09|PAL-(?:AL00|LX9)' + regex: '(HW-)?(?:Huawei(?!Browser)|MediaPad T1|Ultym5|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANA|ANE|ARE|ARS|ASK|ATH|ATU|AUM|BAC|BAH[234]?|BG2|BGO|B[ZK]K|BKL|BL[ALN]|BND|BTV|CA[GMNZ]|CH[CM]|CHE[12]?|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|FRL|GEM|GRA|HDN|HLK|HMA|Hol|HRY|HWI|H[36]0|INE|JAT|JEF|JDN|JDN2|JKM|JMM|JSN|KII|KIW|KNT|KOB|KSA|LDN|LEO|LIO|LLD|LND|LON|LRA|LUA|LY[AO]|MAR|MHA|MRD|MYA|NCE|NEN|NEM|NEO|NXT|PAR(?!-[AH]0)|PCT|PIC|PLE|PLK|POT|PPA|PRA|RIO|RNE|RVL|SCC|SCL|SCM|SEA|SHT|SLA|SNE|SPN|STF|STK|TAG|TIT|TNY|TRT|VCE|VEN|VIE|VKY|VNS|VOG|VRD|VTR|WAS|YAL|G(?:527|620S|621|630|735)|Y(?:221|330|550|6[23]5))-(?:[A-Z]{0,2}[0-9]{1,4}[A-Z]{0,3}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))(?:[);/ ]|$))|hi6210sft|PE-(UL00|TL[12]0|TL00M)|T1-(A21?[Lw]|A2[23]L|701u|823L)|G7-(?:L01|TL00)|HW-01K|JNY-(LX[12]|AL10)|OXF-AN[01]0|TAS-(A[LN]00|L29|TL00)|WLZ-(AL10|AN00)|YOK-AN[10]0|NIC-LX1A|MRX-(AN19|AL[01]9|W[0-3]9)|CDY-(?:[AT]N00|AN[29][05]|NX9[AB]|TN[29]0)|GLK-(?:[AT]L00|LX1U)|JER-(?:[AT]N20|[AT]N10)|ELS-(?:[AT]N[10]0|NX9|N39|N04)|AKA-(AL10|L29)|MON-(W|AL)19|BMH-AN[12]0|AQM-([AT]L[01]0|LX1)|MOA-([AT]L[02]0|LX9N)|NTS-AL00|ART-(?:[AT]L00[xm]|L29N?|L28)|MED-(?:[AT]L00|LX[29]N?|AL20)|EBG-(?:AN[01]0|TN00)|ANA-(?:[AT]N00|NX9)|BZ[AK]-W00|BZT-(W09|AL[01]0)|HDL-(AL09|W09)|HWV3[123]|HW-02L|TEL-[AT]N(?:00a?|10)|KKG-AN[07]0|MXW-[AT]N00|JKM-AL00[ab]|TAH-(?:N29|AN00)m?|C8817D|T1-821W|d-01[JKH]|d-02[HK]|KRJ-(?:W09|AN00)|HWT31|Y320-U10|Y541-U02|VAT-L19|70[14]HW|60[58]HW|NOH-(?:NX9|AN0[01]|AN50|AL[01]0)|TNNH?-AN00|LIO-(?:[TA]L00|[LN]29|AN00)|KOB2-(?:AL00|[LW]09)|AGS3-(?:[WL]09|AL0[09]|W00[DE])|DNN-LX9|NEY-NX9|LON-AL00|HLK-L41|503HW|AGR-(?:[LW]09|AL09)|PPA-LX[12]|ANG-(?:AN00|LX[12])|NOP-AN00|ALA-AN70|DVC-[AT]N[02]0|302HW|Nexus 6P|DBY-W09|WKG-(?:LX9|[AT]N00)|JSC-(?:AN00|AL50)|OCE-A[NL][015]0|NZA-AL00|BRQ-A[LN]00|BZC-(?:AL|W)00|NEN-L(?:X1|22)|KOZ-AL[04]0|NTH-(?:AN00|NX9)|MRR-W[23]9|WGR-(?:W[10]9|AN19)|TET-AN[10]0|SCMR-(?:W09|AL09)|OXP-AN00|HJC-(?:AN90|LX9)|CDL-AN50|CND-AN00|NTN-(?:LX[13]|AN20|L22)|RNA-[AT]N00|CHL-(?:A[LN]00|AL60)|ELZ-AN[012]0|NAM-(?:LX9|AL00)|JLH-AN00|JAD-(?:AL[056]0|LX9)|AGS3K-[WL]09|AGRK-[WL]09|MT2L03|LSA-AN00|KJR-W09|TET-A[NL][05]0|TYH601M|RTE-AL00|BAL-(?:AL00|L49)|BZI-(?:AL00|W00)|BZT3-(?:AL00|W09)|BZD-(?:W00|AL00)|MLD-AL[01]0|AGM3-(?:W09|AL09)HN|ABR-(?:AL[06]0|LX9)|GIA-AN00|LEO-DLXXE?|BZA-L00|MGI-AN00|CMA-(?:LX[123]|AN[04]0)|NEW-AN90|KRJ2-(?:W09|AN00)|BRT-(?:W09|AN09)|ANY-(?:[LN]X1|AN00)|JLN-(?:LX[13]|AL00)|LGE-(?:NX[19]|AN[012]0)|TNA-AN00|TFY-(?:LX[123]|AN00)|DIO-AN00|BZW-AL[01]0|MOGOLIA|CM990|MGA-LX9|60[56]HW|Peppa-(?:L2[23]B|L0[23]B)|KANT-\d{3}[BCS]?|Kobe3-L09|FNE-(?:NX9|AN00)|Mate ?(?:[34]0 RS|Xs|30)|Y530|SDY-AN00|EC6108V[89]|CTR-LX1|VNE-N41|HMW-W09|GLA-AL00|HEY-W09|GOT-AL09|PAL-(?:AL00|LX9)|PAN-L29' device: 'smartphone' models: - regex: 'FNE-AN00' @@ -9222,7 +9237,7 @@ Huawei: model: 'Mate 20' - regex: 'SNE-(?:AL00|LX[0-3])(?:[);/ ]|$)' model: 'Mate 20 Lite' - - regex: 'LYA-(?:AL[01]0|L[02]9|L0C|TL00)(?:[);/ ]|$)' + - regex: '(?:LYA-(?:AL[01]0|L[02]9|L0C|TL00)|PAN-L29)(?:[);/ ]|$)' model: 'Mate 20 Pro' - regex: 'LYA-AL00P(?:[);/ ]|$)' model: 'Mate 20 RS' @@ -9514,6 +9529,8 @@ Huawei: model: 'GT3' - regex: 'CM990(?:[);/ ]|$)' model: 'Evolucion 3' + - regex: 'Ultym5(?:[);/ ]|$)' + model: 'Ultym 5' - regex: 'Nexus 6P(?:[);/ ]|$)' device: 'phablet' @@ -10996,7 +11013,7 @@ Impression: #iLife or i-life (lifedigital.com) iLife: - regex: 'WTAB[ _]?\d{3}|(ITELL[_ ](?:K3300|K3500N?|K4700)|K3102 WIFI)(?:[);/ ]|$)' + regex: 'WTAB[ _]?\d{3}|(ITELL[_ ](?:K3300|K3500N?|K4700)|K3102 WIFI|FIVO (?:PLUS|Lite))(?:[);/ ]|$)' device: 'tablet' models: - regex: 'K3102 WIFI' @@ -11005,6 +11022,12 @@ iLife: model: 'WTAB $1' - regex: '(ITELL[_ ](?:K3300|K3500N?|K4700))(?:[);/ ]|$)' model: '$1' + - regex: 'FIVO PLUS(?:[);/ ]|$)' + device: 'smartphone' + model: 'Fivo Plus' + - regex: 'FIVO Lite(?:[);/ ]|$)' + device: 'smartphone' + model: 'Fivo Lite' # iTel iTel: @@ -13650,11 +13673,13 @@ Mpman: # Majestic (www.newmajestic.com) Majestic: - regex: 'MAJESTIC[ _-]|CRONO ?[0-9]+|(?:TAB (?:647|411) 3G|TAB_911_3G|TAB_811_4G|TAB_912_4G|TAB-714|TAB 711 4G|URANO 77LTE|PLUTO__?26N?)(?:[);/ ]|$)' + regex: 'MAJESTIC[ _-]|CRONO ?[0-9]+|(?:TAB (?:647|411) 3G|TAB_911_3G|TAB_811_4G|TAB_912_4G|TAB-714|TAB 711 4G|URANO 47|URANO 77LTE|PLUTO__?26N?)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'URANO 77LTE(?:[);/ ]|$)' model: 'Urano 77 LTE' + - regex: 'URANO 47(?:[);/ ]|$)' + model: 'Urano 47' - regex: 'PLUTO__?(26N?)(?:[);/ ]|$)' model: 'Pluto $1' - regex: 'TAB[ _](647|[478]11|91[12])[ _]([34])G' @@ -13753,7 +13778,7 @@ Talius: # Maxwest Maxwest: - regex: '(?:Astro[_ ](?:Phablet_9|55?N[_ ]LTE|55R|5 PRO|5[sTX]|[45]P|X4|5_GO_LTE|X55s?|4\.5|4|X5)|Astro6|Virtue Z5|Nitro[_ ](?:4S?|55[RCM]|5[XRPM]|[45] GO|4s LTE|55[ _]LTE)|Gravity_(?:55?_GO|6P)|Nitro_Phablet_9s)(?:[);/ ]|$)' + regex: '(?:Astro[_ ](?:Phablet_9|55?N[_ ]LTE|55R|5 PRO|5[sTX]|[45]P|X4|5_GO_LTE|X55s?|4\.5|4|X5)|Astro6|Virtue Z5|Nitro[_ ](?:4S?|55[RCMN]|5[XRPNM]|[45] GO|4[sN] LTE|55[ _]LTE)|Gravity_(?:55?_GO|6P)|Nitro_Phablet_9s|Nitro Phablet 7N)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'Astro[_ ](55?)N[_ ]LTE' @@ -13778,7 +13803,7 @@ Maxwest: model: 'Nitro 4s LTE' - regex: 'Nitro[ _]4s' model: 'Nitro 4s' - - regex: 'Nitro[_ ](4|55[RCM]|5[XRPM]|55[_ ]LTE)' + - regex: 'Nitro[_ ]((?:55|4N)[_ ]LTE|4|55[RCNM]|5[XRPNM])' model: 'Nitro $1' - regex: 'Gravity_(55?)_GO' model: 'Gravity $1 GO' @@ -13789,9 +13814,9 @@ Maxwest: device: 'phablet' model: 'Astro 6' - - regex: 'Nitro_Phablet_9s' + - regex: 'Nitro[_ ]Phablet[_ ](9s|7N)' device: 'tablet' - model: 'Nitro Phablet 9s' + model: 'Nitro Phablet $1' - regex: 'Astro_Phablet_9' device: 'tablet' model: 'Astro Phablet 9' @@ -14913,7 +14938,7 @@ Hammer: # myphone (myphone.com.ph) MyPhone: - regex: '(?:MyPhone|MyPad|MyTab)[ _][^;/)]+( Build|[);])|(?:HAMMER_)?AXE[_ ]M[_ ]LTE|Hammer[_ ](?:Axe)|Cube_LTE|myTab10II|LUNA_II|C-Smart_pix|myPhone_Fun_8|FUN_18x9|MyPhoneMY27|Prime_4_Lite|myA1[78]|myX12|Pocket_2|Prime_18x9|Prime3Lite|myG1|myT6 DTV|myWX1 Plus|myXI1(?:[ _](?:Plus|Pro))?|my(?:XI[3]|NX1|X[23589]|A1[12356]|29S)|Q_Smart_BE|Brown 1|Q-Smart_Plus|Q-Smart_III_Plus|SmartView_(?:[78]|9_6)_(?:LTE|[34]G)|Android 6(?:[\d.]*);(?: [\w-]+;)? Pocket' + regex: '(?:MyPhone|MyPad|MyTab)[ _][^;/)]+( Build|[);])|(?:HAMMER_)?AXE[_ ]M[_ ]LTE|Hammer[_ ](?:Axe)|Cube_LTE|myTab10II|LUNA_II|C-Smart_pix|myPhone_Fun_8|FUN_18x9|MyPhoneMY27|Prime_4_Lite|myA1[78]|myX12|Pocket_2|Prime_18x9|Prime3Lite|myG1|myT6 DTV|myWX1 Plus|myXI1(?:[ _](?:Plus|Pro))?|my(?:XI[3]|NX1|X[23589]|A1[12356]|29S)|Q_Smart_BE|Brown 1|Q-Smart_Plus|Q-Smart_III_Plus|SmartView_(?:[78]|9_6)_(?:LTE|[34]G)|Android 6(?:[\d.]*);(?: [\w-]+;)? Pocket|Infinit 2' device: 'smartphone' models: # explicit table models @@ -14941,6 +14966,8 @@ MyPhone: model: 'Cube LTE' - regex: 'INFINITY (LTE|3G)' model: 'Infinity $1' + - regex: 'Infinit 2' + model: 'Infinit 2' - regex: 'Prime_4_Lite' model: 'Prime 4 Lite' - regex: 'C-Smart_pix' @@ -15039,15 +15066,17 @@ Myria: - regex: 'Myria[_ ]([^/);]+)(?: Build|[);])' model: '$1' -# M.T.T. +# M.T.T or MTT M.T.T.: - regex: 'M\.T\.T\.' + regex: 'M\.T\.T\.|MTT IDEAL' device: 'smartphone' models: - - regex: 'M\.T\.T\. ?Tablet([^;/]+)? Build' + - regex: 'MTT IDEAL' + model: 'Ideal' + - regex: 'M\.T\.T\. ?Tablet([^;/)]+)?(?: Build|[;)])' device: 'tablet' model: 'Tablet$1' - - regex: 'M\.T\.T\. ?([^;/]+) Build' + - regex: 'M\.T\.T\. ?([^;/)]+)(?: Build|[;)])' model: '$1' # Navon @@ -17418,11 +17447,11 @@ ProScan: # RCA Tablets (RCA) (www.rca.com) 'RCA Tablets': - regex: 'RCT([^;/]+) Build|RCA RLTP4028|RC7T3G21|RCT6B06P23|RCT6613W23P|RCT6513W87|DRP(?:29101|2091)|RCT6973W43(?:MD)?|RCT6703W12|RCT(?:6A06P22|6603W47M7|6303W87(?:DK|M)|6773W22B|6203W46L|6873W42B?M|6K03W13|6876Q22N|6A06Q22)' + regex: 'RCT([^;/]+) Build|RCA RLTP4028|RLTP5567|RC7T3G21|RCT6B06P23|RCT6613W23P|RCT6513W87|DRP(?:29101|2091)|RCT6973W43(?:MD)?|RCT6703W12|RCT(?:6A06P22|6603W47M7|6303W87(?:DK|M)|6773W22B|6203W46L|6873W42B?M|6K03W13|6876Q22N|6A06Q22)' device: 'smartphone' models: - - regex: 'RCA RLTP4028' - model: 'RLTP4028' + - regex: '(?:RCA[ _])?(RLTP4028|RLTP5567)' + model: '$1' - regex: 'RCT6513W87' device: 'tablet' model: 'Galileo Pro 11.5"' @@ -19105,7 +19134,7 @@ Selfix: # Sencor (sencor.cz or sencor.com) Sencor: - regex: 'Sencor|(?:ELEMENT[ _]?(?:(?:7|8|9\.7|10[ _]1)(?:[ _]?V[23])?|P[0-9]+|10.1 Q001)|10_1Q205)(?:[);/ ]|$)' + regex: 'Sencor|(?:ELEMENT[ _]?(?:(?:7|8|9\.7|10[ _]1)(?:[ _]?V[23])?|P[0-9]+|10.1 Q001)|10_1Q205|ELEMENT-P5501)(?:[);/ ]|$)' device: 'tablet' models: # explicit tablet models @@ -19136,7 +19165,7 @@ Sencor: - regex: '(?:SENCOR[ _])?(10)_(1Q205|1Q102)(?:[);/ ]|$)' model: '$1.$2' - - regex: '(?:SENCOR[ _])?ELEMENT[ _]?P([0-9]+)' + - regex: '(?:SENCOR[ _])?ELEMENT[ _-]?P([0-9]+)' model: 'Element P$1' device: 'smartphone' @@ -19760,7 +19789,7 @@ Positivo: # Prestigio (prestigio.ru) Prestigio: - regex: 'Prestigio 5500 DUO|(?:PMP|PAP|PMT|PSP|PGPS)[0-9]+[a-z0-9_]+(?:[);/ ]|$)|Muze C3|PTV32SS04Z_CIS_ML|SILVER POS|PAB4411' + regex: 'Prestigio 5500 DUO|(?:PMP|PAP|PMT|PSP|PGPS)[0-9]+[a-z0-9_]+(?:[);/ ]|$)|Muze C3|PTV50SS04X_CIS_BK|PTV32SS04Z_CIS_(?:ML|BK)|SILVER POS|PAB4411' device: 'tablet' models: # explicit smartphone models @@ -19943,9 +19972,9 @@ Prestigio: - regex: 'PSP7610DUO([ _][A-Z]{2})?' model: 'S Max' # explicit tv models - - regex: 'PTV32SS04Z_CIS_ML' + - regex: 'PTV(\w+)_CIS_(ML|BK)' device: 'tv' - model: 'PTV32SS04ZCISML' + model: 'PTV$1CIS$2' - regex: '(PAB4411)' device: 'tv' model: 'MultiCenter $1' @@ -20632,7 +20661,7 @@ Star: # Starmobile (starmobile.ph) Starmobile: - regex: '(?:Starmobile (?:Play (?:Neo|Spark|GO|Click)|Astra)|UP[_ ](?:Sense|Rave|Groove|Octa|Prime|Selfie|Xtreme|XL|Max)|PLAY (?:Club|Style|Click LTE)|ENGAGE7\+)(?:[);/ ]|$)' + regex: '(?:Starmobile (?:Play (?:Neo|Spark|GO|Click)|Astra)|UP[_ ](?:Sense|Rave|Groove|Octa|Prime|Selfie|Snap|Xtreme|XL|Max|Vision|Neo)|PLAY (?:Club|Style|Click LTE)|ENGAGE7\+)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'Starmobile PLAY GO(?:[);/ ]|$)' @@ -20641,7 +20670,7 @@ Starmobile: model: 'Astra' - regex: '(?:Starmobile )?Play (Neo|Spark|Click|Club|Style)(?:[);/ ]|$)' model: 'Play $1' - - regex: 'UP[_ ](Sense|Rave|Groove|Octa|Prime|Selfie|Xtreme|XL|Max)(?:[);/ ]|$)' + - regex: 'UP[_ ](Sense|Rave|Groove|Octa|Prime|Selfie|Snap|Xtreme|XL|Max|Vision|Neo)(?:[);/ ]|$)' model: 'UP $1' - regex: 'ENGAGE7\+' device: 'tablet' @@ -22476,7 +22505,7 @@ Vodafone: # Vonino (vonino.ro, vonino.it) Vonino: - regex: 'Vonino|Epic (?:E8|P7)|Epic_(?:M8|P7)|Gyga[ _](?:X|S|QS|XS)|Jax[ _](?:QS|[SXQN]|Mini)|Magnet[ _](?:M[19]|G[135]0)|Navo_QS|Onyx_(QS|Z)|Orin_QS|Pluri[ _](?:[BCMQ]7|[CQM]8)|Sirius_QS|(?