diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 1a5a7f293a..36bcc11191 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -419,6 +419,7 @@ abstract class AbstractDeviceParser extends AbstractParser '1G' => 'Gini', 'GI' => 'Gionee', 'G4' => 'Globex', + 'U6' => 'Glofiish', 'G7' => 'GoGEN', 'GC' => 'GOCLEVER', 'GB' => 'Gol Mobile', @@ -702,6 +703,7 @@ abstract class AbstractDeviceParser extends AbstractParser '3T' => 'MyTab', 'MG' => 'MyWigo', 'J3' => 'Mymaga', + '07' => 'MyGica', '08' => 'Nabi', 'N7' => 'National', 'NC' => 'Navcity', @@ -815,6 +817,7 @@ abstract class AbstractDeviceParser extends AbstractParser '0P' => 'POCO', 'PV' => 'Point of View', 'PL' => 'Polaroid', + 'Q6' => 'Polar', 'PP' => 'PolyPad', 'P5' => 'Polytron', 'P2' => 'Pomp', diff --git a/Tests/fixtures/smartphone-27.yml b/Tests/fixtures/smartphone-27.yml index 929c796593..226b2abbd1 100644 --- a/Tests/fixtures/smartphone-27.yml +++ b/Tests/fixtures/smartphone-27.yml @@ -6454,3 +6454,543 @@ model: TaigaPhone 1 os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 8.0.0; G3212) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.82 YaApp_Android/21.90.1 YaSearchBrowser/21.90.1 BroPP/1.0 SA/3 Mobile Safari/537.36 + os: + name: Android + version: 8.0.0 + platform: ARM + client: + type: browser + name: Yandex Browser + version: 21.90.1 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Sony + model: Xperia XA1 Ultra + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; arm_64; Android 8.0.0; G3112) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.82 YaBrowser/21.9.0.359.00 SA/3 Mobile Safari/537.36 + os: + name: Android + version: 8.0.0 + platform: ARM + client: + type: browser + name: Yandex Browser + version: 21.9.0.359.00 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Sony + model: Xperia XA1 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Cavion_Base_5_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 95.0.4638.50 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Cavion + model: Base 5.0" + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; CPE91) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.85 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Stylo + model: S54 Zen + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; CLIK) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.85 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Mobicel + model: Clik + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Benefit_M9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 95.0.4638.50 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Ark + model: Benefit M9 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; DZIRE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.120 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 91.0.4472.120 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Hurricane + model: Dzire + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; FAME) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 95.0.4638.50 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Mobicel + model: Fame + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; FAME_DS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.85 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Mobicel + model: Fame DS + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Gpad_U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 95.0.4638.50 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Glofiish + model: G Pad U + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; BEAM) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.71 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Mobicel + model: Beam + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Beam) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 75.0.3770.101 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Hurricane + model: Beam + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Aquaris VS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.71 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: bq + model: Aquaris VS + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; U601S Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.85 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Hisense + model: U601S Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; TECNO L9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.85 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Tecno Mobile + model: L9 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; TECNO S6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 92.0.4515.159 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Tecno Mobile + model: S6 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Vulcan) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.120 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 91.0.4472.120 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Hurricane + model: Vulcan + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; SPRINT4G Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/81.0.4044.96 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Webview + version: 81.0.4044.96 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: NOA + model: Sprint 4G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Philips S257) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.71 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Philips + model: S257 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Philips S318) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.85 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Philips + model: S318 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Philips S386) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Mobile Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 95.0.4638.50 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Philips + model: S386 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; QUANTUM_470_RUGGED_PRO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.85 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: GOCLEVER + model: Quantum 470 Rugged Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; QUANTUM_II_500_N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.82 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 93.0.4577.82 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: GOCLEVER + model: Quantum 2 500 N + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Beeline Smart 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.98 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 52.0.2743.98 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Beeline + model: Smart 8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Archos 50 Saphir) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.85 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Archos + model: 50 Saphir + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Archos 40 Power) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 94.0.4606.85 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Archos + model: 40 Power + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Archos 50 Platinum 4G Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/73.0.3683.90 Mobile Safari/537.36 YandexSearch/8.05 YandexSearchBrowser/8.05 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Yandex Browser + version: "8.05" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Archos + model: 50 Platinum 4G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; A8 MAX) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Mobile Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 95.0.4638.50 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Blackview + model: A8 Max + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; Blackview A8 MAX) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.89 Mobile Safari/537.36 + os: + name: Android + version: 6.0.1 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 76.0.3809.89 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Blackview + model: A8 Max + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; Life One X2 Mini) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Mobile Safari/537.36 + os: + name: Android + version: 6.0.1 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 95.0.4638.50 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: Blu + model: Life One X2 Mini + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml index dcc51ae04b..59a72c3231 100644 --- a/Tests/fixtures/tablet-6.yml +++ b/Tests/fixtures/tablet-6.yml @@ -4910,3 +4910,111 @@ model: GEN-10 os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; H10888M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.82 Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome + version: 93.0.4577.82 + engine: Blink + engine_version: "" + device: + type: tablet + brand: Proline + model: H10888M + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Fever_Plus_J) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome + version: 95.0.4638.50 + engine: Blink + engine_version: "" + device: + type: tablet + brand: Mobicel + model: Fever Plus J + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; SUPRA M84E 3G Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36 YaApp_Android/11.01/apad YaSearchBrowser/11.01 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Yandex Browser + version: "11.01" + engine: Blink + engine_version: "" + device: + type: tablet + brand: Supra + model: M84E 3G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Archos 80 Oxygen) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Safari/537.36 + os: + name: Android + version: "6.0" + platform: "" + client: + type: browser + name: Chrome + version: 95.0.4638.50 + engine: Blink + engine_version: "" + device: + type: tablet + brand: Archos + model: 80 Oxygen + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; SUPRA M74C 4G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Safari/537.36 + os: + name: Android + version: "5.1" + platform: "" + client: + type: browser + name: Chrome + version: 94.0.4606.85 + engine: Blink + engine_version: "" + device: + type: tablet + brand: Supra + model: M74C 4G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; SUPRA M12CG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Safari/537.36 + os: + name: Android + version: "5.1" + platform: "" + client: + type: browser + name: Chrome + version: 95.0.4638.50 + engine: Blink + engine_version: "" + device: + type: tablet + brand: Supra + model: M12CG + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml index c773f60b3c..38debfbff0 100644 --- a/Tests/fixtures/tv-1.yml +++ b/Tests/fixtures/tv-1.yml @@ -2567,7 +2567,7 @@ model: LEAP-S1 os_family: Android browser_family: Chrome -- +- user_agent: 'Gibbon/2020.2.2.0/2020.2.2.0: Netflix/2020.2.2.0 (DEVTYPE=NFANDROID2-PRV-FIRETVSTICK2018; CERTVER=0)' os: name: Fire OS @@ -2583,3 +2583,129 @@ model: Fire TV Stick 4K os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; Polar_P24L51T2CSM Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/51.0.2704.91 Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Webview + version: 51.0.2704.91 + engine: Blink + engine_version: "" + device: + type: tv + brand: Polar + model: P24L51T2CSM + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 7.1.2; en-US; MyGica HDR Smart TV Box Build/V002S901_20171221) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/40.0.2214.89 UCBrowser/11.4.8.1012 Mobile Safari/537.36 + os: + name: Android + version: 7.1.2 + platform: "" + client: + type: browser + name: UC Browser + version: 11.4.8.1012 + engine: WebKit + engine_version: "537.36" + device: + type: tv + brand: MyGica + model: HDR Smart TV Box + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; MyGica HDR Quad Core Box) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Safari/537.36 + os: + name: Android + version: 6.0.1 + platform: "" + client: + type: browser + name: Chrome + version: 95.0.4638.50 + engine: Blink + engine_version: "" + device: + type: tv + brand: MyGica + model: HDR Quad Core Box + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; MyGica ATV1900 NO WV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.136 Safari/537.36 + os: + name: Android + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome + version: 79.0.3945.136 + engine: Blink + engine_version: "" + device: + type: tv + brand: MyGica + model: ATV1900 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; MyGica ATV495 Pro 16G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.120 Safari/537.36 + os: + name: Android + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome + version: 91.0.4472.120 + engine: Blink + engine_version: "" + device: + type: tv + brand: MyGica + model: ATV495 Pro 16G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; MyGica Quad core Enjoy tv box) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.185 Safari/537.36 + os: + name: Android + version: 6.0.1 + platform: "" + client: + type: browser + name: Chrome + version: 86.0.4240.185 + engine: Blink + engine_version: "" + device: + type: tv + brand: MyGica + model: Quad Core Enjoy TV Box + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; MyGica ATV1960) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Safari/537.36 + os: + name: Android + version: 6.0.1 + platform: "" + client: + type: browser + name: Chrome + version: 91.0.4472.101 + engine: Blink + engine_version: "" + device: + type: tv + brand: MyGica + model: ATV1960 + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index aaa728a1ab..404b8469b7 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -2389,10 +2389,13 @@ Archos: model: '101B Helium 4G' - regex: 'AC50BHE(?:[);/ ]|$)' model: '50B Helium 4G' + - regex: 'Archos 80 Oxygen(?:[);/ ]|$)' + device: 'tablet' + model: '80 Oxygen' - regex: '(?:YL-)?Archos ([^/;]*(?:PAD)[^/;]*) Build' device: 'tablet' model: '$1' - - regex: 'Archos ((?:[789]|10)[0-9]?[a-z]* ?(?:G9|G10|Helium|Titanium|Cobalt|Platinum|Xenon|Carbon|Neon|XS|IT)[^/;]*) Build' + - regex: 'Archos ((?:[789]|10)[0-9]?[a-z]* ?(?:G9|G10|Helium|Titanium|Cobalt|Platinum|Xenon|Carbon|Neon|XS|IT)[^/);]*)(?: Build|[;)])' device: 'tablet' model: '$1' - regex: '(?:YL-)?Archos ([^/);]+)(?: Build|[;)])' @@ -3026,10 +3029,10 @@ Blu: model: 'Pure Mini' - regex: 'BOLD N1' model: 'Bold N1' - - regex: 'Life One X2' - model: 'Life One X2' - - regex: 'LIFE ONE X' - model: 'Life One X' + - regex: 'Life One X2 Mini' + model: 'Life One X2 Mini' + - regex: 'LIFE ONE (X2?)' + model: 'Life One $1' - regex: 'LIFE ONE' model: 'Life One' - regex: 'LIFE MARK' @@ -3115,7 +3118,7 @@ Bluegood: # Blackview Blackview: - regex: 'Blackview|(BV([24-9]000|[46]900|(5[1589]|9[15689])00|6[1368]00)(?:[ _](?:PRO))?|(P10000(?:[ _](?:PRO))?)|omega[ _]pro|Alife[ _][PS]1|Heatwave|DM550|BV9700Pro|(?