Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix windows family recognition #286

Merged
merged 6 commits into from
Dec 7, 2017
Merged

Fix windows family recognition #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c5a893
Fix test and add new case for iPhone
theikkila Nov 29, 2017
6318cae
Fix regexps and tests for recognizing windows majors better
theikkila Nov 29, 2017
85541f7
Point to reference implementation where there is replacements support…
theikkila Nov 29, 2017
da6f582
Update package.json to point public repo
theikkila Nov 29, 2017
e59b11b
Update package.json
theikkila Dec 7, 2017
176e9a1
Update package.json
theikkila Dec 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"devDependencies": {
"yamlparser": ">=0.0.2",
"mocha": "*",
"uap-ref-impl": "*"
"uap-ref-impl": "ua-parser/uap-ref-impl"
},
"scripts": {
"test": "mocha -u tdd -R min ./tests/test.js"
Expand Down
58 changes: 41 additions & 17 deletions regexes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,55 +848,75 @@ os_parsers:
os_replacement: 'Windows Mobile'

- regex: '(Windows (?:NT 5\.2|NT 5\.1))'
os_replacement: 'Windows XP'
os_replacement: 'Windows'
os_v1_replacement: 'XP'

- regex: '(Windows NT 6\.1)'
os_replacement: 'Windows 7'
os_replacement: 'Windows'
os_v1_replacement: '7'

- regex: '(Windows NT 6\.0)'
os_replacement: 'Windows Vista'
os_replacement: 'Windows'
os_v1_replacement: 'Vista'

- regex: '(Win 9x 4\.90)'
os_replacement: 'Windows ME'
os_replacement: 'Windows'
os_v1_replacement: 'ME'

- regex: '(Windows 98|Windows XP|Windows ME|Windows 95|Windows CE|Windows 7|Windows NT 4\.0|Windows Vista|Windows 2000|Windows 3.1)'

- regex: '(Windows NT 6\.2; ARM;)'
os_replacement: 'Windows RT'
os_replacement: 'Windows'
os_v1_replacement: 'RT'

- regex: '(Windows NT 6\.2)'
os_replacement: 'Windows 8'
os_replacement: 'Windows'
os_v1_replacement: '8'

- regex: '(Windows NT 6\.3; ARM;)'
os_replacement: 'Windows RT 8.1'
os_replacement: 'Windows'
os_v1_replacement: 'RT 8.1'

- regex: '(Windows NT 6\.3)'
os_replacement: 'Windows 8.1'
os_replacement: 'Windows'
os_v1_replacement: '8.1'

- regex: '(Windows NT 6\.4)'
os_replacement: 'Windows 10'
os_replacement: 'Windows'
os_v1_replacement: '10'

- regex: '(Windows NT 10\.0)'
os_replacement: 'Windows 10'
os_replacement: 'Windows'
os_v1_replacement: '10'

- regex: '(Windows NT 5\.0)'
os_replacement: 'Windows 2000'
os_replacement: 'Windows'
os_v1_replacement: '2000'

- regex: '(WinNT4.0)'
os_replacement: 'Windows NT 4.0'
os_replacement: 'Windows'
os_v1_replacement: 'NT 4.0'

- regex: '(Windows ?CE)'
os_replacement: 'Windows CE'
os_replacement: 'Windows'
os_v1_replacement: 'CE'

- regex: 'Win ?(95|98|3.1|NT|ME|2000)'
os_replacement: 'Windows $1'
os_replacement: 'Windows'
os_v1_replacement: '$1'

- regex: 'Win16'
os_replacement: 'Windows 3.1'
os_replacement: 'Windows'
os_v1_replacement: '3.1'

- regex: 'Win32'
os_replacement: 'Windows 95'
os_replacement: 'Windows'
os_v1_replacement: '95'

# Box apps (Drive, Sync, Notes) on Windows https://www.box.com/resources/downloads
- regex: '^Box.*Windows/([\d.]+);'
os_replacement: 'Windows $1'
os_replacement: 'Windows'
os_v1_replacement: '$1'

##########
# Tizen OS from Samsung
Expand Down Expand Up @@ -4582,6 +4602,10 @@ device_parsers:
device_replacement: '$1'
brand_replacement: 'Apple'
model_replacement: '$1'
- regex: 'iPhone'
device_replacement: 'iPhone'
brand_replacement: 'Apple'
model_replacement: 'iPhone'
# @note: desktop applications show device info
- regex: 'CFNetwork/.* Darwin/\d.*\(((?:Mac|iMac|PowerMac|PowerBook)[^\d]*)(\d+)(?:,|%2C)(\d+)'
device_replacement: '$1$2,$3'
Expand Down
11 changes: 8 additions & 3 deletions tests/test_device.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,9 @@ test_cases:
model:

- user_agent_string: 'MQQBrowser/371 Mozilla/5.0 (iPhone 4S; CPU iPhone OS 6_0_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Mobile/10A523 Safari/7534.48.3'
family: 'Generic Smartphone'
brand: 'Generic'
model: 'Smartphone'
family: 'iPhone'
brand: 'Apple'
model: 'iPhone'

- user_agent_string: 'Opera/9.80 (VRE; Opera Mini/4.2/28.2794; U; en) Presto/2.8.119 Version/11.10'
family: 'Generic Feature Phone'
Expand Down Expand Up @@ -80000,6 +80000,11 @@ test_cases:
brand: 'Gionee'
model: 'GN3003'

- user_agent_string: 'Mozilla/5.0 (iPhone## CPU iPhone OS 10_2 like Mac OS X) AppleWebKit/602.3.12 (KHTML, like Gecko) Mobile/14C92'
family: 'iPhone'
brand: 'Apple'
model: 'iPhone'

- user_agent_string: 'Mozilla/5.0 (Android) ownCloud-android/2.0.0'
family: 'Generic Smartphone'
brand: 'Generic'
Expand Down
Loading