From c81bc36b54800cc79e03228544fef598eaf134b4 Mon Sep 17 00:00:00 2001 From: Giedo Donkers Date: Tue, 20 Oct 2015 12:24:41 +0200 Subject: [PATCH 1/2] Added Spliting of Windows and version Like OS X --- regexes.yaml | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/regexes.yaml b/regexes.yaml index f9ff7215..20474fd0 100644 --- a/regexes.yaml +++ b/regexes.yaml @@ -637,52 +637,67 @@ os_parsers: # ie mobile desktop mode # spoofs nt 6.1. must come before windows 7 - regex: '(XBLWP7)' - os_replacement: 'Windows Phone' + os_replacement: 'Windows' + os_v1_replacement: 'Phone' # @note: This needs to come before Windows NT 6.1 - regex: '(Windows ?Mobile)' - os_replacement: 'Windows Mobile' + os_replacement: 'Windows' + os_v1_replacement: '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' - 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 RT' + os_v1_replacement: '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 NT' + os_v1_replacement: '4.0' - regex: '(Windows ?CE)' os_replacement: 'Windows 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' From bad516f64741e907a12fcdb68d8593d50b93ce0c Mon Sep 17 00:00:00 2001 From: Giedo Donkers Date: Tue, 5 Apr 2016 15:47:43 +0200 Subject: [PATCH 2/2] Revert "Added Spliting of Windows and version" This reverts commit c81bc36b54800cc79e03228544fef598eaf134b4. --- regexes.yaml | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/regexes.yaml b/regexes.yaml index 20474fd0..f9ff7215 100644 --- a/regexes.yaml +++ b/regexes.yaml @@ -637,67 +637,52 @@ os_parsers: # ie mobile desktop mode # spoofs nt 6.1. must come before windows 7 - regex: '(XBLWP7)' - os_replacement: 'Windows' - os_v1_replacement: 'Phone' + os_replacement: 'Windows Phone' # @note: This needs to come before Windows NT 6.1 - regex: '(Windows ?Mobile)' - os_replacement: 'Windows' - os_v1_replacement: 'Mobile' + os_replacement: 'Windows Mobile' - regex: '(Windows (?:NT 5\.2|NT 5\.1))' - os_replacement: 'Windows' - os_v1_replacement: 'XP' + os_replacement: 'Windows XP' - regex: '(Windows NT 6\.1)' - os_replacement: 'Windows' - os_v1_replacement: '7' + os_replacement: 'Windows 7' - regex: '(Windows NT 6\.0)' - os_replacement: 'Windows' - os_v1_replacement: 'Vista' + os_replacement: 'Windows Vista' - regex: '(Win 9x 4\.90)' - os_replacement: 'Windows' - os_v1_replacement: 'ME' + os_replacement: 'Windows 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' - regex: '(Windows NT 6\.2)' - os_replacement: 'Windows' - os_v1_replacement: '8' + os_replacement: 'Windows 8' - regex: '(Windows NT 6\.3; ARM;)' - os_replacement: 'Windows RT' - os_v1_replacement: '8.1' + os_replacement: 'Windows RT 8.1' - regex: '(Windows NT 6\.3)' - os_replacement: 'Windows' - os_v1_replacement: '8.1' + os_replacement: 'Windows 8.1' - regex: '(Windows NT 6\.4)' - os_replacement: 'Windows' - os_v1_replacement: '10' - + os_replacement: 'Windows 10' - regex: '(Windows NT 10\.0)' - os_replacement: 'Windows' - os_v1_replacement: '10' + os_replacement: 'Windows 10' - regex: '(Windows NT 5\.0)' - os_replacement: 'Windows' - os_v1_replacement: '2000' + os_replacement: 'Windows 2000' - regex: '(WinNT4.0)' - os_replacement: 'Windows NT' - os_v1_replacement: '4.0' + os_replacement: 'Windows NT 4.0' - regex: '(Windows ?CE)' os_replacement: 'Windows CE' - regex: 'Win ?(95|98|3.1|NT|ME|2000)' - os_replacement: 'Windows' - os_v1_replacement: '$1' + os_replacement: 'Windows $1' - regex: 'Win16' os_replacement: 'Windows 3.1'