diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 3350ff05dd..a7456676fe 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -396,6 +396,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'CX' => 'Crescent', 'CK' => 'Cricket', 'CM' => 'Crius Mea', + 'CMF' => 'CMF', '0C' => 'Crony', 'C1' => 'Crosscall', '4W' => 'Crown', @@ -502,6 +503,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'ENI' => 'ENIE', '2E' => 'E-Ceros', 'E8' => 'E-tel', + 'ETH' => 'E-TACHI', 'EAS' => 'EAS Electric', 'EP' => 'Easypix', 'EQ' => 'Eagle', @@ -1249,7 +1251,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'NRD' => 'Nordfrost', 'NOR' => 'NORMANDE', '7N' => 'NorthTech', - 'NOT' => 'Nothing Phone', + 'NOT' => 'Nothing', '5N' => 'Nos', 'NO' => 'Nous', 'NQ' => 'Novex', diff --git a/Tests/fixtures/phablet-1.yml b/Tests/fixtures/phablet-1.yml index f818e80231..bd1922ea7f 100644 --- a/Tests/fixtures/phablet-1.yml +++ b/Tests/fixtures/phablet-1.yml @@ -5472,3 +5472,39 @@ model: Pova 6 Pro 5G os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; FCP-N49) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome + version: 128.0.0.0 + engine: Blink + engine_version: 128.0.0.0 + device: + type: phablet + brand: Huawei + model: Honor Magic V3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; FCP-AN10 Build/HONORFCP-AN10; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.179 Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Webview + version: 124.0.6367.179 + engine: Blink + engine_version: 124.0.6367.179 + device: + type: phablet + brand: Huawei + model: Honor Magic V3 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/smartphone-32.yml b/Tests/fixtures/smartphone-32.yml index 3a17732689..15da8cf163 100644 --- a/Tests/fixtures/smartphone-32.yml +++ b/Tests/fixtures/smartphone-32.yml @@ -1579,8 +1579,8 @@ engine_version: 102.0.5005.167 device: type: smartphone - brand: Nothing Phone - model: "1" + brand: Nothing + model: Phone 1 os_family: Android browser_family: Unknown - diff --git a/Tests/fixtures/smartphone-38.yml b/Tests/fixtures/smartphone-38.yml index b2e88c0c30..c999662a8f 100644 --- a/Tests/fixtures/smartphone-38.yml +++ b/Tests/fixtures/smartphone-38.yml @@ -1861,8 +1861,8 @@ engine_version: 78.0.3904.108 device: type: smartphone - brand: Nothing Phone - model: "2" + brand: Nothing + model: Phone 2 os_family: Android browser_family: Unknown - @@ -4843,8 +4843,8 @@ engine_version: 122.0.6261.119 device: type: smartphone - brand: Nothing Phone - model: "2" + brand: Nothing + model: Phone 2 os_family: Android browser_family: Opera - @@ -4861,8 +4861,8 @@ engine_version: 122.0.6261.119 device: type: smartphone - brand: Nothing Phone - model: 2a + brand: Nothing + model: Phone 2a os_family: Android browser_family: Opera - diff --git a/Tests/fixtures/smartphone-40.yml b/Tests/fixtures/smartphone-40.yml index 3d71c87b15..5c83540d80 100644 --- a/Tests/fixtures/smartphone-40.yml +++ b/Tests/fixtures/smartphone-40.yml @@ -899,24 +899,6 @@ model: Honor Magic 4 Pro os_family: Android browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 14; FCP-AN10 Build/HONORFCP-AN10; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.179 Safari/537.36 - os: - name: Android - version: "14" - platform: "" - client: - type: browser - name: Chrome Webview - version: 124.0.6367.179 - engine: Blink - engine_version: 124.0.6367.179 - device: - type: smartphone - brand: Huawei - model: Honor Magic V3 - os_family: Android - browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 14; ELP-NX9 Build/HONORELP-N39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.135 Mobile Safari/537.36 OPX/2.5 os: @@ -6664,3 +6646,453 @@ model: Blade 10 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 8.1.0; en-us; A5SLIM Build/O11019) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/61.0.3163.128 Mobile Safari/537.36 XiaoMi/Mint Browser/3.9.3 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Mint Browser + version: 3.9.3 + engine: Blink + engine_version: 61.0.3163.128 + device: + type: smartphone + brand: E-TACHI + model: A5 Slim + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; A015 Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/13.7.8.1322 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: CMF + model: Phone 1 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; 2407FPN8EG Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/13.7.8.1322 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: Xiaomi + model: 14T Pro + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 12; en-US; SH-C03 Build/SP1A.210812.016) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/13.7.8.1322 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: Sharp + model: Aquos V6 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 11; en-US; DS-CR1 Build/RP1A.200720.011) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/13.7.8.1322 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: Dcode + model: Cypher + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 10; es-us; W-K211-OPE Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.128 Mobile Safari/537.36 PHX/16.5 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Phoenix Browser + version: "16.5" + engine: Blink + engine_version: 128.0.6613.128 + device: + type: smartphone + brand: Wiko + model: Y51 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; SH-C04) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.5845.50 Mobile Safari/537.36 OPR/102.0.4880.10 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Opera Mobile + version: 102.0.4880.10 + engine: Blink + engine_version: 116.0.5845.50 + device: + type: smartphone + brand: Sharp + model: Aquos V6+ + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 14; Z2453) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 129.0.0.0 + engine: Blink + engine_version: 129.0.0.0 + device: + type: smartphone + brand: ZTE + model: Blade A35 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; XT2401-2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 129.0.0.0 + engine: Blink + engine_version: 129.0.0.0 + device: + type: smartphone + brand: Motorola + model: Moto X50 Ultra + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; VOCAL V11) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 120.0.0.0 + engine: Blink + engine_version: 120.0.0.0 + device: + type: smartphone + brand: VOCAL + model: V11 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; WP39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 128.0.0.0 + engine: Blink + engine_version: 128.0.0.0 + device: + type: smartphone + brand: Oukitel + model: WP39 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; WP28 S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 128.0.0.0 + engine: Blink + engine_version: 128.0.0.0 + device: + type: smartphone + brand: Oukitel + model: WP28 S + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; WP28 E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 120.0.0.0 + engine: Blink + engine_version: 120.0.0.0 + device: + type: smartphone + brand: Oukitel + model: WP28 E + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; U Play) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 119.0.0.0 + engine: Blink + engine_version: 119.0.0.0 + device: + type: smartphone + brand: HTC + model: U Play + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Ultra 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 128.0.0.0 + engine: Blink + engine_version: 128.0.0.0 + device: + type: smartphone + brand: Sparx + model: Ultra 8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; TECNO KL5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 126.0.0.0 + engine: Blink + engine_version: 126.0.0.0 + device: + type: smartphone + brand: Tecno Mobile + model: Spark 30C + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; TECNO KG5m Build/RP1A.200720.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 126.0.0.0 + engine: Blink + engine_version: 126.0.0.0 + device: + type: smartphone + brand: Tecno Mobile + model: Spark Go (2022) + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Tecno Camon i4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 123.0.0.0 + engine: Blink + engine_version: 123.0.0.0 + device: + type: smartphone + brand: Tecno Mobile + model: Camon i4 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Phone (2a)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 128.0.0.0 + engine: Blink + engine_version: 128.0.0.0 + device: + type: smartphone + brand: Nothing + model: Phone 2a + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Iron Va) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 128.0.0.0 + engine: Blink + engine_version: 128.0.0.0 + device: + type: smartphone + brand: Hammer + model: Iron Va + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Energizer Energy S550) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Mobile Safari/537.36 EdgA/126.0.0.0 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Microsoft Edge + version: 126.0.0.0 + engine: Blink + engine_version: 126.0.0.0 + device: + type: smartphone + brand: Energizer + model: Energy S550 + os_family: Android + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (Linux; Android 14; ASUS_AI2401_E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 128.0.0.0 + engine: Blink + engine_version: 128.0.0.0 + device: + type: smartphone + brand: Asus + model: ROG Phone 8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Doogee S35) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 125.0.0.0 + engine: Blink + engine_version: 125.0.0.0 + device: + type: smartphone + brand: Doogee + model: S35 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Doogee N50) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 117.0.0.0 + engine: Blink + engine_version: 117.0.0.0 + device: + type: smartphone + brand: Doogee + model: N50 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Doogee N40 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 123.0.0.0 + engine: Blink + engine_version: 123.0.0.0 + device: + type: smartphone + brand: Doogee + model: N40 Pro + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 327e273b7f..b77cde5618 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -9621,3 +9621,75 @@ model: EX8S1 os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; OPD2403 Build/UKQ1.231108.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/13.7.8.1322 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: tablet + brand: OnePlus + model: Pad 2 12.1" WiFi + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; OPD2303 Build/UKQ1.230924.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/13.7.8.1322 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: tablet + brand: OPPO + model: Pad Neo + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 13; 7_PREMIUM_PRO Build/TQ3C.230805.001.B2; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/128.0.6613.146 Safari/537.36 OPR/83.1.2254.73239 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Opera + version: 83.1.2254.73239 + engine: Blink + engine_version: 128.0.6613.146 + device: + type: tablet + brand: Hometech + model: 7 Premium Pro + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 14; iPlay60_mini_Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome + version: 128.0.0.0 + engine: Blink + engine_version: 128.0.0.0 + device: + type: tablet + brand: AllDocube + model: iPlay 60 Mini Pro + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 2529621082..bb94f803e5 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -2829,3 +2829,57 @@ model: SW-LED32SB304 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; 50UST5970 Build/RP1A.200720.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.91 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 69.0.3497.91 + engine: Blink + engine_version: 69.0.3497.91 + device: + type: tv + brand: Skyline + model: 50UST5970 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; 50LU8130S Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.1.2.86 (lite) TV Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.1.2.86 + engine: Blink + engine_version: 113.0.5672.163 + device: + type: tv + brand: Asano + model: 50LU8130S 50.0" + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; 50LF7010T Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.120 YaBrowser/24.1.2.250 (lite) Safari/537.36 TV + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.1.2.250 + engine: Blink + engine_version: 83.0.4103.120 + device: + type: tv + brand: Asano + model: 50LF7010T 50.0" + os_family: Android + browser_family: Unknown diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index d297aa503a..1d2248e776 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -243,11 +243,11 @@ Cherry Mobile: # HTC (htc.com) HTC: - regex: 'HTC|Sprint (?:APA|ATP)|ADR(?!910L)[a-z0-9]+|NexusHD2|Amaze[ _]4G(?:[);/ ]|$)|(Desire|Sensation|Evo ?3D|IncredibleS|Wildfire|Butterfly)[ _]?([^;/)]+)(?: Build|\))|(Amaze[ _]4G|(?