From 1945d78aa07ef0ebb5982f8f0d60e1d504d7363a Mon Sep 17 00:00:00 2001 From: Alexsandr Tutik Date: Mon, 20 May 2024 17:34:47 +0300 Subject: [PATCH 1/4] feat(device) detect brand Samsung: Galaxy Note 20 5G (SM-N981B), Galaxy F15 5G (SM-E156B), Galaxy A15 5G (SM-S156V) feat(device) detect brand Sky: Elite P55 Max, Elite R55, Elite T8 Plus feat(device) detect brand NUU Mobile: A15 (S6512L) feat(device) detect brand Cricket: Outlast (U680AC) feat(device) detect brand TCL: ION V (T607DL) feat(device) detect brand Realme: V30 (RMX3618) feat(device) detect brand Teclast: P40S, M40 Plus, T40S feat(device) detect brand ONYX BOOX: Faust 6 feat(device) detect brand OPPO: Pad Air 2 (OPD2301) feat(device) detect brand Blow: Platinum Tab 8 4G feat(device) detect brand Pixus: Titan feat(device) detect brand AllDocube: iPlay 50 Mini Pro feat(device) detect brand Digma: Optima 8259C 4G, Optima 1442E 4G feat(device) detect brand Huawei: Pura 70 Ultra (HBP-AL00) feat(device) detect brand FOSSiBOT: F106 Pro feat(device) detect brand Gigaset: GX6 Pro (E940-2849-01) feat(device) detect brand Google: Pixel 4a (5G) (G025I) feat(device) detect brand Skyworth: SWTV-22AE-FHD, SWTV-22AE feat(device) detect brand Polar: P42L31T2CSM feat(device) detect brand PolarLine: 32PL51STC-SM feat(device) detect brand Leff: 28H550T feat(device) detect brand DEXP: 43LF1204 feat(device) detect brand Vityaz: H32H8050CG feat(device) detect brand Erisson: 32LX9000CT feat(device) detect brand Harper: 43F750TS, 85U750TS feat(device) detect brand Hartens: HTY-43FHD06B, HTY-32H06W-VZ, HTY-43F06W-VZ, HTY-32H06B-VZ, HTY-65U11B-VS, HTY-65UHD06B-HA22 feat(device) detect brand BAFF: 32Y STV feat(device) detect brand Asano: 40LF8120T 40.0" --- Tests/fixtures/phablet-1.yml | 36 ++++ Tests/fixtures/smartphone-39.yml | 229 ++++++++++++++++++++++ Tests/fixtures/tablet-11.yml | 198 +++++++++++++++++++ Tests/fixtures/tv-3.yml | 324 +++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 100 ++++++---- 5 files changed, 851 insertions(+), 36 deletions(-) diff --git a/Tests/fixtures/phablet-1.yml b/Tests/fixtures/phablet-1.yml index 503c8aa1a3..41aedcca94 100644 --- a/Tests/fixtures/phablet-1.yml +++ b/Tests/fixtures/phablet-1.yml @@ -4444,3 +4444,39 @@ model: X Fold 3 Pro os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; SM-N981B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.96 YaBrowser/24.4.3.96.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.4.3.96.00 + engine: Blink + engine_version: 122.0.6261.96 + device: + type: phablet + brand: Samsung + model: Galaxy Note 20 5G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 13; SM-F707U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.149 Mobile Safari/537.36 OPR/81.3.4292.78688 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Opera Mobile + version: 81.3.4292.78688 + engine: Blink + engine_version: 122.0.6261.149 + device: + type: smartphone + brand: Samsung + model: Galaxy Z Flip 5G + os_family: Android + browser_family: Opera diff --git a/Tests/fixtures/smartphone-39.yml b/Tests/fixtures/smartphone-39.yml index 10859ccbf9..cae0b6f9fe 100644 --- a/Tests/fixtures/smartphone-39.yml +++ b/Tests/fixtures/smartphone-39.yml @@ -2525,3 +2525,232 @@ model: Buzz 4 Prime os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; Elite P55Max) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 105.0.0.0 + engine: Blink + engine_version: 105.0.0.0 + device: + type: smartphone + brand: Sky + model: Elite P55 Max + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; Elite R55) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.85 + engine: Blink + engine_version: 94.0.4606.85 + device: + type: smartphone + brand: Sky + model: Elite R55 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 13; S6512L Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/123.0.6312.121 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome Webview + version: 123.0.6312.121 + engine: Blink + engine_version: 123.0.6312.121 + device: + type: smartphone + brand: NUU Mobile + model: A15 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 13; U680AC Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.123 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome Webview + version: 124.0.6367.123 + engine: Blink + engine_version: 124.0.6367.123 + device: + type: smartphone + brand: Cricket + model: Outlast + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 14; SM-E156B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.113 Mobile Safari/537.36 OPR/82.2.4342.79505 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Opera Mobile + version: 82.2.4342.79505 + engine: Blink + engine_version: 124.0.6367.113 + device: + type: smartphone + brand: Samsung + model: Galaxy F15 5G + os_family: Android + browser_family: Opera +- + user_agent: 'Mozilla/5.0 (Linux; Android 13; T607DL Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.108 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/462.0.0.47.85;]' + os: + name: Android + version: "13" + platform: "" + client: + type: mobile app + name: Facebook + version: 462.0.0.47.85 + device: + type: smartphone + brand: TCL + model: ION V + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; F106 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.702 YaApp_Android/24.43.1 YaSearchBrowser/24.43.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.43.1 + engine: Blink + engine_version: 122.0.6261.702 + device: + type: smartphone + brand: FOSSiBOT + model: F106 Pro + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 12; G025I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 118.0.0.0 + engine: Blink + engine_version: 118.0.0.0 + device: + type: smartphone + brand: Google + model: Pixel 4a (5G) + os_family: Android +- + user_agent: Mozilla/5.0 (Linux; U; Android 13; en-us; E940-2849-01 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: Gigaset + model: GX6 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 13; TECNO Mobile BG6 Build/TP1A.220624.014) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.123 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 124.0.6367.123 + engine: Blink + engine_version: 124.0.6367.123 + device: + type: smartphone + brand: Tecno Mobile + model: Spark Go (2024) + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; SM-S156V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.308 YaBrowser/24.4.0.308.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "14" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.4.0.308.00 + engine: Blink + engine_version: 122.0.6261.308 + device: + type: smartphone + brand: Samsung + model: Galaxy A15 5G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 12; zh-cn; RMX3618 Build/SP1A.210812.016) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.61 Mobile Safari/537.36 HeyTapBrowser/40.8.20.2 + os: + name: Android + version: "12" + platform: "" + client: + type: mobile app + name: HeyTapBrowser + version: 40.8.20.2 + device: + type: smartphone + brand: Realme + model: V30 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 12; zh-Hans-CN; HBP-AL00 Build/HUAWEIHBP-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 Quark/6.12.0.550 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Quark + version: 6.12.0.550 + engine: Blink + engine_version: 100.0.4896.58 + device: + type: smartphone + brand: Huawei + model: Pura 70 Ultra + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 68af3493fb..92177d2e12 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -4931,3 +4931,201 @@ model: P85T os_family: Android browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 11; Elite T8Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.113 Safari/537.36 OPR/82.2.4342.79505 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Opera + version: 82.2.4342.79505 + engine: Blink + engine_version: 124.0.6367.113 + device: + type: tablet + brand: Sky + model: Elite T8 Plus + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; P40S_EEA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.869 YaSearchBrowser/24.42.1 BroPP/1.0 YaSearchApp/24.42.1 webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.42.1 + engine: Blink + engine_version: 122.0.6261.869 + device: + type: tablet + brand: Teclast + model: P40S + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; FAUST6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4178.0 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 85.0.4178.0 + engine: Blink + engine_version: 85.0.4178.0 + device: + type: tablet + brand: ONYX BOOX + model: Faust 6 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 13; Pixus_Titan) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.113 Safari/537.36 OPR/82.2.4342.79505 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Opera + version: 82.2.4342.79505 + engine: Blink + engine_version: 124.0.6367.113 + device: + type: tablet + brand: Pixus + model: Titan + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 12; Optima 8259C 4G TS8286PL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.113 Safari/537.36 OPR/82.2.4342.79505 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Opera + version: 82.2.4342.79505 + engine: Blink + engine_version: 124.0.6367.113 + device: + type: tablet + brand: Digma + model: Optima 8259C 4G + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 13; iPlay 50 mini Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.113 Safari/537.36 OPR/82.2.4342.79505 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Opera + version: 82.2.4342.79505 + engine: Blink + engine_version: 124.0.6367.113 + device: + type: tablet + brand: AllDocube + model: iPlay 50 Mini Pro + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; Optima 1442E 4G TS1290PL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.6099.109 YaBrowser/24.1.2.109.01 Safari/537.36 + os: + name: Android + version: "12" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.1.2.109.01 + engine: Blink + engine_version: 120.0.6099.109 + device: + type: tablet + brand: Digma + model: Optima 1442E 4G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; M40_Plus_EEA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.645 YaSearchBrowser/24.44/apad BroPP/1.0 YaSearchApp/24.44/apad webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: ARM + client: + type: browser + name: Yandex Browser + version: "24.44" + engine: Blink + engine_version: 122.0.6261.645 + device: + type: tablet + brand: Teclast + model: M40 Plus + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; T40S_EEA) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.869 YaSearchBrowser/24.42/apad BroPP/1.0 YaSearchApp/24.42/apad webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: ARM + client: + type: browser + name: Yandex Browser + version: "24.42" + engine: Blink + engine_version: 122.0.6261.869 + device: + type: tablet + brand: Teclast + model: T40S + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; PlatinumTAB8_4G Build/RP1A.201005.001) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.123 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome + version: 124.0.6367.123 + engine: Blink + engine_version: 124.0.6367.123 + device: + type: tablet + brand: Blow + model: Platinum Tab 8 4G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 13; OPD2301) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.70 Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome + version: 97.0.4692.70 + engine: Blink + engine_version: 97.0.4692.70 + device: + type: tablet + brand: OPPO + model: Pad Air 2 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tv-3.yml b/Tests/fixtures/tv-3.yml index d1f88c0d7f..02059cf7e9 100644 --- a/Tests/fixtures/tv-3.yml +++ b/Tests/fixtures/tv-3.yml @@ -5889,3 +5889,327 @@ model: 43SA701 os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; SWTV-22AE-FHD Build/RTM4.220307.154; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.123 YaBrowser/24.1.2.87 (lite) TV Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.1.2.87 + engine: Blink + engine_version: 124.0.6367.123 + device: + type: tv + brand: Skyworth + model: SWTV-22AE-FHD + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; P42L31T2CSM Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/109.0.5414.117 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Webview + version: 109.0.5414.117 + engine: Blink + engine_version: 109.0.5414.117 + device: + type: tv + brand: Polar + model: P42L31T2CSM + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; POLARLINE_WK_32PL51STC-SM Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.120 YaBrowser/23.1.0.39 (lite) Safari/537.36 TV + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 23.1.0.39 + engine: Blink + engine_version: 83.0.4103.120 + device: + type: tv + brand: PolarLine + model: 32PL51STC-SM + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; 28H550T Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/104.0.5112.102 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 104.0.5112.102 + engine: Blink + engine_version: 104.0.5112.102 + device: + type: tv + brand: Leff + model: 28H550T + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; 43F750TS Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/104.0.5112.102 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 104.0.5112.102 + engine: Blink + engine_version: 104.0.5112.102 + device: + type: tv + brand: Harper + model: 43F750TS + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; BAFF32YSTV Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/109.0.5414.117 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: 109.0.5414.117 + device: + type: tv + brand: BAFF + model: 32Y STV + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; SWTV-22AE Build/RTT2.220103.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.123 YaBrowser/24.1.2.87 (lite) TV Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.1.2.87 + engine: Blink + engine_version: 124.0.6367.123 + device: + type: tv + brand: Skyworth + model: SWTV-22AE + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; 43LF1204) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.87 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome + version: 98.0.4758.87 + engine: Blink + engine_version: 98.0.4758.87 + device: + type: tv + brand: Vityaz + model: 43LF1204 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; 85U750TS 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: Harper + model: 85U750TS + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; 40LF8120T Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/109.0.5414.117 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: 109.0.5414.117 + device: + type: tv + brand: Asano + model: 40LF8120T 40.0" + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; HTY_43FHD06B Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/109.0.5414.117 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Webview + version: 109.0.5414.117 + engine: Blink + engine_version: 109.0.5414.117 + device: + type: tv + brand: Hartens + model: HTY-43FHD06B + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; HTY-32H06W-VZ Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/109.0.5414.117 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: 109.0.5414.117 + device: + type: tv + brand: Hartens + model: HTY-32H06W-VZ + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; HTY-43F06W-VZ Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.120 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: 83.0.4103.120 + device: + type: tv + brand: Hartens + model: HTY-43F06W-VZ + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; H32H8050CG Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/109.0.5414.117 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: 109.0.5414.117 + device: + type: tv + brand: DEXP + model: H32H8050CG + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; HTY-32H06B-VZ Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/104.0.5112.102 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 104.0.5112.102 + engine: Blink + engine_version: 104.0.5112.102 + device: + type: tv + brand: Hartens + model: HTY-32H06B-VZ + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; HTY-65U11B-VS Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/112.0.5615.136 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Webview + version: 112.0.5615.136 + engine: Blink + engine_version: 112.0.5615.136 + device: + type: tv + brand: Hartens + model: HTY-65U11B-VS + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; HTY-65UHD06B-HA22 Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/109.0.5414.117 YaBrowser/23.1.0.73 (lite) TV Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 23.1.0.73 + engine: Blink + engine_version: 109.0.5414.117 + device: + type: tv + brand: Hartens + model: HTY-65UHD06B-HA22 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; 32LX9000CT Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.120 YaBrowser/23.1.0.39 (lite) Safari/537.36 TV + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 23.1.0.39 + engine: Blink + engine_version: 83.0.4103.120 + device: + type: tv + brand: Erisson + model: 32LX9000CT + os_family: Android + browser_family: Unknown diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index c81961efa4..d5eb236ff7 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -6328,11 +6328,13 @@ Cosmote: # Cricket Cricket: - regex: 'Cricket-([a-z0-9]+)|(?:U304AC|U325AC|U705AC|V350C|EC1002|EC21100[1-4]|SL100EA|SL101AE|WTCKT01|SL112C)(?:[);/ ]|$)' + regex: 'Cricket-([a-z0-9]+)|(?:U304AC|U325AC|U680AC|U705AC|V350C|EC1002|EC21100[1-4]|SL100EA|SL101AE|WTCKT01|SL112C)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'SL101AE' model: 'Debut Smart' + - regex: 'U680AC' + model: 'Outlast' - regex: 'EC211001' model: 'Dream 5G' - regex: 'U304AC' @@ -6450,7 +6452,7 @@ AllDocube: model: 'X' - regex: 'T806MHE?' model: 'iPlay 8 Pro' - - regex: 'iPlay50_mini_Pro' + - regex: 'iPlay[_ ]?50[_ ]mini[_ ]Pro' model: 'iPlay 50 Mini Pro' - regex: 'iPlay50 Pro' model: 'iPlay 50 Pro' @@ -6822,7 +6824,7 @@ Desay: # DEXP (dexp.club) DEXP: - regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/)]+)|H135[ _]Build|Larus_TV1|Ixion(?:ML4\.7|ES250)|M150Storm|(?:SENIOR|F4[38]D8000K|VA(?:[12]10|170)|ML450|MS[56]50|BL(?:[123]50|160|155)|BS(?:155|160|[1256]50)|(? Date: Mon, 20 May 2024 17:43:58 +0300 Subject: [PATCH 2/4] feat(device) detect brand ONYX BOOX: Living Stone 3 feat(device) detect brand Hartens: HTY-65UHDO6B-HK22, HTY-43U11S-VD, HTY-43FHDO6B-HK22 feat(device) detect brand Hi: VHIX-50U169MSY --- Tests/fixtures/tablet-11.yml | 18 +++++++++ Tests/fixtures/tv-3.yml | 72 ++++++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 10 ++--- 3 files changed, 95 insertions(+), 5 deletions(-) diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 92177d2e12..577ba298a2 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -5129,3 +5129,21 @@ model: Pad Air 2 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; LIVINGSTONE3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4178.0 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome + version: 85.0.4178.0 + engine: Blink + engine_version: 85.0.4178.0 + device: + type: tablet + brand: ONYX BOOX + model: Living Stone 3 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tv-3.yml b/Tests/fixtures/tv-3.yml index 02059cf7e9..ab9c715b03 100644 --- a/Tests/fixtures/tv-3.yml +++ b/Tests/fixtures/tv-3.yml @@ -6213,3 +6213,75 @@ model: 32LX9000CT os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; HTY-65UHDO6B-HK22 Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/109.0.5414.117 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: 109.0.5414.117 + device: + type: tv + brand: Hartens + model: HTY-65UHDO6B-HK22 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; VHIX-50U169MSY Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/112.0.5615.136 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: 112.0.5615.136 + device: + type: tv + brand: Hi + model: VHIX-50U169MSY + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; HTY-43U11S-VD Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/112.0.5615.136 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Webview + version: 112.0.5615.136 + engine: Blink + engine_version: 112.0.5615.136 + device: + type: tv + brand: Hartens + model: HTY-43U11S-VD + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; HTY-43FHDO6B-HK22 Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/104.0.5112.102 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 104.0.5112.102 + engine: Blink + engine_version: 104.0.5112.102 + device: + type: tv + brand: Hartens + model: HTY-43FHDO6B-HK22 + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index d5eb236ff7..cb7bf5a626 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -34965,7 +34965,7 @@ LT Mobile: # ONYX BOOX (onyx-boox.ru) ONYX BOOX: - regex: '(?:KON_TIKI(2)?|Nova3Color|Lomonosov|Poke2Color|NovaAirC|NoteAir2P?|LIVINGSTONE2|MC_FAUST[23]|DARWIN[9X]|MC_DARWIN[678]|MC_GAMA4|MC_Cristo4|MC_NovaPro|NoteAir3C|VOLTA4|Kon_Tiki3|FAUST6)(?:[);/ ]|$)' + regex: '(?:KON_TIKI(2)?|Nova3Color|Lomonosov|Poke2Color|NovaAirC|NoteAir2P?|LIVINGSTONE[23]|MC_FAUST[23]|DARWIN[9X]|MC_DARWIN[678]|MC_GAMA4|MC_Cristo4|MC_NovaPro|NoteAir3C|VOLTA4|Kon_Tiki3|FAUST6)(?:[);/ ]|$)' device: 'tablet' models: - regex: 'VOLTA4' @@ -34994,8 +34994,8 @@ ONYX BOOX: model: 'Gama 4' - regex: 'MC_Cristo4' model: 'Monte Cristo 4' - - regex: 'LIVINGSTONE2' - model: 'Living Stone 2' + - regex: 'LIVINGSTONE([23])' + model: 'Living Stone $1' - regex: 'NoteAir3C' model: 'Note Air 3C' @@ -38376,12 +38376,12 @@ Hiberg: # Hartens Hartens: - regex: '(HTY[_-]\d{2}\w+-(?:S2|H[AC]22|S2-T9|V[NZS])|HTY-32HDR06G|HTY_43FHD06B|HTY-43F06B-VZ|HTY-24H06W-VZ)(?:[);/ ]|$)' + regex: '(HTY[_-]\d{2}\w+-(?:S2|H[ACK]22|S2-T9|V[DNZS])|HTY-32HDR06G|HTY_43FHD06B|HTY-43F06B-VZ|HTY-24H06W-VZ)(?:[);/ ]|$)' device: 'tv' models: - regex: 'HTY_(43FHD06B)' model: 'HTY-$1' - - regex: '(HTY-\d{2}\w+-(?:S2|H[AC]22|S2-T9|V[NZS])|HTY-32HDR06G|HTY-43F06B-VZ|HTY-24H06W-VZ)' + - regex: '(HTY-\d{2}\w+-(?:S2|H[ACK]22|S2-T9|V[DNZS])|HTY-32HDR06G|HTY-43F06B-VZ|HTY-24H06W-VZ)' model: '$1' # AMA From 8f12f9afd1fc60283436140c5e9ba74967d37c67 Mon Sep 17 00:00:00 2001 From: Alexsandr Tutik Date: Tue, 21 May 2024 12:10:42 +0300 Subject: [PATCH 3/4] feat(device) detect brand Hytera: PNC560 feat(device) detect brand OPPO: Find N2 (CPH2439) feat(device) detect brand Walton: Orbit Y70 feat(device) detect brand OnePlus: Nord CE 4 (CPH2613) feat(device) detect brand LG: Ultra Tab (10A30Q) feat(device) detect brand Teclast: P40S, M40 Plus feat(device) detect brand Telefunken: TF-LED43S97T2SU, feat(device) detect brand Starwind: SW-LED32SG311 feat(device) detect brand Hartens: HTY-50U11B-VS --- Tests/fixtures/peripheral.yml | 18 +++++++++++ Tests/fixtures/smartphone-39.yml | 55 ++++++++++++++++++++++++++++++++ Tests/fixtures/tablet-11.yml | 54 +++++++++++++++++++++++++++++++ Tests/fixtures/tv-3.yml | 54 +++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 33 ++++++++++--------- 5 files changed, 199 insertions(+), 15 deletions(-) diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml index 10c3d37735..91cf4a8d33 100644 --- a/Tests/fixtures/peripheral.yml +++ b/Tests/fixtures/peripheral.yml @@ -1360,3 +1360,21 @@ model: Xiaoxin 100 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; PNC560) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.94 YaBrowser/24.4.4.94.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: ARM + client: + type: browser + name: Yandex Browser + version: 24.4.4.94.00 + engine: Blink + engine_version: 122.0.6261.94 + device: + type: peripheral + brand: Hytera + model: PNC560 + os_family: Android + browser_family: Unknown diff --git a/Tests/fixtures/smartphone-39.yml b/Tests/fixtures/smartphone-39.yml index cae0b6f9fe..d65d78d2d3 100644 --- a/Tests/fixtures/smartphone-39.yml +++ b/Tests/fixtures/smartphone-39.yml @@ -2666,6 +2666,7 @@ brand: Google model: Pixel 4a (5G) os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; U; Android 13; en-us; E940-2849-01 Build/JOP24G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.111 Mobile Safari/537.36 os: @@ -2754,3 +2755,57 @@ model: Pura 70 Ultra os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; CPH2439) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.113 Mobile Safari/537.36 OPR/82.2.4342.79505 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Opera Mobile + version: 82.2.4342.79505 + engine: Blink + engine_version: 124.0.6367.113 + device: + type: smartphone + brand: OPPO + model: Find N2 + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 13; ORBIT Y70) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.113 Mobile Safari/537.36 OPR/82.2.4342.79505 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Opera Mobile + version: 82.2.4342.79505 + engine: Blink + engine_version: 124.0.6367.113 + device: + type: smartphone + brand: Walton + model: Orbit Y70 + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 14; CPH2613) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.113 Mobile Safari/537.36 OPR/82.2.4342.79505 + os: + name: Android + version: "14" + platform: "" + client: + type: browser + name: Opera Mobile + version: 82.2.4342.79505 + engine: Blink + engine_version: 124.0.6367.113 + device: + type: smartphone + brand: OnePlus + model: Nord CE 4 + os_family: Android + browser_family: Opera diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 577ba298a2..d1d2bc26a0 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -5147,3 +5147,57 @@ model: Living Stone 3 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 12; 10A30Q Build/SKQ1.220213.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.123 Safari/537.36 OPR/80.0.2254.71401 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Opera + version: 80.0.2254.71401 + engine: Blink + engine_version: 124.0.6367.123 + device: + type: tablet + brand: LG + model: Ultra Tab + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; P40S_ROW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.645 YaSearchBrowser/24.44/apad BroPP/1.0 YaSearchApp/24.44/apad webOmni SA/3 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: ARM + client: + type: browser + name: Yandex Browser + version: "24.44" + engine: Blink + engine_version: 122.0.6261.645 + device: + type: tablet + brand: Teclast + model: P40S + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; M40Plus_ROW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.702 YaApp_Android/24.43/apad YaSearchBrowser/24.43/apad BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: ARM + client: + type: browser + name: Yandex Browser + version: "24.43" + engine: Blink + engine_version: 122.0.6261.702 + device: + type: tablet + brand: Teclast + model: M40 Plus + os_family: Android + browser_family: Unknown diff --git a/Tests/fixtures/tv-3.yml b/Tests/fixtures/tv-3.yml index ab9c715b03..34da5ca67a 100644 --- a/Tests/fixtures/tv-3.yml +++ b/Tests/fixtures/tv-3.yml @@ -6285,3 +6285,57 @@ model: HTY-43FHDO6B-HK22 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; arm; Android 11; TF-LED43S97T2SU Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/104.0.5112.102 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: ARM + client: + type: browser + name: Chrome Webview + version: 104.0.5112.102 + engine: Blink + engine_version: 104.0.5112.102 + device: + type: tv + brand: Telefunken + model: TF-LED43S97T2SU + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; SW-LED32SG311 Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/109.0.5414.117 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: 109.0.5414.117 + device: + type: tv + brand: Starwind + model: SW-LED32SG311 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 11; HTY-50U11B-VS Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/112.0.5615.136 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Webview + version: 112.0.5615.136 + engine: Blink + engine_version: 112.0.5615.136 + device: + type: tv + brand: Hartens + model: HTY-50U11B-VS + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index cb7bf5a626..bacf583434 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -14968,7 +14968,7 @@ Vargo: # LG or LGE (lg.com) LG: - regex: '(? Date: Tue, 21 May 2024 12:49:09 +0300 Subject: [PATCH 4/4] fix: M40 Plus regex --- regexes/device/mobiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index bacf583434..b478e6f4d1 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -24404,7 +24404,7 @@ Teclast: model: 'M40 Plus' - regex: 'M40S[_ ](?:ROW|EEA|RUS)' model: 'M40S' - - regex: 'M40 Plus|M40Plus_ + - regex: 'M40 Plus|M40Plus_' model: 'M40 Plus' - regex: 'T40 ?PRO' model: 'T40 Pro'