diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 10db44de92..1f084db12a 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -352,6 +352,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'DL0' => 'DL', 'DE' => 'Denver', 'DS' => 'Desay', + 'DSI' => 'DSIC', 'DW' => 'DeWalt', 'DX' => 'DEXP', 'DEY' => 'DEYI', @@ -858,6 +859,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'J4' => 'Mara', 'MAR' => 'Marshal', '8Y' => 'Massgo', + 'MA1' => 'Mascom', '2M' => 'Masstel', '3X' => 'Mastertech', 'MAS' => 'Master-G', @@ -946,6 +948,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'MYM' => 'MyMobile', '07' => 'MyGica', 'MYG' => 'MygPad', + 'MWA' => 'MwalimuPlus', 'NEO' => 'neoCore', '08' => 'Nabi', 'N7' => 'National', @@ -1024,6 +1027,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'OA' => 'Okapia', 'OLA' => 'Olax', 'OLY' => 'Olympia', + 'OLT' => 'OLTO', 'OJ' => 'Ookee', 'OD' => 'Onda', 'ON' => 'OnePlus', diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml index c88bed5cd1..ea14a0a302 100644 --- a/Tests/fixtures/smartphone-34.yml +++ b/Tests/fixtures/smartphone-34.yml @@ -3735,3 +3735,379 @@ model: Star 4.0 G40 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; ZTE C2017) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.210 Mobile Safari/537.36 + os: + name: Android + version: 6.0.1 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 90.0.4430.210 + engine: Blink + engine_version: 90.0.4430.210 + device: + type: smartphone + brand: ZTE + model: Axon 7 Max + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 7.0; TECNO WX3LTE Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/104.0.5112.69 Mobile Safari/537.36 OPR/65.2.2254.63594 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Opera Mobile + version: 65.2.2254.63594 + engine: Blink + engine_version: 104.0.5112.69 + device: + type: smartphone + brand: Tecno Mobile + model: WX3 LTE + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; U; Android 11; ru-ru; Redmi 10 2022 Build/RP1A.200720.011) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.127 Mobile Safari/537.36 XiaoMi/MiuiBrowser/13.22.0-gn + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: MIUI Browser + version: 13.22.0 + engine: WebKit + engine_version: "537.36" + device: + type: smartphone + brand: Xiaomi + model: Redmi 10 (2022) + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 9; EF501) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.160 YaApp_Android/22.52.1 YaSearchBrowser/22.52.1 BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 22.52.1 + engine: Blink + engine_version: 100.0.4896.160 + device: + type: smartphone + brand: Bluebird + model: EF501 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 8.0.0; SANTIN BDsharing) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.167 YaApp_Android/22.76.1 YaSearchBrowser/22.76.1 BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: 8.0.0 + platform: ARM + client: + type: browser + name: Yandex Browser + version: 22.76.1 + engine: Blink + engine_version: 102.0.5005.167 + device: + type: smartphone + brand: Santin + model: BDsharing + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 6.0; APK Ukozi U6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.125 YaBrowser/22.7.0.144.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 22.7.0.144.00 + engine: Blink + engine_version: 102.0.5005.125 + device: + type: smartphone + brand: Ark + model: Ukozi U6 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; Luck L130) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 YaBrowser/22.11.2.78.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 22.11.2.78.00 + engine: Blink + engine_version: 106.0.0.0 + device: + type: smartphone + brand: Vertex + model: Luck L130 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 9; Stark) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 102.0.0.0 + engine: Blink + engine_version: 102.0.0.0 + device: + type: smartphone + brand: GFive + model: Stark + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; RD86QE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 108.0.0.0 + engine: Blink + engine_version: 108.0.0.0 + device: + type: smartphone + brand: DSIC + model: RD86QE + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; S32_NFC) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 100.0.4896.127 + engine: Blink + engine_version: 100.0.4896.127 + device: + type: smartphone + brand: Altice + model: S32 NFC + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; RK95) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 103.0.0.0 + engine: Blink + engine_version: 103.0.0.0 + device: + type: smartphone + brand: CipherLab + model: RK95 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; EDA61K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 102.0.0.0 + engine: Blink + engine_version: 102.0.0.0 + device: + type: smartphone + brand: Honeywell + model: ScanPal EDA61K + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; V18 pro_A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.97 Mobile Safari/537.36 OPR/71.3.3718.67322 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Opera Mobile + version: 71.3.3718.67322 + engine: Blink + engine_version: 104.0.5112.97 + device: + type: smartphone + brand: X-TIGI + model: V18 Pro + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; THOMSON SEREA500) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: 8.1.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: Thomson + model: Serea 500 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Mascom S750) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 101.0.0.0 + engine: Blink + engine_version: 101.0.0.0 + device: + type: smartphone + brand: Mascom + model: S750 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 10; NPA205SH Build/S920J; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/67.0.3396.127 Mobile Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Chrome Webview + version: 67.0.3396.127 + engine: Blink + engine_version: 67.0.3396.127 + device: + type: smartphone + brand: Sharp + model: Aquos Keitai 4 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; HarmonyOS; ABR-AL80; HMSCore 6.8.0.359) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/13.0.1.301 Mobile Safari/537.36 + os: + name: HarmonyOS + version: "" + platform: "" + client: + type: browser + name: Huawei Browser Mobile + version: 13.0.1.301 + engine: Blink + engine_version: 99.0.4844.88 + device: + type: smartphone + brand: Huawei + model: P50 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 13; 2211133C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 108.0.0.0 + engine: Blink + engine_version: 108.0.0.0 + device: + type: smartphone + brand: Xiaomi + model: "13" + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 13; V2241A Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/97.0.4692.98 Mobile Safari/537.36 T7/13.25 SP-engine/2.63.0 baiduboxapp/13.25.0.10 (Baidu; P1 13) NABar/1.0 + os: + name: Android + version: "13" + platform: "" + client: + type: mobile app + name: Baidu Box App + version: 13.25.0.10 + device: + type: smartphone + brand: Vivo + model: X90 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 12; HarmonyOS; CET-AL60; HMSCore 6.8.0.332) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/13.0.1.301 Mobile Safari/537.36 + os: + name: HarmonyOS + version: "" + platform: "" + client: + type: browser + name: Huawei Browser Mobile + version: 13.0.1.301 + engine: Blink + engine_version: 99.0.4844.88 + device: + type: smartphone + brand: Huawei + model: Mate 50E + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 13; 23013RK75C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.101 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 98.0.4758.101 + engine: Blink + engine_version: 98.0.4758.101 + device: + type: smartphone + brand: Xiaomi + model: Redmi K60 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 7d146a8595..44d27cfe5f 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -1703,3 +1703,127 @@ model: T3G 04 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 11; MP01A3G Build/RP1A.201005.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/106.0.5249.126 Safari/537.36 OPR/65.2.2254.63594 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Opera + version: 65.2.2254.63594 + engine: Blink + engine_version: 106.0.5249.126 + device: + type: tablet + brand: MwalimuPlus + model: MP01A3G + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 9; TOREX PAD 8PRO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome + version: 103.0.0.0 + engine: Blink + engine_version: 103.0.0.0 + device: + type: tablet + brand: Torex + model: Pad 8 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; TOREX PAD 8 PRO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome + version: 108.0.0.0 + engine: Blink + engine_version: 108.0.0.0 + device: + type: tablet + brand: Torex + model: Pad 8 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; KFRAWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/106.6.3 like Chrome/106.0.5249.208 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Mobile Silk + version: 106.6.3 + engine: Blink + engine_version: 106.0.5249.208 + device: + type: tablet + brand: Amazon + model: Fire HD 8 (2022) + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; KFQUWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/94.5.2 like Chrome/94.0.4606.128 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Mobile Silk + version: 94.5.2 + engine: Blink + engine_version: 94.0.4606.128 + device: + type: tablet + brand: Amazon + model: Fire 7 (2022) + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.3; KFTHWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/81.2.16 like Chrome/81.0.4044.138 Safari/537.36 + os: + name: Android + version: 4.4.3 + platform: "" + client: + type: browser + name: Mobile Silk + version: 81.2.16 + engine: Blink + engine_version: 81.0.4044.138 + device: + type: tablet + brand: Amazon + model: Kindle Fire HDX 7" WiFi + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 7.1.1; zh-CN; Readboy_G550A Build/NMF26F) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/69.0.3497.100 UWS/3.22.1.233 Mobile Safari/537.36 AliApp(DingTalk/6.5.57.23) com.alibaba.android.rimet/27727534 Channel/10002068 language/zh-CN abi/64 Pad/APad colorScheme/light + os: + name: Android + version: 7.1.1 + platform: "" + client: + type: mobile app + name: DingTalk + version: 6.5.57.23 + device: + type: tablet + brand: Readboy + model: G550A + os_family: Android + browser_family: Unknown diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index 1bfb886d7f..6d65602a94 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -71,3 +71,75 @@ model: TF500 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; OLTO-43ST20U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.167 YaApp_Android/22.79/apad YaSearchBrowser/22.79/apad BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Yandex Browser + version: "22.79" + engine: Blink + engine_version: 102.0.5005.167 + device: + type: tv + brand: OLTO + model: 43ST20U + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 9; TESLA XT550) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome + version: 103.0.0.0 + engine: Blink + engine_version: 103.0.0.0 + device: + type: tv + brand: ComTrade Tesla + model: MediaBox XT550 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; Perfeo_PF_A4553) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome + version: 108.0.0.0 + engine: Blink + engine_version: 108.0.0.0 + device: + type: tv + brand: Perfeo + model: MATRIX + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.1.2; IPC002) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 + os: + name: Android + version: 7.1.2 + platform: "" + client: + type: browser + name: Chrome + version: 108.0.0.0 + engine: Blink + engine_version: 108.0.0.0 + device: + type: tv + brand: Invin + model: IPC002 + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index f958b916fe..7e5adb6fd9 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -3189,7 +3189,7 @@ Assistant: # Ark (Ark Electronic Technology) Ark: - regex: '(ARK[_ -])?Benefit[_ -]([^/;]*)(?: Build|\))|Impulse[ _]P[12]|(?:EDGE A5HD|Elf_S8|ICON (R40\+|R45)|Wizard_[12]|UKOZI U5|L925)(?:[);/ ]|$)' + regex: '(ARK[_ -])?Benefit[_ -]([^/;]*)(?: Build|\))|Impulse[ _]P[12]|(?:EDGE A5HD|Elf_S8|ICON (R40\+|R45)|Wizard_[12]|UKOZI U[56]|L925)(?:[);/ ]|$)' device: 'smartphone' models: - regex: '(?:ARK[_ -])?Benefit[_ -]([^/;]*)(?: Build|\))' @@ -3206,8 +3206,8 @@ Ark: model: 'Wizard $1' - regex: 'Elf_S8(?:[);/ ]|$)' model: 'Elf S8' - - regex: 'UKOZI U5(?:[);/ ]|$)' - model: 'Ukozi U5' + - regex: 'UKOZI U([56])(?:[);/ ]|$)' + model: 'Ukozi U$1' - regex: 'L925(?:[);/ ]|$)' model: 'Hercls L925' @@ -4007,7 +4007,7 @@ VGO TEL: # Vivo (vivo.com.cn, vivo.com) Vivo: - regex: '((?:VIV-|BBG-)?(?