Skip to content

Commit 9b071ba

Browse files
mariotsimariotsi
authored
Now update-profiles.js and update-models.js strip away EN+SPACE chara… (#33)
* Removing Unicode EN+Space for Space Removing references of u\2002 in data files and unit tests. Originally reported on PHP library WhichBrowser/Parser-PHP#96 - And same PR built for PHP ported to JS library WhichBrowser/Parser-PHP#106 * Removing Unicode EN+Space for Space Removing references of u\2002 in data files and unit tests. Originally reported on PHP library WhichBrowser/Parser-PHP#96 - And same PR built for PHP ported to JS library WhichBrowser/Parser-PHP#106 * Now update-profiles.js and update-models.js strip away EN+SPACE character as requested on #32 * Revert changes to data files. These files are automatically generated
1 parent 1ced72a commit 9b071ba

19 files changed

+929
-923
lines changed

‎bin/update-models.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ models.forEach((type) => {
7676
// Remove ] from subgroups
7777
result = result.replace(/ {2,}],\n/g, ' },\n');
7878

79+
// Remove occurrences of unicode character 'EN SPACE' (U+2002)
80+
result = result.replace(/\u{2002}/gu, ' ');
81+
7982
// Fixing regex eg. /Yahoo\! Mindset/u -> /Yahoo! Mindset/u and /jsRSS++\/([0-9.]*)/u -> /jsRSS\+\+\/([0-9.]*)/u
8083
// result = result.replace(/\\!/g, '!').replace(/(regexp:\s+?.*?)\+\+(.*?)/g, '$1\\+\\+$2');
8184

‎bin/update-profiles.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ function escapeString(str) {
4343
if (!str) {
4444
return null;
4545
}
46-
return `'${(str + '').replace(/[\\']/g, '\\$&').replace(/\u0000/g, '\\0')}'`;
46+
return `'${(str + '')
47+
.replace(/[\\']/g, '\\$&')
48+
.replace(/\u{0000}/gu, '\\0')
49+
.replace(/\u{2002}/gu, ' ')}'`;
4750
}
4851

4952
/**

‎data/models-android.js‎

Lines changed: 429 additions & 429 deletions
Large diffs are not rendered by default.

‎data/models-kddi.js‎

Lines changed: 346 additions & 346 deletions
Large diffs are not rendered by default.

‎data/models-wm.js‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -291,31 +291,31 @@ exports.WM_MODELS = {
291291
'HTC v1510': ['Vodafone', 'VPA Compact GPS'],
292292
'HTC VPACompactIV': ['Vodafone', 'VPA Compact IV'],
293293

294-
WS003SH: ['Sharp', 'W-ZERO3 WS003SH', { carrier: 'Willcom' }],
295-
WS004SH: ['Sharp', 'W-ZERO3 WS004SH', { carrier: 'Willcom' }],
296-
WS007SH: ['Sharp', 'W-ZERO3 [es] WS007SH', { carrier: 'Willcom' }],
297-
WS011SH: ['Sharp', 'Advanced / W-ZERO3 [es] WS011SH', { carrier: 'Willcom' }],
298-
WS020SH: ['Sharp', 'WILLCOM 03 WS020SH', { carrier: 'Willcom' }],
299-
WS027SH: ['Sharp', 'HYBRID W-ZERO3 WS027SH', { carrier: 'Willcom' }],
300-
S01SH: ['Sharp', 'EM·ONE S01SH', { carrier: 'EMOBILE' }],
301-
S01SH2: ['Sharp', 'EM·ONE alpha S01SH2', { carrier: 'EMOBILE' }],
294+
WS003SH: ['Sharp', 'W-ZERO3 WS003SH', { carrier: 'Willcom' }],
295+
WS004SH: ['Sharp', 'W-ZERO3 WS004SH', { carrier: 'Willcom' }],
296+
WS007SH: ['Sharp', 'W-ZERO3 [es] WS007SH', { carrier: 'Willcom' }],
297+
WS011SH: ['Sharp', 'Advanced / W-ZERO3 [es] WS011SH', { carrier: 'Willcom' }],
298+
WS020SH: ['Sharp', 'WILLCOM 03 WS020SH', { carrier: 'Willcom' }],
299+
WS027SH: ['Sharp', 'HYBRID W-ZERO3 WS027SH', { carrier: 'Willcom' }],
300+
S01SH: ['Sharp', 'EM·ONE S01SH', { carrier: 'EMOBILE' }],
301+
S01SH2: ['Sharp', 'EM·ONE alpha S01SH2', { carrier: 'EMOBILE' }],
302302
'T-01A!': ['Toshiba', 'T-01A', { carrier: 'DoCoMo' }],
303303
'T-01B!': ['Toshiba', 'dynapocket T-01B', { carrier: 'DoCoMo' }],
304-
X01T: ['Toshiba', 'G900 X01T', { carrier: 'Softbank' }],
305-
'X02T!': ['Toshiba', 'dynapocket X02T', { carrier: 'Softbank' }],
306-
'KDDI-HT01': ['HTC', 'TOUCH PRO HT-01A', { carrier: 'au' }],
307-
HT01A: ['HTC', 'TOUCH PRO HT-01A', { carrier: 'au' }],
308-
S11HT: ['HTC', 'EMONSTER S11HT', { carrier: 'EMOBILE' }],
309-
S12HT: ['HTC', 'EMONSTER lite S12HT', { carrier: 'EMOBILE' }],
310-
S21HT: ['HTC', 'Touch Diamond S21HT', { carrier: 'EMOBILE' }],
311-
S22HT: ['HTC', 'Dual Diamond S22HT', { carrier: 'EMOBILE' }],
312-
X01HT: ['HTC', 'TyTN X01HT', { carrier: 'Softbank' }],
313-
X02HT: ['HTC', 'S630 X02HT', { carrier: 'Softbank' }],
314-
X03HT: ['HTC', 'S730 X03HT', { carrier: 'Softbank' }],
315-
X04HT: ['HTC', 'TOUCH DIAMOND X04HT', { carrier: 'Softbank' }],
316-
X05HT: ['HTC', 'TOUCH PRO X05HT', { carrier: 'Softbank' }],
304+
X01T: ['Toshiba', 'G900 X01T', { carrier: 'Softbank' }],
305+
'X02T!': ['Toshiba', 'dynapocket X02T', { carrier: 'Softbank' }],
306+
'KDDI-HT01': ['HTC', 'TOUCH PRO HT-01A', { carrier: 'au' }],
307+
HT01A: ['HTC', 'TOUCH PRO HT-01A', { carrier: 'au' }],
308+
S11HT: ['HTC', 'EMONSTER S11HT', { carrier: 'EMOBILE' }],
309+
S12HT: ['HTC', 'EMONSTER lite S12HT', { carrier: 'EMOBILE' }],
310+
S21HT: ['HTC', 'Touch Diamond S21HT', { carrier: 'EMOBILE' }],
311+
S22HT: ['HTC', 'Dual Diamond S22HT', { carrier: 'EMOBILE' }],
312+
X01HT: ['HTC', 'TyTN X01HT', { carrier: 'Softbank' }],
313+
X02HT: ['HTC', 'S630 X02HT', { carrier: 'Softbank' }],
314+
X03HT: ['HTC', 'S730 X03HT', { carrier: 'Softbank' }],
315+
X04HT: ['HTC', 'TOUCH DIAMOND X04HT', { carrier: 'Softbank' }],
316+
X05HT: ['HTC', 'TOUCH PRO X05HT', { carrier: 'Softbank' }],
317317
'SC-01B': ['Samsung', 'SC-01B', { carrier: 'DoCoMo' }],
318-
X01SC: ['Samsung', 'OMNIA Pro X01SC', { carrier: 'Softbank' }]
318+
X01SC: ['Samsung', 'OMNIA Pro X01SC', { carrier: 'Softbank' }]
319319
};
320320

321321
/* This file is automatically generated, do not edit manually! */

‎data/profiles.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7610,7 +7610,7 @@ exports.PROFILES = {
76107610
'http://wap1.huawei.com/uaprof/HW_HUAWEI_H891L.xml': ['Huawei', 'Pronto', 'Android', DeviceType.MOBILE],
76117611
'http://wap1.huawei.com/uaprof/HuaweiMediaPad_FDR-A04L.xml': [
76127612
'Huawei',
7613-
'Qua tab 02 HWT31',
7613+
'Qua tab 02 HWT31',
76147614
'Android',
76157615
DeviceType.MOBILE,
76167616
],
@@ -9342,7 +9342,7 @@ exports.PROFILES = {
93429342
'http://gsm.lge.com/html/gsm/L24-M3-D1.xml': ['LG', 'isai FL', 'Android', DeviceType.MOBILE],
93439343
'http://gsm.lge.com/html/gsm/YSdHbanpHC5h2R_E/V32-M3-D1.xml': [
93449344
'LG',
9345-
'isai vivid LGV32',
9345+
'isai vivid LGV32',
93469346
'Android',
93479347
DeviceType.MOBILE,
93489348
],
@@ -16891,7 +16891,7 @@ exports.PROFILES = {
1689116891
],
1689216892
'http://wap.samsungmobile.com/uaprof/SM-G610F.xml': ['Samsung', 'Galaxy J7 Prime', 'Android', DeviceType.MOBILE],
1689316893
'http://wap.samsungmobile.com/uaprof/SM-G610Y.xml': ['Samsung', 'Galaxy J7 Prime', 'Android', DeviceType.MOBILE],
16894-
'http://wap.samsungmobile.com/uaprof/SGH-N075T.xml': ['Samsung', 'GALAXY J SC-02F', 'Android', DeviceType.MOBILE],
16894+
'http://wap.samsungmobile.com/uaprof/SGH-N075T.xml': ['Samsung', 'GALAXY J SC-02F', 'Android', DeviceType.MOBILE],
1689516895
'http://wap.samsungmobile.com/uaprof/SM-C111.xml': ['Samsung', 'Galaxy K Zoom', 'Android', DeviceType.MOBILE],
1689616896
'http://wap.samsungmobile.com/uaprof/SM-C111M.xml': ['Samsung', 'Galaxy K Zoom', 'Android', DeviceType.MOBILE],
1689716897
'http://wap.samsungmobile.com/uaprof/SM-C115.xml': ['Samsung', 'Galaxy K Zoom', 'Android', DeviceType.MOBILE],
@@ -17663,7 +17663,7 @@ exports.PROFILES = {
1766317663
'http://wap.samsungmobile.com/uaprof/SM-N915W8.xml': ['Samsung', 'Galaxy Note Edge', 'Android', DeviceType.MOBILE],
1766417664
'http://wap.samsungmobile.com/uaprof/SCL24.xml': [
1766517665
'Samsung',
17666-
'GALAXY Note Edge SCL24',
17666+
'GALAXY Note Edge SCL24',
1766717667
'Android',
1766817668
DeviceType.MOBILE,
1766917669
],
@@ -19909,7 +19909,7 @@ exports.PROFILES = {
1990919909
'Android',
1991019910
DeviceType.MOBILE,
1991119911
],
19912-
'http://wap.samsungmobile.com/uaprof/SC-05G.xml': ['Samsung', 'GALAXY S6 SC-05G', 'Android', DeviceType.MOBILE],
19912+
'http://wap.samsungmobile.com/uaprof/SC-05G.xml': ['Samsung', 'GALAXY S6 SC-05G', 'Android', DeviceType.MOBILE],
1991319913
'http://device.sprintpcs.com/Samsung/SM-G930P-BOOST/PH7.rdf': [
1991419914
'Samsung',
1991519915
'Galaxy S7',

‎test/data/mobile/app-other.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
readable: 'a Nokia Lumia 1320 running Windows Phone 8.0'
4949
-
5050
headers: 'User-Agent: SonySO-02F Build/14.1.H.1.281 UEP/0.1 com.sonyericsson.updatecenter/2.0.3.A.0.2'
51-
readable: 'Sony Update Center on a Sony Xperia Z1 f SO-02F running Android'
52-
result: { browser: { name: 'Sony Update Center', type: app }, os: { name: Android }, device: { type: mobile, subtype: smart, manufacturer: Sony, model: 'Xperia Z1 f SO-02F', carrier: DoCoMo } }
51+
readable: 'Sony Update Center on a Sony Xperia Z1 f SO-02F running Android'
52+
result: { browser: { name: 'Sony Update Center', type: app }, os: { name: Android }, device: { type: mobile, subtype: smart, manufacturer: Sony, model: 'Xperia Z1 f SO-02F', carrier: DoCoMo } }
5353
-
5454
headers: 'User-Agent: AiMeiTuan /samsung-4.0.4-SHV-E120S-1280x720-320-4.1.2-116-358362043662925-market'
5555
readable: 'AiMeiTuan on a Samsung Galaxy S II HD LTE running Android 4.0.4'

‎test/data/mobile/app-search.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-
22
headers: 'User-Agent: YahooJMobileApp/1.1 (Android yjtop; 2.0.1) (samsung; SC-02C; samsung; SC-02C; 2.3.3/GINGERBREAD)'
3-
result: { browser: { name: 'Yahoo Mobile', version: 2.0.1, type: 'app:search' }, os: { name: Android, version: 2.3.3 }, device: { type: mobile, subtype: smart, manufacturer: Samsung, model: 'GALAXY S II SC-02C', carrier: DoCoMo } }
4-
readable: 'Yahoo Mobile 2.0.1 on a Samsung GALAXY S II SC-02C running Android 2.3.3'
3+
result: { browser: { name: 'Yahoo Mobile', version: 2.0.1, type: 'app:search' }, os: { name: Android, version: 2.3.3 }, device: { type: mobile, subtype: smart, manufacturer: Samsung, model: 'GALAXY S II SC-02C', carrier: DoCoMo } }
4+
readable: 'Yahoo Mobile 2.0.1 on a Samsung GALAXY S II SC-02C running Android 2.3.3'
55
-
66
headers: 'User-Agent: Mozilla/5.0 (Linux; Android 6.0.1; Le X527 Build/IMXOSOP5801910251S; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/49.0.2623.91 Mobile Safari/537.36 YandexSearch/7.15'
77
readable: 'Yandex Search 7.15 on a LeEco Le 2 X527 running Android 6.0.1'

‎test/data/mobile/browser-chrome.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
readable: 'Chrome 30 on an Asus Transformer Pad 300 running Android 4.0.3'
4141
-
4242
headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; F-10D Build/V20R47F) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.33 Mobile Safari/537.22'
43-
result: { browser: { name: Chrome, version: '25', type: browser }, engine: { name: Webkit, version: '537.22' }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS X F-10D', carrier: DoCoMo } }
44-
readable: 'Chrome 25 on a Fujitsu ARROWS X F-10D running Android 4.0.3'
43+
result: { browser: { name: Chrome, version: '25', type: browser }, engine: { name: Webkit, version: '537.22' }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS X F-10D', carrier: DoCoMo } }
44+
readable: 'Chrome 25 on a Fujitsu ARROWS X F-10D running Android 4.0.3'
4545
-
4646
headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; F-11D Build/V21R36A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.74 Mobile Safari/537.36'
47-
result: { browser: { name: Chrome, version: '27', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS Me F-11D', carrier: DoCoMo } }
48-
readable: 'Chrome 27 on a Fujitsu ARROWS Me F-11D running Android 4.0.3'
47+
result: { browser: { name: Chrome, version: '27', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS Me F-11D', carrier: DoCoMo } }
48+
readable: 'Chrome 27 on a Fujitsu ARROWS Me F-11D running Android 4.0.3'
4949
-
5050
headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; FZ-A1B Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Safari/537.36'
5151
result: { browser: { name: Chrome, version: '31', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: tablet, manufacturer: Panasonic, model: 'Toughpad FZ-A1' } }
@@ -64,20 +64,20 @@
6464
readable: 'Chrome 38 on a HTC Raider 4G running Android 4.0.3'
6565
-
6666
headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; ISW12HT Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.111 Mobile Safari/537.36'
67-
result: { browser: { name: Chrome, version: '42', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: HTC, model: 'EVO 3D ISW12HT', carrier: au } }
68-
readable: 'Chrome 42 on a HTC EVO 3D ISW12HT running Android 4.0.3'
67+
result: { browser: { name: Chrome, version: '42', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: HTC, model: 'EVO 3D ISW12HT', carrier: au } }
68+
readable: 'Chrome 42 on a HTC EVO 3D ISW12HT running Android 4.0.3'
6969
-
7070
headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; ISW13F Build/V77R60B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.102 Mobile Safari/537.36'
71-
result: { browser: { name: Chrome, version: '38', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS Z ISW13F', carrier: au } }
72-
readable: 'Chrome 38 on a Fujitsu ARROWS Z ISW13F running Android 4.0.3'
71+
result: { browser: { name: Chrome, version: '38', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS Z ISW13F', carrier: au } }
72+
readable: 'Chrome 38 on a Fujitsu ARROWS Z ISW13F running Android 4.0.3'
7373
-
7474
headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; Lenovo S880 Build/IML74K) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.123 Mobile Safari/537.22'
7575
result: { browser: { name: Chrome, version: '25', type: browser }, engine: { name: Webkit, version: '537.22' }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Lenovo, model: S880 } }
7676
readable: 'Chrome 25 on a Lenovo S880 running Android 4.0.3'
7777
-
7878
headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; SC-02C Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.136 Mobile Safari/537.36'
79-
result: { browser: { name: Chrome, version: '33', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Samsung, model: 'GALAXY S II SC-02C', carrier: DoCoMo } }
80-
readable: 'Chrome 33 on a Samsung GALAXY S II SC-02C running Android 4.0.3'
79+
result: { browser: { name: Chrome, version: '33', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Samsung, model: 'GALAXY S II SC-02C', carrier: DoCoMo } }
80+
readable: 'Chrome 33 on a Samsung GALAXY S II SC-02C running Android 4.0.3'
8181
-
8282
headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; Sony Tablet S Build/TISU0143) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.114 Safari/537.36'
8383
result: { browser: { name: Chrome, version: '38', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: tablet, manufacturer: Sony, model: 'Tablet S' } }

‎test/data/mobile/browser-jig.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
readable: 'Jig Browser 8.1.6 on a Sharp 934SH'
2525
-
2626
headers: 'User-Agent: Mozilla/4.0 (jig browser web; 1.0.0; SN3F)'
27-
result: { browser: { name: 'Jig Browser', version: 1.0.0, type: browser }, device: { type: mobile, subtype: feature, manufacturer: 'Sony Ericsson', model: re W63S, carrier: au } }
28-
readable: 'Jig Browser 1.0.0 on a Sony Ericsson re W63S'
27+
result: { browser: { name: 'Jig Browser', version: 1.0.0, type: browser }, device: { type: mobile, subtype: feature, manufacturer: 'Sony Ericsson', model: re W63S, carrier: au } }
28+
readable: 'Jig Browser 1.0.0 on a Sony Ericsson re W63S'
2929
-
3030
headers: 'User-Agent: Mozilla/4.0 (jig browser web; 1.0.4; 706P)'
3131
result: { browser: { name: 'Jig Browser', version: 1.0.4, type: browser }, device: { type: mobile, subtype: feature, manufacturer: Panasonic, model: 706P, carrier: Softbank } }

0 commit comments

Comments
 (0)