From 59c8f0bf18013a63c27f2081f8c17a52689b7ab6 Mon Sep 17 00:00:00 2001 From: Tutik Alexsandr Date: Mon, 5 Jun 2017 10:27:35 +0300 Subject: [PATCH] Adds various detections (#5612) * new brand Homtom * Homtom detected models HT3 HT17 HT20 etc * adds models SENSEIT R390, R450, L301, A200, A109, E510, E500, E400 * add detect model `Xperia C5 Ultra` user-agent ( Linux; Android 5.0; E5506 Build/29.0 ) * fix Xperia C5 Ultra brand Sony; add models Sony Xperia M5 - E5603, E5606, E5653 add model Sony Xperia M5 Dual - E5633, E5643, E5663 * fix Senseit regex regular * fix Xperia C5 Ultra regex regular * adds detect Explay RioPlay * add new brand Wileyfox; add models Spark; Spark +; Storm ; Swift; Swift 2; Swift 2 plus * add detect Alcatel 4013M & new file tests * add detect Blade A460 * new brand blackview & detector model BV2000, BV5000, BV600, omega plus * Blackview remove V3 detect conflict detect Inew V3 model * RIM add detect STV100-4 model TCL add detect 7040N model * ZTE add detect Nubia Z5S * LG add detect V20 (VS995) model * fix regular test BlackBerry Priv * adds detect Nvidia SHIELD Tablet K1 * new brand PPTV & detect model KING 7 new brand innos & detect A35, A35 Plus fix detect coolpad 5860S, D6000 * new brand china mobile & detect model M812C * detect china mobile - 1501 M02 * detect china mobile - 9930i * detect china mobile - A1303 ( Iphone clone ) * detect china mobile - A309W * add new brand DEXP & detect all Ixion models (99) * detect brand Freetel - general models FTJ152C, FT141B, FT142, FT142A, FTJ152A, FTJ152B * detect Freetel - models Kiwami, Rei, Katana 1, XM, Priori 4 * new brand Zen add detect models Admire * detect ZET models Cinemax (1 ,2, 2+,3, 4G, click, force) * Alcatel fixed name device * fix Rio Play detect Blackview: Heatwave, DM550, BV7000 PRO, Alife P1, Alife S1 --- Parser/Device/DeviceParserAbstract.php | 8 + Tests/fixtures/smartphone-4.yml | 140 ++++ Tests/fixtures/smartphone-5.yml | 861 +++++++++++++++++++++++++ regexes/device/mobiles.yml | 111 +++- 4 files changed, 1110 insertions(+), 10 deletions(-) create mode 100644 Tests/fixtures/smartphone-5.yml diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php index fc13346765..75b929a489 100644 --- a/Parser/Device/DeviceParserAbstract.php +++ b/Parser/Device/DeviceParserAbstract.php @@ -89,6 +89,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'BQ' => 'BenQ', 'BS' => 'BenQ-Siemens', 'BU' => 'Blu', + 'B2' => 'Blackview', 'BW' => 'Boway', 'BX' => 'bq', 'BV' => 'Bravis', @@ -108,6 +109,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'CL' => 'Compal', 'CN' => 'CnM', 'CM' => 'Crius Mea', + 'C3' => 'China Mobile', 'CR' => 'CreNova', 'CT' => 'Capitel', 'CQ' => 'Compaq', @@ -118,6 +120,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'DA' => 'Danew', 'DT' => 'Datang', 'DE' => 'Denver', + 'DX' => 'DEXP', 'DS' => 'Desay', 'DB' => 'Dbtel', 'DC' => 'DoCoMo', @@ -145,6 +148,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'EZ' => 'Ezze', 'FA' => 'Fairphone', 'FL' => 'Fly', + 'FT' => 'Freetel', 'FO' => 'Foxconn', 'FU' => 'Fujitsu', 'GM' => 'Garmin-Asus', @@ -247,6 +251,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'NI' => 'Nintendo', 'N1' => 'Noain', 'NK' => 'Nokia', + 'NV' => 'Nvidia', 'NM' => 'Nomi', 'NN' => 'Nikon', 'NW' => 'Newgen', @@ -273,6 +278,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'PV' => 'Point of View', 'PP' => 'PolyPad', 'P2' => 'Pomp', + 'P3' => 'PPTV', 'PS' => 'Positivo', 'PR' => 'Prestigio', 'P1' => 'ProScan', @@ -357,6 +363,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'VZ' => 'Vizio', 'VW' => 'Videoweb', 'WA' => 'Walton', + 'WF' => 'Wileyfox', 'WE' => 'WellcoM', 'WY' => 'Wexler', 'WI' => 'Wiko', @@ -373,6 +380,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'ZO' => 'Zonda', 'ZP' => 'Zopo', 'ZT' => 'ZTE', + 'ZN' => 'Zen', // legacy brands, might be removed in future versions 'WB' => 'Web TV', diff --git a/Tests/fixtures/smartphone-4.yml b/Tests/fixtures/smartphone-4.yml index 21a2a6d7f8..36f7573686 100644 --- a/Tests/fixtures/smartphone-4.yml +++ b/Tests/fixtures/smartphone-4.yml @@ -8969,3 +8969,143 @@ model: ZMAX Pro os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.0; SENSEIT E500 Build/LRX21M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.0" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "47.0.2526.83" + engine: Blink + engine_version: + device: + type: smartphone + brand: S6 + model: E500 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.2.2; SENSEIT R390 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.76 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.2.2" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "46.0.2490.76" + engine: Blink + engine_version: + device: + type: smartphone + brand: S6 + model: R390 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; SENSEIT A109 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "56.0.2924.87" + engine: Blink + engine_version: + device: + type: smartphone + brand: S6 + model: A109 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; SENSEIT L301 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "56.0.2924.87" + engine: Blink + engine_version: + device: + type: smartphone + brand: S6 + model: L301 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.0; E5506 Build/29.0.A.0.161) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/43.0.2357.93 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.0" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "43.0.2357.93" + engine: Blink + engine_version: + device: + type: smartphone + brand: SO + model: Xperia C5 Ultra + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; E5633 Build/30.1.B.1.55) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.89 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "50.0.2661.89" + engine: Blink + engine_version: + device: + type: smartphone + brand: SO + model: Xperia M5 Dual + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; RioPlay Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.76 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "46.0.2490.76" + engine: Blink + engine_version: + device: + type: smartphone + brand: EX + model: Rio Play + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml new file mode 100644 index 0000000000..f825102c6c --- /dev/null +++ b/Tests/fixtures/smartphone-5.yml @@ -0,0 +1,861 @@ +--- +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; Wileyfox Spark + Build/MMB29X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "56.0.2924.87" + engine: Blink + engine_version: + device: + type: smartphone + brand: WF + model: Spark + + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; Swift 2 Plus Build/MHC19Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "56.0.2924.87" + engine: Blink + engine_version: + device: + type: smartphone + brand: WF + model: Swift 2 Plus + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; Swift 2 Build/MHC19Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "56.0.2924.87" + engine: Blink + engine_version: + device: + type: smartphone + brand: WF + model: Swift 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; es-us; 4013M Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "30.0.0.0" + engine: Blink + engine_version: + device: + type: smartphone + brand: AL + model: One Touch Pixi 3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; Wileyfox Swift Build/MOB30R) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.76 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "46.0.2490.76" + engine: Blink + engine_version: + device: + type: smartphone + brand: WF + model: Swift + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; Blade A460 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "55.0.2883.91" + engine: Blink + engine_version: + device: + type: smartphone + brand: ZT + model: Blade A460 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; BV6000 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.95 YaBrowser/17.1.1.359.00 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: + client: + type: browser + name: Yandex Browser + short_name: YA + version: "17.1.1.359.00" + engine: Blink + engine_version: + device: + type: smartphone + brand: B2 + model: BV6000 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; BV7000 PRO Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "58.0.3029.83" + engine: Blink + engine_version: + device: + type: smartphone + brand: B2 + model: BV7000 PRO + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Alife P1 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.111 YaBrowser/16.2.2.7988.00 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Yandex Browser + short_name: YA + version: "16.2.2.7988.00" + engine: Blink + engine_version: + device: + type: smartphone + brand: B2 + model: Alife P1 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.4; Alife S1 Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/33.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.4" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "33.0.0.0" + engine: Blink + engine_version: + device: + type: smartphone + brand: B2 + model: Alife S1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; omega_pro Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "39.0.0.0" + engine: Blink + engine_version: + device: + type: smartphone + brand: B2 + model: Omega Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; 7040N Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "30.0.0.0" + engine: Blink + engine_version: + device: + type: smartphone + brand: TC + model: 7040N + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; STV100-4 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "55.0.2883.91" + engine: Blink + engine_version: + device: + type: smartphone + brand: RM + model: "BlackBerry Priv" + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.4; NX406E Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.89 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.4" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "50.0.2661.89" + engine: Blink + engine_version: + device: + type: smartphone + brand: ZT + model: Nubia Z5S + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; VS995 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "56.0.2924.87" + engine: Blink + engine_version: + device: + type: smartphone + brand: LG + model: V20 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; SHIELD Tablet K1 Build/LRX21M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "56.0.2924.87" + engine: Blink + engine_version: + device: + type: tablet + brand: NV + model: SHIELD Tablet K1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; KING 7 Build/ABCDEF) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "56.0.2924.87" + engine: Blink + engine_version: + device: + type: smartphone + brand: P3 + model: KING 7 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; zh-cn; 5860S Build/IMM76I) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: "4.0.4" + platform: + client: + type: browser + name: Android Browser + short_name: AN + version: + engine: WebKit + engine_version: "534.30" + device: + type: smartphone + brand: CO + model: 5860S + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; M812C Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 30.0.0.0 + engine: Blink + engine_version: + device: + type: smartphone + brand: C3 + model: M812C + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; 1501_M02 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36 wkbrowser 4.1.55 3085 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 39.0.0.0 + engine: Blink + engine_version: + device: + type: smartphone + brand: C3 + model: 1501 M02 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.2.1; 9930i Build/JOP40D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.92 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.2.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 30.0.1599.92 + engine: Blink + engine_version: + device: + type: smartphone + brand: C3 + model: 9930i + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; A1303 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 WapAppInfo:AndroidNew + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 30.0.0.0 + engine: Blink + engine_version: + device: + type: smartphone + brand: C3 + model: A1303 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; A309W Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 30.0.0.0 + engine: Blink + engine_version: + device: + type: smartphone + brand: C3 + model: A309W + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Ixion ES350 Build/DEXP) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 YaBrowser/17.3.0.373.00 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Yandex Browser + short_name: YA + version: 17.3.0.373.00 + engine: Blink + engine_version: + device: + type: smartphone + brand: DX + model: Ixion ES350 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FTJ152C Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 56.0.2924.87 + engine: Blink + engine_version: + device: + type: smartphone + brand: FT + model: Samurai Miyabi + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; FT141B Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: + device: + type: smartphone + brand: FT + model: Nico + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; FT142 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: + device: + type: smartphone + brand: FT + model: Priori 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; FT142A Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: + device: + type: smartphone + brand: FT + model: Priori 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FTJ152A Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.84 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 55.0.2883.84 + engine: Blink + engine_version: + device: + type: smartphone + brand: FT + model: Priori 3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FTJ152B Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.124 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 53.0.2785.124 + engine: Blink + engine_version: + device: + type: smartphone + brand: FT + model: Priori 3S LTE + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FTJ152D Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.85 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 54.0.2840.85 + engine: Blink + engine_version: + device: + type: smartphone + brand: FT + model: Samurai Kiwami + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FTJ161B Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.85 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 54.0.2840.85 + engine: Blink + engine_version: + device: + type: smartphone + brand: FT + model: Samurai Rei + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FT142D_LTEXM Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.85 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 54.0.2840.85 + engine: Blink + engine_version: + device: + type: smartphone + brand: FT + model: XM + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FTJ162D Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.85 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 54.0.2840.85 + engine: Blink + engine_version: + device: + type: smartphone + brand: FT + model: Priori 4 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Admire SXY Build/LMY47D; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: + device: + type: smartphone + brand: ZN + model: Admire SXY + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.4; Cinemax1 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.4" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 30.0.0.0 + engine: Blink + engine_version: + device: + type: smartphone + brand: ZN + model: Cinemax1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Cinemax2 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 39.0.0.0 + engine: Blink + engine_version: + device: + type: smartphone + brand: ZN + model: Cinemax2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Cinemax 2+ Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.76 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 46.0.2490.76 + engine: Blink + engine_version: + device: + type: smartphone + brand: ZN + model: Cinemax 2+ + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Cinemax 3 Build/LMY47D; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/57.0.2987.132 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 57.0.2987.132 + engine: Blink + engine_version: + device: + type: smartphone + brand: ZN + model: Cinemax 3 + os_family: Android + browser_family: Chrome +- + user_agent: UCWEB/2.0 (MIDP-2.0; U; Adr 6.0; en-US; Cinemax_4G) U2/1.0.0 UCBrowser/10.9.0.946 U2/1.0.0 Mobile + os: + name: Android + short_name: AND + version: "6.0" + platform: + client: + type: browser + name: UC Browser + short_name: UC + version: 10.9.0.946 + engine: "" + engine_version: "" + device: + type: smartphone + brand: ZN + model: Cinemax 4G + os_family: Android + browser_family: Unknown +- + user_agent: UCWEB/2.0 (MIDP-2.0; U; Adr 6.0; en-US; Cinemax_Click) U2/1.0.0 UCBrowser/10.9.0.946 U2/1.0.0 Mobile + os: + name: Android + short_name: AND + version: "6.0" + platform: + client: + type: browser + name: UC Browser + short_name: UC + version: 10.9.0.946 + engine: "" + engine_version: "" + device: + type: smartphone + brand: ZN + model: Cinemax Click + os_family: Android + browser_family: Unknown +- + user_agent: UCWEB/2.0 (MIDP-2.0;U;Adr 6.0;en-US;Cinemax-Force) U2/1.0.0 UCBrowser/10.6.8.732 U2/1.0.0 Mobile + os: + name: Android + short_name: AND + version: "6.0" + platform: + client: + type: browser + name: UC Browser + short_name: UC + version: 10.6.8.732 + engine: "" + engine_version: "" + device: + type: smartphone + brand: ZN + model: Cinemax-Force + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; DM550 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.93 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4.2" + platform: + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 39.0.2171.93 + engine: Blink + engine_version: + device: + type: smartphone + brand: B2 + model: DM550 + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 45f0cac0fe..450cbc67cf 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -450,7 +450,7 @@ Airness: # Alcatel Alcatel: - regex: 'Alcatel|Alc[a-z0-9]+|One[ _]?Touch|(?:6036Y|6039H|50[16]5X|9005X|I213|5015D|5051X|6050[AFY])[);/ ]' + regex: 'Alcatel|Alc[a-z0-9]+|One[ _]?Touch|(?:6036Y|6039H|50[16]5X|9005X|I213|5015D|5051X|6050[AFY]|4013M)[);/ ]' device: 'smartphone' models: - regex: '50[16]5X[);/ ]' @@ -494,6 +494,8 @@ Alcatel: model: '$1' - regex: 'Alc([a-z0-9]+)' model: '$1' + - regex: '4013M' + model: 'One Touch Pixi 3' # Allview Allview: @@ -813,6 +815,18 @@ Blu: device: 'smartphone' model: '$1' +# Blackview +Blackview: + regex: '(BV[2567]000(?:[ _](?:PRO))?|omega[ _]pro|Alife[ _][PS]1|Heatwave|DM550)[ _]Build' + device: 'smartphone' + models: + - regex: '(BV[2567]000(?:[ _](?:PRO))?)[ _]Build' + model: '$1' + - regex: 'omega[ _]pro' + model: 'Omega Pro' + - regex: '(Alife[ _][PS]1|DM550|Heatwave)' + model: '$1' + # Boway Boway: regex: 'BOWAY' @@ -1012,6 +1026,12 @@ Changhong: model: '$1' device: 'tablet' +# China Mobile +'China Mobile': + regex: '(M812C|1501_M02|9930i|A1303|A309W) Build' + device: 'smartphone' + model: '$1' + # Compal Compal: regex: 'Compal-[a-z0-9]+' @@ -1034,13 +1054,13 @@ ConCorde: # Coolpad Coolpad: - regex: '(?:YL-)?Coolpad|8190Q[ ;/\)]|8295 Build' + regex: '(?:YL-)?Coolpad|8190Q[ ;/\)]|(8295|5860S) Build' device: 'smartphone' models: - regex: '8190Q[ ;/\)]' model: '8190Q' - - regex: '8295 Build' - model: '8295' + - regex: '(5860S|8295) Build' + model: '$1' - regex: '(?:YL-)?Coolpad[ _\-]?([^/;]+) Build' model: '$1' - regex: '(?:YL-)?Coolpad[ _\-]?([a-z0-9\-]+)' @@ -1145,6 +1165,12 @@ Desay: - regex: 'Desay[ _-]?([^;/)]+)[);/ ]' model: '$1' +# DEXP +DEXP: + regex: 'Ixion ([^;/]+) Build' + device: 'smartphone' + model: 'Ixion $1' + # Dbtel Dbtel: regex: 'DBTEL(?:[\-/])?([a-z0-9]+)' @@ -1673,7 +1699,7 @@ Evertek: # Explay Explay: - regex: 'Explay|ActiveD[ _]|Atlant |Informer[ _][0-9]+|CinemaTV 3G|Surfer[ _][0-9\.]|sQuad[ _][0-9\.]|Onliner[1-3]' + regex: 'Explay|ActiveD[ _]|Atlant |Informer[ _][0-9]+|CinemaTV 3G|Surfer[ _][0-9\.]|sQuad[ _][0-9\.]|Onliner[1-3]|RioPlay' device: 'tablet' models: - regex: 'ActiveD[ _]7.4[ _]3G' @@ -1690,15 +1716,16 @@ Explay: model: 'sQuad $1' - regex: 'Onliner([1-3])' model: 'Onliner $1' - - regex: 'Atlant[;/) ]' device: 'smartphone' model: 'Atlant' - - regex: 'Explay[ _-]([^;/]+) Build' model: '$1' - regex: 'Explay[ _-]([^;/]+)[;/)]' model: '$1' + - regex: '(RioPlay)[;/) ]' + device: 'smartphone' + model: 'Rio Play' # Ezze Ezze: @@ -2582,7 +2609,7 @@ Lexibook: # lg LG: - regex: 'LG|portalmmm/2\.0 (?:KE|KG|KP|L3)|(?:VX[0-9]+|L-0[12]D|L-07C|P713)[);/ ]|NetCast' + regex: 'LG|portalmmm/2\.0 (?:KE|KG|KP|L3)|(?:VX[0-9]+|L-0[12]D|L-07C|P713)[);/ ]|NetCast|VS995' device: 'smartphone' models: - regex: 'P713' @@ -2630,6 +2657,8 @@ LG: model: '$1' - regex: '(VX[0-9]+)' model: '$1' + - regex: 'VS995' + model: 'V20' # Lingwin Lingwin: @@ -3246,6 +3275,15 @@ Nous: - regex: '(NS[0-9]{1,4}) Build' model: '$1' +# Nvidia +Nvidia: + regex: '(SHIELD Tablet K1) Build' + device: 'tablet' + models: + - regex: '(SHIELD Tablet K1) Build' + model: '$1' + + # o2 O2: regex: 'Xda|O2[ \-]|COCOON' @@ -3559,6 +3597,12 @@ Pomp: - regex: 'POMP[ _-]([^;/)]+)[;/)]' model: '$1' +# PPTV +PPTV: + regex: '(KING 7)' + device: 'smartphone' + model: '$1' + # ProScan ProScan: regex: 'PLT([^;/]+) Build' @@ -4502,13 +4546,15 @@ T-Mobile: # Tcl TCL: - regex: 'TCL[ -][a-z0-9]+|TCL[_ -][^;/]+ Build' + regex: 'TCL[ -][a-z0-9]+|(TCL[_ -][^;/]+|7040N) Build' device: 'smartphone' models: - regex: 'TCL[_ -]([^;/]+) Build' model: '$1' - regex: 'TCL[ -]([a-z0-9]+)' model: '$1' + - regex: '(7040N)' + model: '$1' # Tecno Mobile Tecno Mobile: @@ -4891,6 +4937,16 @@ Wiko: - regex: '(?:WIKO-)?Wax Build' model: 'Wax' +# Wileyfox +Wileyfox: + regex: '(?:Wileyfox [^/]+)|Swift([^/]+) Build' + device: 'smartphone' + models: + - regex: 'Wileyfox ([^/]+) Build' + model: '$1' + - regex: 'Swift ([^/]+) Build' + model: 'Swift $1' + # Wolder Wolder: regex: 'miSmart|miTab' @@ -5186,6 +5242,32 @@ Fly: - regex: 'MERIDIAN-([a-z0-9]+)' model: '$1' +# Freetel +Freetel: + regex: '(FTJ152[ABCD]|FT141B|FT142D_LTEXM|FT142A?|FTJ161B|FTJ152E|FTJ162D) Build' + device: 'smartphone' + models: + - regex: 'FTJ152C' + model: 'Samurai Miyabi' + - regex: 'FT141B' + model: 'Nico' + - regex: 'FT142D_LTEXM' + model: 'XM' + - regex: 'FT142A?' + model: 'Priori 2' + - regex: 'FTJ152A' + model: 'Priori 3' + - regex: 'FTJ162D' + model: 'Priori 4' + - regex: 'FTJ152B' + model: 'Priori 3S LTE' + - regex: 'FTJ152D' + model: 'Samurai Kiwami' + - regex: 'FTJ161B' + model: 'Samurai Rei' + - regex: 'FTJ152E' + model: 'Katana 1' + # Zeemi Zeemi: regex: 'ZEEMI[ _-]' @@ -5204,7 +5286,7 @@ Zopo: # ZTE ZTE: - regex: 'ZTE|AxonPhone|([a-z0-9]+)_USA_Cricket|(?:Blade S6|N9[15]8St|NX(?:403A|40[X2]|507J|503A|505J|506J|508J|510J|511J|513J|529J|531J|549J|601J)|Z331|N9510|N9180|N9101|N9515|N952[01]|N9810|N799D|[UV]9180|[UV]9815|Z768G|Z820|Z981)[);/ ]' + regex: 'ZTE|AxonPhone|([a-z0-9]+)_USA_Cricket|(?:Blade S6|N9[15]8St|NX(?:403A|40[X2]|507J|503A|505J|506J|508J|510J|511J|513J|529J|531J|549J|601J)|Z331|N9510|N9180|N9101|NX406E|N9515|N952[01]|N9810|N799D|[UV]9180|[UV]9815|Z768G|Z820|Z981|A460)[);/ ]' device: 'smartphone' models: # explicit smartphone models @@ -5270,6 +5352,10 @@ ZTE: model: 'Obsidian' - regex: 'Z981[);/ ]' model: 'ZMAX Pro' + - regex: 'Blade (A460)' + model: 'Blade $1' + - regex: 'NX406E[);/ ]' + model: 'Nubia Z5S' - regex: 'AxonPhone ([^;/]+) Build' model: 'AxonPhone $1' @@ -5284,6 +5370,11 @@ ZTE: model: '$1' - regex: 'ZTE[ _]([a-z0-9]+)' model: '$1' +# Zen' +Zen: + regex: '(Admire[_ ][^/;]+|Cinemax[^/;)]+)(?:Build|\) U)' + device: 'smartphone' + model: '$1' # Devices with undectable brand, but detectable model Unknown: