diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index aacec26c53..657ef922e9 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -795,6 +795,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'HMD' => 'HMD', '8W' => 'HKPro', 'HOF' => 'HOFER', + 'HOC' => 'hoco', 'H1' => 'Hoffmann', 'HOM' => 'Homatics', 'H0' => 'Hometech', @@ -1070,6 +1071,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'LU' => 'Lumus', 'LUM' => 'Lumitel', 'L9' => 'Luna', + 'LUO' => 'LUO', 'LR' => 'Luxor', 'LY' => 'LYF', 'LL' => 'Leader Phone', diff --git a/Tests/fixtures/phablet-1.yml b/Tests/fixtures/phablet-1.yml index 308ba692f0..4500a78de3 100644 --- a/Tests/fixtures/phablet-1.yml +++ b/Tests/fixtures/phablet-1.yml @@ -5598,3 +5598,39 @@ model: Mate XT Ultimate Design os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; zh-cn; 24094RAD4C Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.119 Mobile Safari/537.36 XiaoMi/MiuiBrowser/18.7.921118 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Mi Browser + version: 18.7.921118 + engine: Blink + engine_version: 122.0.6261.119 + device: + type: phablet + brand: Xiaomi + model: Redmi Note 14 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; Note 12 EF) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.33 YaBrowser/24.10.6.33.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.10.6.33.00 + engine: Blink + engine_version: 128.0.6613.33 + device: + type: phablet + brand: Hotwav + model: Note 12 EF + os_family: Android + browser_family: Unknown diff --git a/Tests/fixtures/smartphone-1.yml b/Tests/fixtures/smartphone-1.yml index 48feefd1f3..0b87c18699 100644 --- a/Tests/fixtures/smartphone-1.yml +++ b/Tests/fixtures/smartphone-1.yml @@ -9620,3 +9620,21 @@ model: EK-6020 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 1.6; en-us; HTC_TATTOO_A3288 Build/DRC79) AppleWebKit/528.5 (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1 + os: + name: Android + version: "1.6" + platform: "" + client: + type: browser + name: Android Browser + version: "" + engine: WebKit + engine_version: "528.5" + device: + type: smartphone + brand: HTC + model: Tattoo A3288 + os_family: Android + browser_family: Android Browser diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index 3c3482801e..f3f7339471 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -4280,3 +4280,255 @@ model: Premier 5 Max os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 15; zh-CN; PTP-AN60 Build/HONORPTP-AN60) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/17.2.1.1352 Mobile Safari/537.36 + os: + name: Android + version: "15" + platform: "" + client: + type: browser + name: UC Browser + version: 17.2.1.1352 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: Huawei + model: Honor Magic 7 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; zh-CN; MZ-MEIZU 20 Pro Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/73.0.3683.121 MZBrowser/11.0.11 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Meizu Browser + version: 11.0.11 + engine: Blink + engine_version: 73.0.3683.121 + device: + type: smartphone + brand: Meizu + model: 20 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; V2433 Build/UP1A.231005.007_MOD2) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/126.0.6478.71 UCBrowser/12.12.10.1228 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: UC Browser + version: 12.12.10.1228 + engine: Blink + engine_version: 126.0.6478.71 + device: + type: smartphone + brand: Vivo + model: Y28 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 14; en-US; RMX3987 Build/UKQ1.231108.001) 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: Realme + model: P2 Pro 5G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 13; en-za; SWIFT_4G Build/TP1A.220624.014) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.60 Mobile Safari/537.36 PHX/16.3 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Phoenix Browser + version: "16.3" + engine: Blink + engine_version: 130.0.6723.60 + device: + type: smartphone + brand: Stylo + model: Swift 4G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; 2409BRN2CL Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.108 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Webview + version: 130.0.6723.108 + engine: Blink + engine_version: 130.0.6723.108 + device: + type: smartphone + brand: Xiaomi + model: Redmi 14C + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; BRP-AN00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 107.0.0.0 + engine: Blink + engine_version: 107.0.0.0 + device: + type: smartphone + brand: Huawei + model: Honor X60 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; A142P Build/UP1A.231005.007) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.107 Mobile Safari/537.36 OPX/2.6 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Opera GX + version: "2.6" + engine: Blink + engine_version: 130.0.6723.107 + device: + type: smartphone + brand: Nothing + model: Phone 2a Plus + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; AGM_H_MAX) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.551 YaApp_Android/24.101.1 YaSearchBrowser/24.101.1 BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.101.1 + engine: Blink + engine_version: 128.0.6613.551 + device: + type: smartphone + brand: AGM + model: H Max + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; itel P671LN) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.279 YaBrowser/24.12.0.279.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.12.0.279.00 + engine: Blink + engine_version: 130.0.6723.279 + device: + type: smartphone + brand: iTel + model: P65 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; HMD Skyline) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.1804 YaApp_Android/24.120.1 YaSearchBrowser/24.120.1 BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.120.1 + engine: Blink + engine_version: 130.0.6723.1804 + device: + type: smartphone + brand: HMD + model: Skyline + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; S200 X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.67 YaSearchBrowser/24.106 BroPP/1.0 YaSearchApp/24.106 webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: "24.106" + engine: Blink + engine_version: 128.0.6613.67 + device: + type: smartphone + brand: Doogee + model: S200 X + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; S200) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.106 YaBrowser/24.10.4.106.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.10.4.106.00 + engine: Blink + engine_version: 128.0.6613.106 + device: + type: smartphone + brand: Doogee + model: S200 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SHARK 9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.282 YaBrowser/24.12.0.282.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.12.0.282.00 + engine: Blink + engine_version: 130.0.6723.282 + device: + type: smartphone + brand: Blackview + model: Shark 9 + os_family: Android + browser_family: Unknown diff --git a/Tests/fixtures/tablet-12.yml b/Tests/fixtures/tablet-12.yml index 7d1f712a19..27fef4ebb3 100644 --- a/Tests/fixtures/tablet-12.yml +++ b/Tests/fixtures/tablet-12.yml @@ -1259,3 +1259,183 @@ model: Note Air 4C os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 9; WO Pad Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.1742 YaApp_Android/24.120 YaSearchBrowser/24.120 BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: ARM + client: + type: browser + name: Yandex Browser + version: "24.120" + engine: Blink + engine_version: 130.0.6723.1742 + device: + type: tablet + brand: 'W&O' + model: WO Pad Pro + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 9; WO 10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.67 YaSearchBrowser/24.106.1 BroPP/1.0 YaSearchApp/24.106.1 webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.106.1 + engine: Blink + engine_version: 128.0.6613.67 + device: + type: tablet + brand: 'W&O' + model: WO10 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 9; WO 12) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.67 YaSearchBrowser/24.106.1 BroPP/1.0 YaSearchApp/24.106.1 webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.106.1 + engine: Blink + engine_version: 128.0.6613.67 + device: + type: tablet + brand: 'W&O' + model: WO12 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14.0; T181-EEA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.264 YaBrowser/24.12.0.264.01 (beta) Safari/537.36 + os: + name: Android + version: "14.0" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.12.0.264.01 beta + engine: Blink + engine_version: 130.0.6723.264 + device: + type: tablet + brand: TOSCIDO + model: T181 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; itel P10003L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.36 YaBrowser/24.10.6.36.01 Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.10.6.36.01 + engine: Blink + engine_version: 128.0.6613.36 + device: + type: tablet + brand: iTel + model: Vista Tab 30 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; hoco_HI10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.67 YaSearchBrowser/24.106/apad BroPP/1.0 YaSearchApp/24.106/apad webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: "24.106" + engine: Blink + engine_version: 128.0.6613.67 + device: + type: tablet + brand: hoco + model: HI10 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 10; TB-X606X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.72 Mobile Safari/537.36 EdgA/90.0.818.41 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Microsoft Edge + version: 90.0.818.41 + engine: Blink + engine_version: 90.0.4430.72 + device: + type: tablet + brand: Lenovo + model: Tab M10 FHD Plus + os_family: Android + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (Linux; Android 10; TB-X606F Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Mobile Safari/537.36 OPR/77.0.4054.90 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Opera Mobile + version: 77.0.4054.90 + engine: Blink + engine_version: 91.0.4472.101 + device: + type: tablet + brand: Lenovo + model: Tab M10 FHD Plus + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 10; TB-X505X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Mobile Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 91.0.4472.101 + engine: Blink + engine_version: 91.0.4472.101 + device: + type: tablet + brand: Lenovo + model: Tab M10 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 10; TB-X505L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Mobile Safari/537.36 OPR/76.0.4017.123 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Opera Mobile + version: 76.0.4017.123 + engine: Blink + engine_version: 90.0.4430.93 + device: + type: tablet + brand: Lenovo + model: Tab M10 + os_family: Android + browser_family: Opera diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 9ca643dcbe..e22057c437 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -7266,3 +7266,21 @@ model: 7XPRO os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11.1; LU-V78) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36 + os: + name: Android + version: "11.1" + platform: "" + client: + type: browser + name: Chrome + version: 72.0.3626.121 + engine: Blink + engine_version: 72.0.3626.121 + device: + type: tv + brand: LUO + model: V78 + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index a9cbee33d5..cea8ee59d3 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -388,6 +388,8 @@ HTC: - regex: 'NexusHD2' # custom rom for hd2 model: 'HD2' + - regex: '(?:HTC[_ ])?TATTOO[_ ]A3288' + model: 'Tattoo A3288' - regex: 'HTC[ _-]P715a' device: 'tablet' model: 'P715a' @@ -2316,6 +2318,8 @@ AGM: model: '$1' - regex: 'AGM A9(?:[);/ ]|$)' model: 'A9' + - regex: 'AGM_H_MAX' + model: 'H Max' - regex: 'AGM_H3(?:[);/ ]|$)' model: 'H3' - regex: 'AGM_H5_PRO(?:[);/ ]|$)' @@ -4230,7 +4234,7 @@ Bluegood: # Blackview Blackview: - regex: 'Blackview|(BL8[08]00|BV([24-9]000|8[18]00|[468]900|(5[1589]|9[135689])00|6[12368]00|7100)(?:[ _](?:PRO))?|(?