From 8c2166d72994171b43c60757197dc8130b2cda14 Mon Sep 17 00:00:00 2001 From: sanchezzzhak Date: Fri, 24 Feb 2023 13:29:54 +0300 Subject: [PATCH 1/6] feat(bot) detect Cloudflare Health Checks bot --- Tests/fixtures/bots.yml | 9 +++++++++ regexes/bots.yml | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/Tests/fixtures/bots.yml b/Tests/fixtures/bots.yml index 06ae5c9a01..74818fd2b9 100644 --- a/Tests/fixtures/bots.yml +++ b/Tests/fixtures/bots.yml @@ -5473,3 +5473,12 @@ name: GumGum Verity category: Service Agent url: https://gumgum.com/verity +- + user_agent: 'Mozilla/5.0 (compatible;Cloudflare-Healthchecks/1.0;+https://www.cloudflare.com/; healthcheck-id: e645d1e65d3b18b4)' + bot: + name: Cloudflare Health Checks + category: Service Agent + url: https://developers.cloudflare.com/health-checks/ + producer: + name: CloudFlare + url: http://www.cloudflare.com diff --git a/regexes/bots.yml b/regexes/bots.yml index 93f671fba0..4cf9269c0a 100644 --- a/regexes/bots.yml +++ b/regexes/bots.yml @@ -13,6 +13,14 @@ name: 'Plesk International GmbH' url: 'https://www.plesk.com' +- regex: 'Cloudflare-Healthchecks' + name: 'Cloudflare Health Checks' + category: 'Service Agent' + url: 'https://developers.cloudflare.com/health-checks/' + producer: + name: 'CloudFlare' + url: 'http://www.cloudflare.com' + - regex: '360Spider' name: '360Spider' category: 'Search bot' From 1818df19cd1afd1ae2b2bc05e86527792ded8890 Mon Sep 17 00:00:00 2001 From: sanchezzzhak Date: Fri, 24 Feb 2023 15:11:17 +0300 Subject: [PATCH 2/6] feat(device) detect brand HTC: Desire 320 (v01), One Mini (PO582), One (PN071), One Mini 2 (M8MINx), One E8 (M8Sx) --- Tests/fixtures/smartphone-35.yml | 163 +++++++++++++++++++++++++++++++ Tests/fixtures/tablet-9.yml | 18 ++++ regexes/device/mobiles.yml | 10 +- 3 files changed, 188 insertions(+), 3 deletions(-) create mode 100644 Tests/fixtures/smartphone-35.yml diff --git a/Tests/fixtures/smartphone-35.yml b/Tests/fixtures/smartphone-35.yml new file mode 100644 index 0000000000..893a31bf86 --- /dev/null +++ b/Tests/fixtures/smartphone-35.yml @@ -0,0 +1,163 @@ +--- +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.4; TCL M2U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36 + os: + name: Android + version: 4.4.4 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 81.0.4044.138 + engine: Blink + engine_version: 81.0.4044.138 + device: + type: smartphone + brand: TCL + model: M2U + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; IM-A930S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.96 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 78.0.3904.96 + engine: Blink + engine_version: 78.0.3904.96 + device: + type: smartphone + brand: Pantech + model: IM-A930S + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; HUAWEI MT2-L05) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 81.0.4044.138 + engine: Blink + engine_version: 81.0.4044.138 + device: + type: phablet + brand: Huawei + model: Ascend Mate 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; htc_v01) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.119 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.119 + engine: Blink + engine_version: 80.0.3987.119 + device: + type: smartphone + brand: HTC + model: Desire 320 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; HTC_PO582) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.162 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.162 + engine: Blink + engine_version: 80.0.3987.162 + device: + type: smartphone + brand: HTC + model: One Mini + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; HTC_PN071) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 79.0.3945.93 + engine: Blink + engine_version: 79.0.3945.93 + device: + type: smartphone + brand: HTC + model: One + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; HTC_One_mini_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.132 + engine: Blink + engine_version: 80.0.3987.132 + device: + type: smartphone + brand: HTC + model: One Mini 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; HTC_M8Sx) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.149 + engine: Blink + engine_version: 80.0.3987.149 + device: + type: smartphone + brand: HTC + model: One E8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; HTC_M8MINx) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36 + os: + name: Android + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 81.0.4044.138 + engine: Blink + engine_version: 81.0.4044.138 + device: + type: smartphone + brand: HTC + model: One Mini 2 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 1b372fab3a..413b077e62 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -4333,3 +4333,21 @@ model: EverPad DC-1545 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.2.2; ViewPad 8E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Safari/537.36 + os: + name: Android + version: 4.2.2 + platform: "" + client: + type: browser + name: Chrome + version: 70.0.3538.80 + engine: Blink + engine_version: 70.0.3538.80 + device: + type: tablet + brand: ViewSonic + model: ViewPad 8E + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 4ceff989b2..1ed530b34d 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -246,11 +246,13 @@ HTC: model: 'Evo 4G' - regex: '(?:HTC[_ ])?(?:HTV33|601HT|2PZC100|2PZC5|U-3[uw])(?:[);/ ]|$)' model: 'U11' - - regex: '(?:801e|802[wdt])' + - regex: '(?:HTC_)?(?:801e|802[wdt]|PN071)' model: 'One' - regex: 'PJ83100(?:[);/ ]|$)' model: 'One X' - - regex: '(?:HTC)?One ?Mini ?2(?:[);/ ]|$)' + - regex: 'HTC[_ ]PO582(?:[);/ ]|$)' + model: 'One Mini' + - regex: '(?:HTC_?)?(?:One[ _]?Mini[ _]?2|M8MINx)(?:[);/ ]|$)' model: 'One Mini 2' - regex: 'X2-HT(?:[);/ ]|$)' model: 'One X2' @@ -278,7 +280,7 @@ HTC: model: 'One M7' - regex: '(?:One M8|HTC6525LVW|HTC[_ ]M8[xd]|HTC[_ ]0P6B)(?:[);/ ]|$)' model: 'One M8' - - regex: '0PAJ5(?:[);/ ]|$)' + - regex: '(?:HTC_)?(?:0PAJ5|M8Sx)(?:[);/ ]|$)' model: 'One E8' - regex: 'HTC[_ ]E9x(?:[);/ ]|$)' model: 'One E9' @@ -318,6 +320,8 @@ HTC: model: 'Desire 530' - regex: 'HTC[_ ]D310n(?:[);/ ]|$)' model: 'Desire 310' + - regex: 'HTC[_ ]v01(?:[);/ ]|$)' + model: 'Desire 320' - regex: '608t(?:[);/ ]|$)' model: 'Desire 608t' - regex: 'HTC_(?:0P9O2|D610x)(?:[);/ ]|$)' From 6eba77b6d64308a229b52e4379a0f75ecbc4b0b0 Mon Sep 17 00:00:00 2001 From: sanchezzzhak Date: Mon, 27 Feb 2023 12:29:37 +0300 Subject: [PATCH 3/6] feat(device) detect new brand NuVision: TM800A620M, TM101A620M feat(device) detect brand Condor: TMK715L feat(device) detect brand Karbonn: Titanium Vista 4G feat(device) detect brand Ulefone: Tiger Lite feat(device) detect brand Cloudfone: Thrill Boost, Thrill HD feat(device) detect brand ThL: T9+, T9 Pro, T9 Plus --- Parser/Device/AbstractDeviceParser.php | 1 + Tests/fixtures/smartphone-35.yml | 126 +++++++++++++++++++++++++ Tests/fixtures/tablet-9.yml | 54 +++++++++++ regexes/device/mobiles.yml | 28 ++++-- 4 files changed, 201 insertions(+), 8 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 2f230fb4df..d366187e3b 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1029,6 +1029,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'NJ' => 'NuAns', 'NL' => 'NUU Mobile', 'N0' => 'Nuvo', + 'NUV' => 'NuVision', 'NV' => 'Nvidia', 'NY' => 'NYX Mobile', 'O3' => 'O+', diff --git a/Tests/fixtures/smartphone-35.yml b/Tests/fixtures/smartphone-35.yml index 893a31bf86..f10fe670b5 100644 --- a/Tests/fixtures/smartphone-35.yml +++ b/Tests/fixtures/smartphone-35.yml @@ -161,3 +161,129 @@ model: One Mini 2 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Titanium Vista) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 74.0.3729.157 + engine: Blink + engine_version: 74.0.3729.157 + device: + type: smartphone + brand: Karbonn + model: Titanium Vista 4G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Tiger_lite) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.99 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 86.0.4240.99 + engine: Blink + engine_version: 86.0.4240.99 + device: + type: smartphone + brand: Ulefone + model: Tiger Lite + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Thrill_Boost) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.116 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 79.0.3945.116 + engine: Blink + engine_version: 79.0.3945.116 + device: + type: smartphone + brand: Cloudfone + model: Thrill Boost + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Thrill HD) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.89 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 84.0.4147.89 + engine: Blink + engine_version: 84.0.4147.89 + device: + type: smartphone + brand: Cloudfone + model: Thrill HD + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; thl T9+) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.99 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.99 + engine: Blink + engine_version: 80.0.3987.99 + device: + type: smartphone + brand: ThL + model: T9+ + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; thl T9 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.87 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 97.0.4692.87 + engine: Blink + engine_version: 97.0.4692.87 + device: + type: smartphone + brand: ThL + model: T9 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; thl T9 Plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 81.0.4044.138 + engine: Blink + engine_version: 81.0.4044.138 + device: + type: smartphone + brand: ThL + model: T9 Plus + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 413b077e62..9dd14e14a5 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -4351,3 +4351,57 @@ model: ViewPad 8E os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; TMK715L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.111 Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome + version: 81.0.4044.111 + engine: Blink + engine_version: 81.0.4044.111 + device: + type: tablet + brand: Condor + model: TMK715L + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; TM800A620M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.117 Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome + version: 81.0.4044.117 + engine: Blink + engine_version: 81.0.4044.117 + device: + type: tablet + brand: NuVision + model: TM800A620M + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; TM101A620M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.92 Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome + version: 96.0.4664.92 + engine: Blink + engine_version: 96.0.4664.92 + device: + type: tablet + brand: NuVision + model: TM101A620M + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 1ed530b34d..fa5d63151e 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -5612,7 +5612,7 @@ ConCorde: # Condor (www.condor.dz) Condor: - regex: 'Allure (?:A55 Slim|M[123]|X)|Griffe T[235-9]|TFX712G|TRA-901G|TGW[-]?(710G|709|102L|801[GL])|(?:PGN\-?[456][012][0-9]|PHS\-601|PHQ519|PAM412|PHQ52[056]|TB105L|TB717G|PKT\-301|Plume (?:H1|L[1-68]|P8|P6 PRO LTE)|Infinity E5|Infinity a4|Infinity_i[45]|PKT411)(?:[);/ ]|$)|CTAB[^/;]+ Build' + regex: 'Allure (?:A55 Slim|M[123]|X)|Griffe T[235-9]|TFX712G|TMK715L|TRA-901G|TGW[-]?(710G|709|102L|801[GL])|(?:PGN\-?[456][012][0-9]|PHS\-601|PHQ519|PAM412|PHQ52[056]|TB105L|TB717G|PKT\-301|Plume (?:H1|L[1-68]|P8|P6 PRO LTE)|Infinity E5|Infinity a4|Infinity_i[45]|PKT411)(?:[);/ ]|$)|CTAB[^/;]+ Build' device: 'smartphone' models: - regex: 'CTAB([^/;]+) Build' @@ -5621,7 +5621,7 @@ Condor: - regex: '(TGW)-?(710G|709|801[GL]|102L)(?:[);/ ]|$)' device: 'tablet' model: '$1 $2' - - regex: '(TFX712G|TB105L|TB717G)(?:[);/ ]|$)' + - regex: '(TFX712G|TB105L|TB717G|TMK715L)(?:[);/ ]|$)' device: 'tablet' model: '$1' - regex: '(TRA)-(901G)(?:[);/ ]|$)' @@ -14327,7 +14327,7 @@ K-Lite: # Karbonn (karbonnmobiles.com) Karbonn: - regex: '(?:Browser-)?Karbonn|K9 Kavach 4G|K9[_ ](?:Viraat|Smart)[_ ]Plus|K9 Music 4G|K9 Smart|K9 VIRAAT 4G|Aura (?:Sleek Plus|Power 4G Plus|Note Play|Note 2)|Titanium[ _](?:3D-Plex|Octane Plus|Vista 4G|Jumbo|S360|S1[059]|S35|S20[13]|S22|S[15]|S200 HD|Frames S7|MOGHUL|S9)|MACHFIVE|MACHONE|Sparkle V|Alfa A114 Quad|Quattro[ _]L(?:45|5[025])[ _](?:HD|IPS|VR)|A(?:9|4[05])[ _]Indian|S2052GB|MACH SIX VR|K-Lite F3' + regex: '(?:Browser-)?Karbonn|K9 Kavach 4G|K9[_ ](?:Viraat|Smart)[_ ]Plus|K9 Music 4G|K9 Smart|K9 VIRAAT 4G|Aura (?:Sleek Plus|Power 4G Plus|Note Play|Note 2)|Titanium[ _](?:3D-Plex|Octane Plus|Vista 4G|Jumbo|S360|S1[059]|S35|S20[13]|S22|S[15]|S200 HD|Frames S7|MOGHUL|S9)|MACHFIVE|MACHONE|Sparkle V|Alfa A114 Quad|Quattro[ _]L(?:45|5[025])[ _](?:HD|IPS|VR)|A(?:9|4[05])[ _]Indian|S2052GB|MACH SIX VR|K-Lite F3|Titanium Vista' device: 'smartphone' models: - regex: 'K9 Kavach 4G' @@ -14380,7 +14380,7 @@ Karbonn: model: 'Titanium S$1 Plus' - regex: 'Titanium[_ ]S(99|360|1[059]|109|35|200 HD|20[13]|22|[15])(?:[);/ ]|$)' model: 'Titanium S$1' - - regex: 'Titanium Vista 4G' + - regex: 'Titanium Vista(?: 4G)?' model: 'Titanium Vista 4G' - regex: 'Titanium Jumbo 2' model: 'Titanium Jumbo 2' @@ -22725,7 +22725,7 @@ ThL: model: '$1' - regex: '(T200)(?:[);/ ]|$)' model: '$1' - - regex: 'ThL[ _-]*([^;/]+) Build' + - regex: 'ThL[ _-]*([^;/)]+)(?: Build|[;)])' model: '$1' - regex: 'ThL[ _-]*([^ ;/)]+)(?:[);/ ]|$)' model: '$1' @@ -22927,7 +22927,7 @@ UTStarcom: # Ulefone (ulefone.com or ulefone.ru) Ulefone: - regex: 'Ulefone|Gemini Pro|Power Armor14|Power 3S|Power_[356]|Power_5S|S(?:10|9)_Pro|(?:Note [89]P|Note 1[23]P|Armor(?:[ _](?:[2367]|2S|X[236]|6[SE]|3WT|3W|X))?|U00[78][ _]Pro|Be[ _]X|Be[ _]Touch(?:[ _][23])?|Be[ _](?:One|Pure)(?:[ _]Lite)?|Note (?:11P|7T)|Note_7P|Paris_(?:Lite|X)|P6000_Plus|Vienna|Android 11;(?: [\w-]+;)? Note 6)(?:[);/ ]|$)' + regex: 'Ulefone|Gemini Pro|Power Armor14|Power 3S|Power_[356]|Power_5S|S(?:10|9)_Pro|(?:Note [89]P|Note 1[23]P|Armor(?:[ _](?:[2367]|2S|X[236]|6[SE]|3WT|3W|X))?|U00[78][ _]Pro|Be[ _]X|Be[ _]Touch(?:[ _][23])?|Be[ _](?:One|Pure)(?:[ _]Lite)?|Note (?:11P|7T)|Tiger_lite|Note_7P|Paris_(?:Lite|X)|P6000_Plus|Vienna|Android 11;(?: [\w-]+;)? Note 6)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'S(10|9)_Pro' @@ -22952,6 +22952,8 @@ Ulefone: model: 'Paris Lite' - regex: 'Paris_X' model: 'Paris X' + - regex: 'Tiger_lite' + model: 'Tiger Lite' - regex: 'Power Armor (\d+)(?:[);/ ]|$)' model: 'Power Armor $1' - regex: 'Power Armor ?14 Pro' @@ -28823,14 +28825,14 @@ Cloudpad: # Cloudfone Cloudfone: - regex: 'CloudFone[ _]|(?:Thrill (?:Boost[ ]?(2|3)?|Power|Snap|Access|Plus 16GB)|Excite Prime 2 Pro|Excite Prime|ExciteC|NBA Edition|Go SP|Next Infinity Plus|Next Infinity|Go Connect)(?:[);/ ]|$)' + regex: 'CloudFone[ _]|(?:Thrill[ _](?:Boost[ ]?(2|3)?|Power|Snap|Access|Plus 16GB|Lite|HD)|Excite Prime 2 Pro|Excite Prime|ExciteC|NBA Edition|Go SP|Next Infinity Plus|Next Infinity|Go Connect)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'Thrill Boost 2 Plus(?:[);/ ]|$)' model: 'Thrill Boost 2 Plus' - regex: 'Thrill Boost (2|3)(?:[);/ ]|$)' model: 'Thrill Boost $1' - - regex: 'Thrill Boost(?:[);/ ]|$)' + - regex: 'Thrill[ _]Boost(?:[);/ ]|$)' model: 'Thrill Boost' - regex: 'Thrill Snap(?:[);/ ]|$)' model: 'Thrill Snap' @@ -28840,6 +28842,10 @@ Cloudfone: model: 'Thrill Power' - regex: 'Thrill Access(?:[);/ ]|$)' model: 'Thrill Access' + - regex: 'Thrill Lite(?:[);/ ]|$)' + model: 'Thrill Lite' + - regex: 'Thrill HD(?:[);/ ]|$)' + model: 'Thrill HD' - regex: 'Excite Prime 2 Pro' model: 'Excite Prime 2 Pro' - regex: 'Excite Prime 2' @@ -35249,6 +35255,12 @@ DIMO: device: 'tablet' model: '$1' +# NuVision +NuVision: + regex: '(TM800A620M|TM101A620M)(?:[);/ ]|$)' + device: 'tablet' + model: '$1' + # SANY SANY: regex: 'SANY V8' From 026e7620e703fef4b79dba635311cd7f800d7344 Mon Sep 17 00:00:00 2001 From: sanchezzzhak Date: Mon, 27 Feb 2023 14:52:10 +0300 Subject: [PATCH 4/6] feat(device) detect brand Telenor: Smart 4G feat(device) detect brand TWZ: OX X1 feat(device) detect brand Condor: TFX711G, TFX714L, TFX713L --- Tests/fixtures/smartphone-35.yml | 126 +++++++++++++++++++++++++++++++ Tests/fixtures/tablet-9.yml | 54 +++++++++++++ regexes/device/mobiles.yml | 10 ++- 3 files changed, 186 insertions(+), 4 deletions(-) diff --git a/Tests/fixtures/smartphone-35.yml b/Tests/fixtures/smartphone-35.yml index f10fe670b5..50102e4144 100644 --- a/Tests/fixtures/smartphone-35.yml +++ b/Tests/fixtures/smartphone-35.yml @@ -287,3 +287,129 @@ model: T9 Plus os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Telenor_Smart_4G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.101 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 83.0.4103.101 + engine: Blink + engine_version: 83.0.4103.101 + device: + type: smartphone + brand: Telenor + model: Smart 4G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; TECNO-N9S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.101 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 87.0.4280.101 + engine: Blink + engine_version: 87.0.4280.101 + device: + type: smartphone + brand: Tecno Mobile + model: N9S + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; TECNO-N9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 87.0.4280.141 + engine: Blink + engine_version: 87.0.4280.141 + device: + type: smartphone + brand: Tecno Mobile + model: N9 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; TECNO-N8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 74.0.3729.157 + engine: Blink + engine_version: 74.0.3729.157 + device: + type: smartphone + brand: Tecno Mobile + model: N8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; TECNO-N6S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.116 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 79.0.3945.116 + engine: Blink + engine_version: 79.0.3945.116 + device: + type: smartphone + brand: Tecno Mobile + model: N6S + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; TECNO-N6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.89 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 84.0.4147.89 + engine: Blink + engine_version: 84.0.4147.89 + device: + type: smartphone + brand: Tecno Mobile + model: N6 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; OX_X1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.162 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 80.0.3987.162 + engine: Blink + engine_version: 80.0.3987.162 + device: + type: smartphone + brand: TWZ + model: OX X1 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 9dd14e14a5..bf4bdcd285 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -4405,3 +4405,57 @@ model: TM101A620M os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; TFX711G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome + version: 83.0.4103.106 + engine: Blink + engine_version: 83.0.4103.106 + device: + type: tablet + brand: Condor + model: TFX711G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; TFX714L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome + version: 83.0.4103.106 + engine: Blink + engine_version: 83.0.4103.106 + device: + type: tablet + brand: Condor + model: TFX714L + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; TFX713L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome + version: 83.0.4103.106 + engine: Blink + engine_version: 83.0.4103.106 + device: + type: tablet + brand: Condor + model: TFX713L + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index fa5d63151e..61b075e7d5 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -5612,7 +5612,7 @@ ConCorde: # Condor (www.condor.dz) Condor: - regex: 'Allure (?:A55 Slim|M[123]|X)|Griffe T[235-9]|TFX712G|TMK715L|TRA-901G|TGW[-]?(710G|709|102L|801[GL])|(?:PGN\-?[456][012][0-9]|PHS\-601|PHQ519|PAM412|PHQ52[056]|TB105L|TB717G|PKT\-301|Plume (?:H1|L[1-68]|P8|P6 PRO LTE)|Infinity E5|Infinity a4|Infinity_i[45]|PKT411)(?:[);/ ]|$)|CTAB[^/;]+ Build' + regex: 'Allure (?:A55 Slim|M[123]|X)|Griffe T[235-9]|TFX71[12]G|TFX71[34]L|TMK715L|TRA-901G|TGW[-]?(710G|709|102L|801[GL])|(?:PGN\-?[456][012][0-9]|PHS\-601|PHQ519|PAM412|PHQ52[056]|TB105L|TB717G|PKT\-301|Plume (?:H1|L[1-68]|P8|P6 PRO LTE)|Infinity E5|Infinity a4|Infinity_i[45]|PKT411)(?:[);/ ]|$)|CTAB[^/;]+ Build' device: 'smartphone' models: - regex: 'CTAB([^/;]+) Build' @@ -5621,7 +5621,7 @@ Condor: - regex: '(TGW)-?(710G|709|801[GL]|102L)(?:[);/ ]|$)' device: 'tablet' model: '$1 $2' - - regex: '(TFX712G|TB105L|TB717G|TMK715L)(?:[);/ ]|$)' + - regex: '(TFX71[12]G|TFX71[34]L|TB105L|TB717G|TMK715L)(?:[);/ ]|$)' device: 'tablet' model: '$1' - regex: '(TRA)-(901G)(?:[);/ ]|$)' @@ -27865,9 +27865,9 @@ TWM: device: 'tablet' model: 'Amazing $1' -# TWZ (twz.co.th) +# TWZ or TWZ Corporation PLC (twz.co.th) TWZ: - regex: 'TWZ[-_ ](?:TabPlay|Y6[08]|Y52|A49|A[59]5|A567|AA8|QQ[12])|TWZQQ1' + regex: 'TWZ[-_ ](?:TabPlay|Y6[08]|Y52|A49|A[59]5|A567|AA8|QQ[12])|TWZQQ1|(?:OX_X1)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'TWZ[_ ]TabPlay[_ ](12[56])' @@ -27875,6 +27875,8 @@ TWZ: model: 'TabPlay $1' - regex: 'TWZ[-_ ]?(Y6[08]|Y52|A49|A[59]5|A567|AA8|QQ[12])' model: '$1' + - regex: 'OX_X1' + model: 'OX X1' # Oale Oale: From 4c25adad1ec66f49bf896a86cfec17e8c91cdcce Mon Sep 17 00:00:00 2001 From: sanchezzzhak Date: Mon, 27 Feb 2023 15:03:41 +0300 Subject: [PATCH 5/6] feat(device) detect brand Hyundai: Koral 7W3 (HT0703W08) --- Tests/fixtures/tablet-9.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 5 ++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 3bb2205f67..4d0b68d425 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -4693,3 +4693,21 @@ model: TFX713L os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.1.2; HT0703W08) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.117 Safari/537.36 + os: + name: Android + version: 7.1.2 + platform: "" + client: + type: browser + name: Chrome + version: 81.0.4044.117 + engine: Blink + engine_version: 81.0.4044.117 + device: + type: tablet + brand: Hyundai + model: Koral 7W3 + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index e66a716e57..7a33184cb5 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -10297,7 +10297,7 @@ Huawei: # Hyundai Hyundai: - regex: 'Hyundai|(?:Ultra (?:Active|Air|Charm|Dream|Energy|Latitude|Link|Live|Shadow|Shine|Storm|Style|Sync|Trend|Vision|Wave)|Ultra_Vision_Plus|E(?:475|504|603)|G(?:24027|2552[34])K|W25042L|HP554O|Seoul (ECO|S8|MIX|5 Plus|9)|L503F Plus|HT0701L16|HT0703K16|HT0704K08|HT100(?:4LI?16|2W32|3X16|2W16)|Koral_8W2|HT0701W16|Eternity[_ ](?:G25|H6[578])|HYMI 5S Plus|7GB1|7WD1|(?:Android 9;(?: [\w-]+;)? [EL]553)|10LB1|L601F|10WB1|E601F|E503F|E465GO|H-LED55EU1311|H-LED40GS5003|H-DMP100)(?:[);/ ]|$)' + regex: 'Hyundai|(?:Ultra (?:Active|Air|Charm|Dream|Energy|Latitude|Link|Live|Shadow|Shine|Storm|Style|Sync|Trend|Vision|Wave)|Ultra_Vision_Plus|E(?:475|504|603)|G(?:24027|2552[34])K|W25042L|HP554O|Seoul (ECO|S8|MIX|5 Plus|9)|L503F Plus|HT0701L16|HT0703K16|HT0704K08|HT100(?:4LI?16|2W32|3X16|2W16)|Koral_8W2|HT0701W16|Eternity[_ ](?:G25|H6[578])|HYMI 5S Plus|7GB1|7WD1|(?:Android 9;(?: [\w-]+;)? [EL]553)|10LB1|L601F|10WB1|E601F|E503F|E465GO|H-LED55EU1311|H-LED40GS5003|H-DMP100|HT0703W08)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'Ultra[_ ]Vision[_ ]Plus' @@ -10350,6 +10350,9 @@ Hyundai: - regex: 'HT0701W16' model: 'Koral 7W4X' device: 'tablet' + - regex: 'HT0703W08' + model: 'Koral 7W3' + device: 'tablet' - regex: '10LB1' model: 'Koral 10LB1' device: 'tablet' From 92a535b388e5637f5b0e0661ef8caccdb8320434 Mon Sep 17 00:00:00 2001 From: sanchezzzhak Date: Mon, 27 Feb 2023 20:19:31 +0300 Subject: [PATCH 6/6] feat(device) detect new brand FFF SmartLife: AB-10A4 feat(device) detect new brand Versus: V-Pad Pop feat(device) detect brand Sony: Walkman A300 feat(device) detect brand Sharp: Leica Leitz Phone 2 (LP-02) feat(device) detect brand Huawei: Honor 80 5G (ANN-AN00) feat(device) detect brand Walton: Primo VX feat(device) detect brand Cube: iWork 8 3G (I1_3GD) feat(device) detect brand Lenovo: Tab M10 Plus (Gen 3) (TB128FU) feat(device) detect brand Vankyo: MatrixPad S8 feat(device) detect brand Polaroid: Pure 10.1" feat(device) detect brand Onda: V80 SE --- Parser/Device/AbstractDeviceParser.php | 2 + Tests/fixtures/portable_media_player.yml | 18 +++ Tests/fixtures/smartphone-35.yml | 126 ++++++++++++++++++++ Tests/fixtures/tablet-9.yml | 142 +++++++++++++++++++++++ regexes/device/mobiles.yml | 53 +++++---- 5 files changed, 321 insertions(+), 20 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 0d7bf576c0..99549a8c7b 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -538,6 +538,7 @@ abstract class AbstractDeviceParser extends AbstractParser '4F' => 'Funai', '5J' => 'Fusion5', 'FF' => 'Future Mobile Technology', + 'FFF' => 'FFF SmartLife', 'FW' => 'FNF', 'FXT' => 'Fxtec', 'GT' => 'G-TiDE', @@ -1507,6 +1508,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'VE' => 'Vertu', 'VL' => 'Verykool', 'QV' => 'Verssed', + 'VER' => 'Versus', 'V8' => 'Vesta', 'VT' => 'Vestel', '48' => 'Vexia', diff --git a/Tests/fixtures/portable_media_player.yml b/Tests/fixtures/portable_media_player.yml index 84da10e88d..548111327e 100644 --- a/Tests/fixtures/portable_media_player.yml +++ b/Tests/fixtures/portable_media_player.yml @@ -773,3 +773,21 @@ model: Touch os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; NW-A300Series) 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: portable media player + brand: Sony + model: Walkman A300 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/smartphone-35.yml b/Tests/fixtures/smartphone-35.yml index 7bf793c4f1..60586a8372 100644 --- a/Tests/fixtures/smartphone-35.yml +++ b/Tests/fixtures/smartphone-35.yml @@ -681,3 +681,129 @@ model: OX X1 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; LP-02) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 102.0.0.0 + engine: Blink + engine_version: 102.0.0.0 + device: + type: smartphone + brand: Sharp + model: Leica Leitz Phone 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 13; SAMSUNG SM-A035F) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/19.0 Chrome/102.0.5005.125 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Samsung Browser + version: "19.0" + engine: WebKit + engine_version: "537.36" + device: + type: smartphone + brand: Samsung + model: Galaxy A03 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 13; SM-F926W) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome + version: 110.0.0.0 + engine: Blink + engine_version: 110.0.0.0 + device: + type: phablet + brand: Samsung + model: Galaxy Z Fold 3 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; ANN-AN00; HMSCore 6.9.6.302) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/13.0.3.320 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Huawei Browser Mobile + version: 13.0.3.320 + engine: Blink + engine_version: 99.0.4844.88 + device: + type: smartphone + brand: Huawei + model: Honor 80 5G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; SM-A315N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 110.0.0.0 + engine: Blink + engine_version: 110.0.0.0 + device: + type: smartphone + brand: Samsung + model: Galaxy A31 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; SM-M3070) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.96 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 78.0.3904.96 + engine: Blink + engine_version: 78.0.3904.96 + device: + type: smartphone + brand: Samsung + model: Galaxy M30s + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; Primo VX) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36 + os: + name: Android + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 78.0.3904.90 + engine: Blink + engine_version: 78.0.3904.90 + device: + type: smartphone + brand: Walton + model: Primo VX + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 4d0b68d425..79aa6e4cd2 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -4711,3 +4711,145 @@ model: Koral 7W3 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.4; I1_3GD) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 + os: + name: Android + version: 4.4.4 + platform: "" + client: + type: browser + name: Chrome + version: 81.0.4044.138 + engine: Blink + engine_version: 81.0.4044.138 + device: + type: tablet + brand: Cube + model: iWork 8 3G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; TB128FU Build/SKQ1.220119.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/97.0.4692.98 Safari/537.36 T7/13.19 SP-engine/2.57.0 baiduboxapp/13.19.5.10 (Baidu; P1 12) NABar/1.0 + os: + name: Android + version: "12" + platform: "" + client: + type: mobile app + name: Baidu Box App + version: 13.19.5.10 + device: + type: tablet + brand: Lenovo + model: Tab M10 Plus (Gen 3) + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 10; VANKYO_S8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Chrome + version: 110.0.0.0 + engine: Blink + engine_version: 110.0.0.0 + device: + type: tablet + brand: Vankyo + model: MatrixPad S8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; FFFTAB10a4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome + version: 109.0.0.0 + engine: Blink + engine_version: 109.0.0.0 + device: + type: tablet + brand: FFF SmartLife + model: TAB-10A4 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; POLPAROID PURE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Safari/537.36 + os: + name: Android + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome + version: 76.0.3809.111 + engine: Blink + engine_version: 76.0.3809.111 + device: + type: tablet + brand: Polaroid + model: Pure 10.1" + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; V-Pad Pop) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36 + os: + name: Android + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome + version: 78.0.3904.108 + engine: Blink + engine_version: 78.0.3904.108 + device: + type: tablet + brand: Versus + model: V-Pad Pop + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; V80 SE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36 + os: + name: Android + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome + version: 76.0.3809.132 + engine: Blink + engine_version: 76.0.3809.132 + device: + type: tablet + brand: Onda + model: V80 SE + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; V80_SE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.125 Safari/537.36 + os: + name: Android + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome + version: 84.0.4147.125 + engine: Blink + engine_version: 84.0.4147.125 + device: + type: tablet + brand: Onda + model: V80 SE + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 7a33184cb5..8c9ce78e34 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -5998,7 +5998,7 @@ MyTab: # Cube (short name Alldocube) Cube: - regex: '(