diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index c45322ecac..3350ff05dd 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -380,6 +380,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'CON' => 'Conceptum', 'CED' => 'Continental Edison', '9C' => 'Colors', + 'COL' => 'COLORROOM', 'CO' => 'Coolpad', 'COO' => 'Coopers', 'CDE' => 'COOD-E', diff --git a/Tests/fixtures/phablet-1.yml b/Tests/fixtures/phablet-1.yml index ef4c29617b..f818e80231 100644 --- a/Tests/fixtures/phablet-1.yml +++ b/Tests/fixtures/phablet-1.yml @@ -5418,3 +5418,57 @@ model: iPhone 15 Plus os_family: iOS browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; az-az; Redmi Note 13 Build/UKQ1.231207.002) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/112.0.5615.136 Mobile Safari/537.36 XiaoMi/MiuiBrowser/14.10.1.3-gn + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Mi Browser + version: 14.10.1.3 + engine: Blink + engine_version: 112.0.5615.136 + device: + type: phablet + brand: Xiaomi + model: Redmi Note 13 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; TECNO Mobile LI6 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: phablet + brand: Tecno Mobile + model: Pova 6 Neo + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 14; TECNO Mobile LI9) 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: phablet + brand: Tecno Mobile + model: Pova 6 Pro 5G + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/smartphone-40.yml b/Tests/fixtures/smartphone-40.yml index 3d53d66c13..3d71c87b15 100644 --- a/Tests/fixtures/smartphone-40.yml +++ b/Tests/fixtures/smartphone-40.yml @@ -6163,3 +6163,504 @@ model: Moto G54 5G os_family: Android browser_family: Chrome +- user_agent: Mozilla/5.0 (Linux; Android 14; Hyper 7 Pro) 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: Hotwav + model: Hyper 7 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; RMX3988) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.165 YaBrowser/24.7.8.165.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.7.8.165.00 + engine: Blink + engine_version: 126.0.6478.165 + device: + type: smartphone + brand: Realme + model: 13 Pro 5G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 9.0; V17 SD665) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Mobile Safari/537.36 + os: + name: Android + version: "9.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 91.0.4472.101 + engine: Blink + engine_version: 91.0.4472.101 + device: + type: smartphone + brand: Vivo + model: V17 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; zh-cn; PKD130 Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.61 Mobile Safari/537.36 HeyTapBrowser/40.8.30.9 + os: + name: Android + version: "14" + platform: "" + client: + type: mobile app + name: HeyTapBrowser + version: 40.8.30.9 + device: + type: smartphone + brand: OPPO + model: A3x 5G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; V2409 Build/UP1A.231005.007_MOD1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/128.0.6613.146 Mobile Safari/537.36 OPR/85.0.2254.74019 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Opera Mobile + version: 85.0.2254.74019 + engine: Blink + engine_version: 128.0.6613.146 + device: + type: smartphone + brand: Vivo + model: Y03t + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; V2344 Build/UP1A.231005.007; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/128.0.6613.146 Mobile Safari/537.36 OPR/85.0.2254.73914 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Opera Mobile + version: 85.0.2254.73914 + engine: Blink + engine_version: 128.0.6613.146 + device: + type: smartphone + brand: Vivo + model: Y03t + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; V2348 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: Vivo + model: V40 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; S6702X Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 UCBrowser/13.4.0.1306 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: UC Browser + version: 13.4.0.1306 + engine: Blink + engine_version: 78.0.3904.108 + device: + type: smartphone + brand: NUU Mobile + model: B30 Pro + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-us; Pixel 9 Pro Build/JOP24G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.111 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Webview + version: 76.0.3809.111 + engine: Blink + engine_version: 76.0.3809.111 + device: + type: smartphone + brand: Google + model: Pixel 9 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; motorola razr 50 Build/U3UC34.63-88-1) 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: Motorola + model: Moto Razr 50 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; DS-CL4 Lite 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: Dcode + model: Cygnal 4 Lite + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 13; fr-fr; NOVA60 Build/TP1A.220624.014) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36 PHX/16.4 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Phoenix Browser + version: "16.4" + engine: Blink + engine_version: 127.0.6533.103 + device: + type: smartphone + brand: Condor + model: Nova 60 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 13; zh-CN; ZTE 7543N Build/TP1A.220624.014) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 Quark/7.2.6.641 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Quark + version: 7.2.6.641 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: ZTE + model: Fresh 50 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 13; uz-uz; Z2351N Build/TP1A.220624.014) 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: "13" + platform: "" + client: + type: browser + name: Mint Browser + version: 3.9.3 + engine: Blink + engine_version: 61.0.3163.128 + device: + type: smartphone + brand: Nubia + model: Focus Pro 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 13; en-us; LT S33 Build/JOP24G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.111 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome Webview + version: 76.0.3809.111 + engine: Blink + engine_version: 76.0.3809.111 + device: + type: smartphone + brand: LT Mobile + model: S33 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 12; en-US; TECNO Mobile CH6i 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: Tecno Mobile + model: Camon 19 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 14; RMX3992) 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: Realme + model: 12 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; RMX3990) 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: Realme + model: 13 Pro 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; RMX3933) 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: Realme + model: Narzo N61 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; RMX3921) 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: Realme + model: 13 Pro+ 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; RMX3869) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 127.0.0.0 + engine: Blink + engine_version: 127.0.0.0 + device: + type: smartphone + brand: Realme + model: Narzo 70 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Pixel 9) 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: Google + model: Pixel 9 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Pixel 9 Pro Fold) 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: Google + model: Pixel 9 Pro Fold + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; JDY-LX2) 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: Huawei + model: Honor X6b + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; KINGKONG_ES) 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: CUBOT + model: King Kong ES + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Blade10 Ultra) 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: Doogee + model: Blade 10 Ultra + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Blade10 Pro) 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: Doogee + model: Blade 10 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; Blade10) 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: Doogee + model: Blade 10 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 324a391e26..327e273b7f 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -9585,3 +9585,39 @@ model: Tab A15 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 13; en-US; K10C Build/TP1A.220624.014) 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: "13" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: tablet + brand: COLORROOM + model: K10C + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 10; en-US; EX8S1 Build/QP1A.190711.020) 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: "10" + platform: "" + client: + type: browser + name: UC Browser + version: 13.7.8.1322 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: tablet + brand: EXCEED + model: EX8S1 + os_family: Android + browser_family: Unknown diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index ed19584366..2529621082 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -2721,3 +2721,111 @@ model: Plus os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; STV-55LED41) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.114 Safari/537.36 OPR/64.3.3282.60839 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Opera + version: 64.3.3282.60839 + engine: Blink + engine_version: 91.0.4472.114 + device: + type: tv + brand: Shivaki + model: STV-55LED41 + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; arm; Android 9; SW-LED65UG402 Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/118.0.5993.550 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 118.0.5993.550 + engine: Blink + engine_version: 118.0.5993.550 + device: + type: tv + brand: Starwind + model: SW-LED65UG402 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 9; SW-LED43UB400 Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/118.0.5993.550 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 118.0.5993.550 + engine: Blink + engine_version: 118.0.5993.550 + device: + type: tv + brand: Starwind + model: SW-LED43UB400 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 9; SW-LED43SB300 Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/118.0.5993.550 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 118.0.5993.550 + engine: Blink + engine_version: 118.0.5993.550 + device: + type: tv + brand: Starwind + model: SW-LED43SB300 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 9; SW-LED40SB300 Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/118.0.5993.550 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 118.0.5993.550 + engine: Blink + engine_version: 118.0.5993.550 + device: + type: tv + brand: Starwind + model: SW-LED40SB300 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 9; SW-LED32SB304 Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/118.0.5993.550 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 118.0.5993.550 + engine: Blink + engine_version: 118.0.5993.550 + device: + type: tv + brand: Starwind + model: SW-LED32SB304 + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9ddd2881d9..d297aa503a 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -4418,7 +4418,7 @@ VGO TEL: # Vivo (vivo.com.cn, vivo.com) Vivo: - regex: '((?:VIV-|BBG-)?(?