8000 Improve device detection: Archos · faisalman/ua-parser-js@0cf4477 · GitHub
[go: up one dir, main page]
Skip 10000 to content

Commit 0cf4477

Browse files
faisalmanfaisalman
committed
Improve device detection: Archos
1 parent 367eae4 commit 0cf4477

File tree

2 files changed

+235
-1
lines changed

2 files changed

+235
-1
lines changed

‎src/main/ua-parser.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,14 @@
713713
/droid.+; (a(?:015|06[35]|142p?))/i
714714
], [MODEL, [VENDOR, 'Nothing'], [TYPE, MOBILE]], [
715715

716+
// Archos
717+
/; (x67 5g|tikeasy \w+|ac[1789]\d\w+)( b|\))/i,
718+
/archos ?(5|gamepad2?|([\w ]*[t1789]|hello) ?\d+[\w ]*)( b|\))/i
719+
], [MODEL, [VENDOR, 'Archos'], [TYPE, TABLET]], [
720+
/archos ([\w ]+)( b|\))/i,
721+
/; (ac[3-6]\d\w{2,8})( b|\))/i
722+
], [MODEL, [VENDOR, 'Archos'], [TYPE, MOBILE]], [
723+
716724
// MIXED
717725
/(imo) (tab \w+)/i, // IMO
718726
/(infinix) (x1101b?)/i // Infinix XPad
@@ -728,7 +736,6 @@
728736
], [VENDOR, MODEL, [TYPE, MOBILE]], [
729737

730738
/(kobo)\s(ereader|touch)/i, // Kobo
731-
/(archos) (gamepad2?)/i, // Archos
732739
/(hp).+(touchpad(?!.+tablet)|tablet)/i, // HP TouchPad
733740
/(kindle)\/([\w\.]+)/i // Kindle
734741
], [VENDOR, MODEL, [TYPE, TABLET]], [

‎test/data/ua/device/archos.json

Lines changed: 227 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,227 @@
1+
[
2+
{
3+
"desc": "Archos 5",
4+
"ua": "Mozilla/5.0 (Linux; U; Android 1.6; fr-fr; Archos5 Build/Donut) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1",
5+
"expect": {
6+
"vendor": "Archos",
7+
"model": "5",
8+
"type": "tablet"
8000 9+
}
10+
},
11+
{
12+
"desc": "Archos 40b Titanium Surround",
13+
"ua": "Mozilla/5.0 (Linux; Android 4.2.2; Archos 40b Titanium Surround Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36",
14+
"expect": {
15+
"vendor": "Archos",
16+
"model": "40b Titanium Surround",
17+
"type": "mobile"
18+
}
19+
},
20+
{
21+
"desc": "Archos 40c Titanium v2",
22+
"ua": "Mozilla/5.0 (Linux; Android 4.4.2; ARCHOS 40C TIv2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36",
23+
"expect": {
24+
"vendor": "Archos",
25+
"model": "40C TIv2",
26+
"type": "mobile"
27+
}
28+
},
29+
{
30+
"desc": "Archos 45 Neon",
31+
"ua": "Mozilla/5.0 (Linux; Android 4.4.2; Archos 45 Neon Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36",
32+
"expect": {
33+
"vendor": "Archos",
34+
"model": "45 Neon",
35+
"type": "mobile"
36+
}
37+
},
38+
{
39+
"desc": "Archos 45 Neon",
40+
"ua": "Mozilla/5.0 (Linux; Android 4.4.2; AC45NE Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.152 YaBrowser/15.6.2311.6088.00 Mobile Safari/537.36",
41+
"expect": {
42+
"vendor": "Archos",
43+
"model": "AC45NE",
44+
"type": "mobile"
45+
}
46+
},
47+
{
48+
"desc": "Archos 45B Helium",
49+
"ua": "Mozilla/5.0 (Linux; Android 7.0; AC45BHE Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.109 Mobile Safari/537.36",
50+
"expect": {
51+
"vendor": "Archos",
52+
"model": "AC45BHE",
53+
"type": "mobile"
54+
}
55+
},
56+
{
57+
"desc": "Archos 45B Titanium",
58+
"ua": "Mozilla/5.0 (Linux; Android 4.4.2; Archos 45B Titanium) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36",
59+
"expect": {
60+
"vendor": "Archos",
61+
"model": "45B Titanium",
62+
"type": "mobile"
63+
}
64+
},
65+
{
66+
"desc": "Archos 50 Cesium",
67+
"ua": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; ARCHOS; AC50CE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/13.10586",
68+
"expect": {
69+
"vendor": "Archos",
70+
"model": "AC50CE",
71+
"type": "mobile"
72+
}
73+
},
74+
{
75+
"desc": "Archos 50B Helium 4G",
76+
"ua": "Mozilla/5.0 (Linux; Android 4.4.4; AC50BHE Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36",
77+
"expect": {
78+
"vendor": "Archos",
79+
"model": "AC50BHE",
80+
"type": "mobile"
81+
}
82+
},
83+
{
84+
"desc": "Archos 55 diamond Selfie",
85+
"ua": "Mozilla/5.0 (Linux; Android 6.0.1; Archos 55 diamond Selfie Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36",
86+
"expect": {
87+
"vendor": "Archos",
88+
"model": "55 diamond Selfie",
89+
"type": "mobile"
90+
}
91+
},
92+
{
93+
"desc": "Archos 80 G9",
94+
"ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; zh-tw; ARCHOS 80G9 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
95+
"expect": {
96+
"vendor": "Archos",
97+
"model": "80G9",
98+
"type": "tablet"
99+
}
100+
},
101+
{
102+
"desc": "Archos 80 Xenon",
103+
"ua": "Mozilla/5.0 (Linux; Android 4.1.2; Archos 80 Xenon Build/JZO54K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Safari/537.36 OPR/50.6.2426.201126",
104+
"expect": {
105+
"vendor": "Archos",
106+
"model": "80 Xenon",
107+
"type": "tablet"
108+
}
109+
},
110+
{
111+
"desc": "Archos 97c Platinum",
112+
"ua": "Mozilla/5.0 (Linux; Android 6.0; Archos 97c Platinum Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Safari/537.36",
113+
"expect": {
114+
"vendor": "Archos",
115+
"model": "97c Platinum",
116+
"type": "tablet"
117+
}
118+
},
119+
{
120+
"desc": "Archos 101 Access 3G V2",
121+
"ua": "Mozilla/5.0 (Linux; Android 7.0; Archos Access 101 3G V2 Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/114.0.5735.130 Safari/537.36[FBAN/EMA;FBLC/pt_PT;FBAV/360.0.0.7.53;]",
122+
"expect": {
123+
"vendor": "Archos",
124+
"model": "Access 101 3G V2",
125+
"type": "tablet"
126+
}
127+
},
128+
{
129+
"desc": "Archos 101 Oxygen 4G",
130+
"ua": "Mozilla/5.0 (Linux; Android 8.1.0; Archos 101 Oxygen 4G Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.71 Safari/537.36 [FB_IAB/FB4A;FBAV/374.0.0.20.109;]",
131+
"expect": {
132+
"vendor": "Archos",
133+
"model": "101 Oxygen 4G",
134+
"type": "tablet"
135+
}
136+
},
137+
{
138+
"desc": "Archos 101 Platinum 3G V2",
139+
"ua": "Mozilla/5.0 (Linux; Android 7.0; AC101PL3GV2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36",
140+
"expect": {
141+
"vendor": "Archos",
142+
"model": "AC101PL3GV2",
143+
"type": "tablet"
144+
}
145+
},
146+
{
147+
"desc": "Archos 101B Helium 4G",
148+
"ua": "Mozilla/5.0 (Linux; Android 6.0; AC101BHE Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Safari/537.36",
149+
"expect": {
150+
"vendor": "Archos",
151+
"model": "AC101BHE",
152+
"type": "tablet"
153+
}
154+
},
155+
{
156+
"desc": "Archos 101s Oxygen Ardoiz",
157+
"ua": "Mozilla/5.0 (Linux; Android 9; Archos Oxygen 101S ARDOIZ Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.102 Safari/537.36",
158+
"expect": {
159+
"vendor": "Archos",
160+
"model": "Oxygen 101S ARDOIZ",
161+
"type": "tablet"
162+
}
163+
},
164+
{
165+
"desc": "Archos GAMEPAD2",
166+
"ua": "Mozilla/5.0 (Linux; Android 4.2.2; ARCHOS GAMEPAD2 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.94 Safari/537.36",
167+
"expect": {
168+
"vendor": "Archos",
169+
"model": "GAMEPAD2",
170+
"type": "tablet"
171+
}
172+
},
173+
{
174+
"desc": "Archos Hello 7",
175+
"ua": "Mozilla/5.0 (Linux; Android 8.1.0; Archos Hello 7 Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.53 Safari/537.36 GoogleApp/13.24.9.26.arm64",
176+
"expect": {
177+
"vendor": "Archos",
178+
"model": "Hello 7",
179+
"type": "tablet"
180+
}
181+
},
182+
{
183+
"desc": "Archos Sense 101 X",
184+
"ua": "Mozilla/5.0 (Linux; arm; Android 7.0; Archos Sense 101 X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 YaBrowser/20.2.0.215.01 Safari/537.36",
185+
"expect": {
186+
"vendor": "Archos",
187+
"model": "Sense 101 X",
188+
"type": "tablet"
189+
}
190+
},
191+
{
192+
"desc": "Archos T101 FHD WiFi",
193+
"ua": "Mozilla/5.0 (Linux; Android 13; ARCHOS T101 FHD WiFi Build/T00624; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.159 Safari/537.36",
194+
"expect": {
195+
"vendor": "Archos",
196+
"model": "T101 FHD WiFi",
197+
"type": "tablet"
198+
}
199+
},
200+
{
201+
"desc": "Archos Tikeasy 10d",
202+
"ua": "Mozilla/5.0 (Linux; Android 13; Tikeasy 10d Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/131.0.6778.260 Safari/537.36",
203+
"expect": {
204+
"vendor": "Archos",
205+
"model": "Tikeasy 10d",
206+
"type": "tablet"
207+
}
208+
},
209+
{
210+
"desc": "Archos T96 WIFI",
211+
"ua": "Mozilla/5.0 (Linux; Android 11; ARCHOS T96 WIFI_EEA Build/RP1A.201005.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/102.0.5005.78 Safari/537.36",
212+
"expect": {
213+
"vendor": "Archos",
214+
"model": "T96 WIFI_EEA",
215+
"type": "tablet"
216+
}
217+
},
218+
{
219+
"desc": "Archos X67 5G",
220+
"ua": "Mozilla/5.0 (Linux; Android 10; X67 5G Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.58 Mobile Safari/537.36",
221+
"expect": {
222+
"vendor": "Archos",
223+
"model": "X67 5G",
224+
"type": "tablet"
225+
}
226+
}
227+
]

0 commit comments

Comments
 (0)
0