diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index f025f50b47..c46ba3ccc2 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -750,6 +750,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'H0' => 'Hometech', 'HLB' => 'HOLLEBERG', 'HM' => 'Homtom', + 'HOP' => 'Hopeland', 'HZ' => 'Hoozo', 'H7' => 'Horizon', '4H' => 'Horizont', @@ -958,6 +959,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'LK' => 'Lark', 'Z3' => 'Laurus', 'LEC' => 'Lectrus', + 'LAS' => 'Laser', 'LV' => 'Lava', 'LVI' => 'Lville', 'LC' => 'LCT', @@ -1074,6 +1076,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'MIP' => 'mipo', 'MS' => 'Microsoft', '6Q' => 'Microtech', + 'MIG' => 'Mightier', '1X' => 'Minix', 'OM' => 'Mintt', 'MIN' => 'Mint', @@ -1277,6 +1280,7 @@ abstract class AbstractDeviceParser extends AbstractParser '30' => 'Ovvi', 'O2' => 'Owwo', 'OSC' => 'OSCAL', + 'OXT' => 'OX TAB', 'OY' => 'Oysters', 'QF' => 'OYSIN', 'O6' => 'Oyyu', @@ -1436,6 +1440,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'RQ' => 'RoyQueen', 'RJ' => 'Royole', 'RT' => 'RT Project', + 'RTK' => 'RTK', 'RG' => 'RugGear', 'RUG' => 'Ruggex', 'RUT' => 'RuggeTech', diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml index 6069d34efe..a09079516b 100644 --- a/Tests/fixtures/peripheral.yml +++ b/Tests/fixtures/peripheral.yml @@ -1450,3 +1450,21 @@ model: V2 Pro ST os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; HY416) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 106.0.0.0 + engine: Blink + engine_version: 106.0.0.0 + device: + type: peripheral + brand: Hopeland + model: HY416 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/smartphone-38.yml b/Tests/fixtures/smartphone-38.yml index 4f9a57fd24..b2e88c0c30 100644 --- a/Tests/fixtures/smartphone-38.yml +++ b/Tests/fixtures/smartphone-38.yml @@ -9224,3 +9224,399 @@ model: MOVE 10 os_family: Android browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 10; GO1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.73 Mobile Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 99.0.4844.73 + engine: Blink + engine_version: 99.0.4844.73 + device: + type: smartphone + brand: Yezz + model: GO 1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 10; GO2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Mobile Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 100.0.4896.127 + engine: Blink + engine_version: 100.0.4896.127 + device: + type: smartphone + brand: Yezz + model: GO 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 10; LE000Z93P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 104.0.0.0 + engine: Blink + engine_version: 104.0.0.0 + device: + type: smartphone + brand: Lava + model: Z2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 10; LOGIC X57A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 107.0.0.0 + engine: Blink + engine_version: 107.0.0.0 + device: + type: smartphone + brand: Logic + model: X57A + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 10; MobiGo2L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.6045.193 Mobile Safari/537.36 OPR/79.3.4195.76674 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Opera Mobile + version: 79.3.4195.76674 + engine: Blink + engine_version: 119.0.6045.193 + device: + type: smartphone + brand: MobiWire + model: MobiGo 2L + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 10; RCARENO5011619) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 103.0.0.0 + engine: Blink + engine_version: 103.0.0.0 + device: + type: smartphone + brand: RCA Tablets + model: Reno + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; helio 30) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 106.0.0.0 + engine: Blink + engine_version: 106.0.0.0 + device: + type: smartphone + brand: Symphony + model: helio 30 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; GO 3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.58 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 99.0.4844.58 + engine: Blink + engine_version: 99.0.4844.58 + device: + type: smartphone + brand: Yezz + model: GO 3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; Smooth Note 6.8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 112.0.0.0 + engine: Blink + engine_version: 112.0.0.0 + device: + type: smartphone + brand: Smooth Mobile + model: Smooth Note 6.8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; Mintt M3) 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: Mintt + model: M3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; VP005; HMSCore 6.13.0.322) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/15.0.1.300 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Huawei Browser Mobile + version: 15.0.1.300 + engine: Blink + engine_version: 99.0.4844.88 + device: + type: smartphone + brand: U-Magic + model: Enjoy 50 Plus + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 10; STG H10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.92 Mobile Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 96.0.4664.92 + engine: Blink + engine_version: 96.0.4664.92 + device: + type: smartphone + brand: STG Telecom + model: H10 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; ESKIMO_K5001) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.74 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 95.0.4638.74 + engine: Blink + engine_version: 95.0.4638.74 + device: + type: smartphone + brand: RTK + model: ESKIMO! + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; Primo R9) 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: Walton + model: Primo R9 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; MS5424G) 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: Maze Speed + model: MS5424G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; IN_2c) 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: MicroMax + model: IN 2C + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; iKU X3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 103.0.0.0 + engine: Blink + engine_version: 103.0.0.0 + device: + type: smartphone + brand: IKU Mobile + model: X3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; Alpha 9V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.5481.192 Mobile Safari/537.36 OPR/74.3.3922.71982 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Opera Mobile + version: 74.3.3922.71982 + engine: Blink + engine_version: 110.0.5481.192 + device: + type: smartphone + brand: Lanix + model: Alpha 9V + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 11; BL40_MV12) 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: Bmobile + model: BL40 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; BL60 Pro) 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: Bmobile + model: BL60 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; BL61) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 109.0.0.0 + engine: Blink + engine_version: 109.0.0.0 + device: + type: smartphone + brand: Bmobile + model: BL61 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; BL62) 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: Bmobile + model: BL62 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index 00b46a70e5..0a93c898aa 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -1058,7 +1058,7 @@ device: type: tablet brand: EXO - model: Wave i007Kids + model: Wave i007 Kids os_family: Android browser_family: Chrome - diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 7aebc77551..7097d37e37 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -9717,3 +9717,147 @@ model: G600 os_family: Android browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 10; MID_1089IPSA100) 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: Laser + model: MID-1089IPSA100 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; Scepter8 Build/SQ1A.220105.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/123.0.6312.118 Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Chrome Webview + version: 123.0.6312.118 + engine: Blink + engine_version: 123.0.6312.118 + device: + type: tablet + brand: QLink + model: Scepter 8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; TabletEXO_Wave_i101S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome + version: 103.0.0.0 + engine: Blink + engine_version: 103.0.0.0 + device: + type: tablet + brand: EXO + model: Wave i101S + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; MQ703G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 107.0.0.0 + engine: Blink + engine_version: 107.0.0.0 + device: + type: tablet + brand: TwinMOS + model: MQ703G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; MT003-21) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome + version: 108.0.0.0 + engine: Blink + engine_version: 108.0.0.0 + device: + type: tablet + brand: Mightier + model: MT003-21 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 11; BYYBUO_SmartPad_T10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36 + os: + name: Android + version: "11" + platform: "" + client: + type: browser + name: Chrome + version: 112.0.0.0 + engine: Blink + engine_version: 112.0.0.0 + device: + type: tablet + brand: BYYBUO + model: SmartPad T10 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 12; Ox-p010-2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36 + os: + name: Android + version: "12" + platform: "" + client: + type: browser + name: Chrome + version: 105.0.0.0 + engine: Blink + engine_version: 105.0.0.0 + device: + type: tablet + brand: OX TAB + model: Ox-p010-2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 10; X10MT87) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Chrome + version: 102.0.0.0 + engine: Blink + engine_version: 102.0.0.0 + device: + type: tablet + brand: Xtratech + model: IguanaPad 10.1" + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index e15dd7806b..565fcebcd5 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -1683,9 +1683,9 @@ Apple: model: 'iPhone $1' device: 'smartphone' -# micromax +# micromax (https://micromaxinfo.com/) MicroMax: - regex: '(?:MicroMax[ \-\_]?[a-z0-9]+|Q327)|4560MMX|P70221|(?:YU(?:5012|5040|5530)|AQ5001(?: Canvas Power)?|Android 4(?:[\d.]*);(?: [\w-]+;)? A240|Android 8(?:[\d.]*);(?: [\w-]+;)? B5Pro|N8216|N8301|IN_2b|IN_Note1|ione note|E7446|E7533)(?:[);/ ]|$)' + regex: '(?:MicroMax[ \-\_]?[a-z0-9]+|Q327)|4560MMX|P70221|(?:YU(?:5012|5040|5530)|AQ5001(?: Canvas Power)?|Android 4(?:[\d.]*);(?: [\w-]+;)? A240|Android 8(?:[\d.]*);(?: [\w-]+;)? B5Pro|N8216|N8301|IN_2[bc]|IN_Note1|ione note|E7446|E7533)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'AQ5001 Canvas Power' @@ -1704,6 +1704,8 @@ MicroMax: model: '4560MMX' - regex: 'IN_2b(?:[);/ ]|$)' model: 'IN 2B' + - regex: 'IN_2c(?:[);/ ]|$)' + model: 'IN 2C' - regex: 'E6523(?:[);/ ]|$)' model: 'IN 1B' - regex: 'AQ4502(?:[);/ ]|$)' @@ -5312,7 +5314,7 @@ Blaupunkt: # Bmobile Bmobile: - regex: 'Bmobile[_ ]|B60Pro(?:_MV03)?|BL50P_TG0[567]|BL51_MV05|BL54_?Pro|(?:B50Pro|BL5[02]|BL60_TG(?:05|17)|BL60M_MV05|FUN 4 2018|AX686A|AX-?(?:[1-9][0-9]{2,3}[eEO+]?|7OO))(?:[);/ ]|$)' + regex: 'Bmobile[_ ]|B60Pro(?:_MV03)?|BL40_MV12|BL50P_TG0[567]|BL51_MV05|BL54_?Pro|(?:B50Pro|BL5[02]|BL60_TG(?:05|17)|BL60M_MV05|BL60 Pro|BL6[12]|FUN 4 2018|AX686A|AX-?(?:[1-9][0-9]{2,3}[eEO+]?|7OO))(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'AX-?([1-9][0-9]{2,3}[eAEO+]?)' @@ -5323,8 +5325,12 @@ Bmobile: model: 'Fun 4 (2018)' - regex: 'B60Pro(?:_MV03)?' model: 'B60 Pro' + - regex: 'BL40_MV12(?:[);/ ]|$)' + model: 'BL40' - regex: 'BL60_TG(?:05|17)' model: 'BL60' + - regex: 'BL60 Pro(?:[);/ ]|$)' + model: 'BL60 Pro' - regex: 'BL60M_MV05' model: 'BL60M' - regex: 'B50Pro' @@ -5337,6 +5343,8 @@ Bmobile: model: 'BL51' - regex: 'BL54_?Pro' model: 'BL54 Pro' + - regex: 'BL6([12])(?:[);/ ]|$)' + model: 'BL6$1' - regex: 'Bmobile[_ ]([^/;]+) Build' model: '$1' - regex: 'Bmobile[_ ]([a-z0-9]+)' @@ -10288,6 +10296,14 @@ Homtom: - regex: 'Homtom ([^;/]+) Build' model: '$1' +# Hopeland (https://www.hopelandrfid.com/) +Hopeland: + regex: 'HY(?:416|820)(?:[);/ ]|$)' + device: 'peripheral' + models: + - regex: 'HY(416|820)(?:[);/ ]|$)' + model: 'HY$1' + # Hosin Hosin: regex: 'HOSIN[ _-]' @@ -10313,6 +10329,12 @@ Hoozo: device: 'smartphone' model: '$1' +# Mightier (https://www.mightier.com/) +Mightier: + regex: '(MT003-21)(?:[);/ ]|$)' + device: 'tablet' + model: '$1' + # Minix (minix.us) Minix: regex: 'NEO[- ](?:X8-H|X8|U9-H|X[57]-mini|X8H?-PLUS|X88-?I|X7-216A|X5-116A|X[68]|U1|Z64|U22-XJ)(?:[);/ ]|$)' @@ -10391,7 +10413,7 @@ China Telecom: # U-Magic (China Unicom) U-Magic: - regex: '(?:Liantong)?(?:VP00[123])(?:[);/ ]|$)' + regex: '(?:Liantong)?(?:VP00[1235])(?:[);/ ]|$)' device: 'smartphone' models: - regex: '(?:Liantong)?VP001' @@ -10400,6 +10422,8 @@ U-Magic: model: 'Enjoy 20 5G' - regex: '(?:Liantong)?VP003' model: 'Enjoy 30e 5G' + - regex: '(?:Liantong)?VP005' + model: 'Enjoy 50 Plus' # Hi Nova Hi Nova: @@ -14226,9 +14250,17 @@ Benco: - regex: 'AE9230' model: 'Y32' +# Laser (https://www.laserco.com.au/) +Laser: + regex: '(?:MID_1089IPSA100)(?:[);/ ]|$)' + device: 'tablet' + models: + - regex: 'MID_1089IPSA100(?:[);/ ]|$)' + model: 'MID-1089IPSA100' + # Lava (Lavamobiles.com) Lava: - regex: 'Lava[ _]|LAVA(?:A1|X10)|(?:DISCOVER136|KKT QUADRA)|iris(?! Plus 2021|_Pad_G)[ _]?([^/;)]+)(?