Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 setup.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
setup(
name='useragentutils',
packages=['useragentutils'],
version='0.2.4',
version='0.2.5',
description='Python port of the Java user-agent-utils lib',
author='Derek Brans',
author_email='dbrans@gmail.com',
Expand Down
259 changes: 255 additions & 4 deletions useragentutils/operating_system.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,17 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

WINDOWS_10 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=24,
name='Windows 10',
aliases=['Windows NT 6.4', 'Windows NT 10'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)

WINDOWS_81 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand All@@ -44,7 +55,7 @@ class OperatingSystem(BaseProduct):
versionId=22,
name='Windows 8',
aliases=['Windows NT 6.2'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)
Expand All@@ -56,7 +67,7 @@ class OperatingSystem(BaseProduct):
versionId=21,
name='Windows 7',
aliases=['Windows NT 6.1'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -67,7 +78,7 @@ class OperatingSystem(BaseProduct):
versionId=20,
name='Windows Vista',
aliases=['Windows NT 6'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -93,7 +104,47 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

XBOX_OS = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=62,
name='Xbox OS',
aliases=['Xbox', 'Xbox One'],
exclude=None,
deviceType=DeviceType.GAME_CONSOLE,
versionRegexString=None)

# before Win
WINDOWS_10_MOBILE = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=54,
name='Windows Phone 10',
aliases=['Windows Phone 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8_1 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=53,
name='Windows Phone 8.1',
aliases=['Windows Phone 8.1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=52,
name='Windows Phone 8',
aliases=['Windows Phone 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_MOBILE7 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand DownExpand Up@@ -136,10 +187,100 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

# Chrome OS by Google, mostly used on Chromebooks and Chromeboxes
CHROME_OS = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=None,
versionId=1000,
name='Chrome OS',
aliases=['CrOS'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

#
# First Android 4 device is the Galaxy Nexus phone. Once there are also Tablets with Android 4 we we will have to
# find a solution to distinguish between mobile phones and tablets.
#
ANDROID8 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=8,
name='Android 8.x',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID8_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID8,
versionId=80,
name='Android 8.x Tablet',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID7 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=7,
name='Android 7.x',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID7_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID7,
versionId=70,
name='Android 7.x Tablet',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID6 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=6,
name='Android 6.x',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID6_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID6,
versionId=60,
name='Android 6.x Tablet',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID5 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=5,
name='Android 5.x',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID5_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID5,
versionId=50,
name='Android 5.x Tablet',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID4 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
Expand All@@ -156,7 +297,7 @@ class OperatingSystem(BaseProduct):
parent=ANDROID4,
versionId=40,
name='Android 4.x Tablet',
aliases=['Xoom', 'Transformer'],
aliases=['Xoom', 'Transformer', 'Android 4', 'Android-4'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)
Expand DownExpand Up@@ -241,6 +382,106 @@ class OperatingSystem(BaseProduct):
versionRegexString=None)

# before MAC_OS_X_IPHONE for all older versions
iOS11_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=92,
name='iOS 11 (iPhone)',
aliases=['iPhone OS 11'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS10_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=91,
name='iOS 10 (iPhone)',
aliases=['iPhone OS 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS9_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=90,
name='iOS 9 (iPhone)',
aliases=['iPhone OS 9'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_4_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=49,
name='iOS 8.4 (iPhone)',
aliases=['iPhone OS 8_4'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_3_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=48,
name='iOS 8.3 (iPhone)',
aliases=['iPhone OS 8_3'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_2_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=47,
name='iOS 8.2 (iPhone)',
aliases=['iPhone OS 8_2'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_1_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=46,
name='iOS 8.1 (iPhone)',
aliases=['iPhone OS 8_1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=45,
name='iOS 8 (iPhone)',
aliases=['iPhone OS 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS7_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=44,
name='iOS 7 (iPhone)',
aliases=['iPhone OS 7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS6_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=43,
name='iOS 6 (iPhone)',
aliases=['iPhone OS 6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS5_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
Expand DownExpand Up@@ -554,6 +795,16 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY10 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
versionId=10,
name='BlackBerry 10',
aliases=['BB10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY7 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Updated list of OS's by razius · Pull Request #11 · krux/python-useragentutils · GitHub
Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 setup.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
setup(
name='useragentutils',
packages=['useragentutils'],
version='0.2.4',
version='0.2.5',
description='Python port of the Java user-agent-utils lib',
author='Derek Brans',
author_email='dbrans@gmail.com',
Expand Down
259 changes: 255 additions & 4 deletions useragentutils/operating_system.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,17 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

WINDOWS_10 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=24,
name='Windows 10',
aliases=['Windows NT 6.4', 'Windows NT 10'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)

WINDOWS_81 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand All@@ -44,7 +55,7 @@ class OperatingSystem(BaseProduct):
versionId=22,
name='Windows 8',
aliases=['Windows NT 6.2'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)
Expand All@@ -56,7 +67,7 @@ class OperatingSystem(BaseProduct):
versionId=21,
name='Windows 7',
aliases=['Windows NT 6.1'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -67,7 +78,7 @@ class OperatingSystem(BaseProduct):
versionId=20,
name='Windows Vista',
aliases=['Windows NT 6'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -93,7 +104,47 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

XBOX_OS = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=62,
name='Xbox OS',
aliases=['Xbox', 'Xbox One'],
exclude=None,
deviceType=DeviceType.GAME_CONSOLE,
versionRegexString=None)

# before Win
WINDOWS_10_MOBILE = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=54,
name='Windows Phone 10',
aliases=['Windows Phone 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8_1 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=53,
name='Windows Phone 8.1',
aliases=['Windows Phone 8.1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=52,
name='Windows Phone 8',
aliases=['Windows Phone 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_MOBILE7 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand DownExpand Up@@ -136,10 +187,100 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

# Chrome OS by Google, mostly used on Chromebooks and Chromeboxes
CHROME_OS = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=None,
versionId=1000,
name='Chrome OS',
aliases=['CrOS'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

#
# First Android 4 device is the Galaxy Nexus phone. Once there are also Tablets with Android 4 we we will have to
# find a solution to distinguish between mobile phones and tablets.
#
ANDROID8 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=8,
name='Android 8.x',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID8_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID8,
versionId=80,
name='Android 8.x Tablet',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID7 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=7,
name='Android 7.x',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID7_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID7,
versionId=70,
name='Android 7.x Tablet',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID6 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=6,
name='Android 6.x',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID6_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID6,
versionId=60,
name='Android 6.x Tablet',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID5 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=5,
name='Android 5.x',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID5_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID5,
versionId=50,
name='Android 5.x Tablet',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID4 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
Expand All@@ -156,7 +297,7 @@ class OperatingSystem(BaseProduct):
parent=ANDROID4,
versionId=40,
name='Android 4.x Tablet',
aliases=['Xoom', 'Transformer'],
aliases=['Xoom', 'Transformer', 'Android 4', 'Android-4'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)
Expand DownExpand Up@@ -241,6 +382,106 @@ class OperatingSystem(BaseProduct):
versionRegexString=None)

# before MAC_OS_X_IPHONE for all older versions
iOS11_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=92,
name='iOS 11 (iPhone)',
aliases=['iPhone OS 11'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS10_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=91,
name='iOS 10 (iPhone)',
aliases=['iPhone OS 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS9_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=90,
name='iOS 9 (iPhone)',
aliases=['iPhone OS 9'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_4_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=49,
name='iOS 8.4 (iPhone)',
aliases=['iPhone OS 8_4'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_3_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=48,
name='iOS 8.3 (iPhone)',
aliases=['iPhone OS 8_3'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_2_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=47,
name='iOS 8.2 (iPhone)',
aliases=['iPhone OS 8_2'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_1_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=46,
name='iOS 8.1 (iPhone)',
aliases=['iPhone OS 8_1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=45,
name='iOS 8 (iPhone)',
aliases=['iPhone OS 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS7_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=44,
name='iOS 7 (iPhone)',
aliases=['iPhone OS 7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS6_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=43,
name='iOS 6 (iPhone)',
aliases=['iPhone OS 6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS5_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
Expand DownExpand Up@@ -554,6 +795,16 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY10 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
versionId=10,
name='BlackBerry 10',
aliases=['BB10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY7 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Updated list of OS's by razius · Pull Request #11 · krux/python-useragentutils · GitHub
Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 setup.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
setup(
name='useragentutils',
packages=['useragentutils'],
version='0.2.4',
version='0.2.5',
description='Python port of the Java user-agent-utils lib',
author='Derek Brans',
author_email='dbrans@gmail.com',
Expand Down
259 changes: 255 additions & 4 deletions useragentutils/operating_system.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,17 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

WINDOWS_10 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=24,
name='Windows 10',
aliases=['Windows NT 6.4', 'Windows NT 10'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)

WINDOWS_81 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand All@@ -44,7 +55,7 @@ class OperatingSystem(BaseProduct):
versionId=22,
name='Windows 8',
aliases=['Windows NT 6.2'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)
Expand All@@ -56,7 +67,7 @@ class OperatingSystem(BaseProduct):
versionId=21,
name='Windows 7',
aliases=['Windows NT 6.1'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -67,7 +78,7 @@ class OperatingSystem(BaseProduct):
versionId=20,
name='Windows Vista',
aliases=['Windows NT 6'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -93,7 +104,47 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

XBOX_OS = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=62,
name='Xbox OS',
aliases=['Xbox', 'Xbox One'],
exclude=None,
deviceType=DeviceType.GAME_CONSOLE,
versionRegexString=None)

# before Win
WINDOWS_10_MOBILE = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=54,
name='Windows Phone 10',
aliases=['Windows Phone 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8_1 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=53,
name='Windows Phone 8.1',
aliases=['Windows Phone 8.1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=52,
name='Windows Phone 8',
aliases=['Windows Phone 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_MOBILE7 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand DownExpand Up@@ -136,10 +187,100 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

# Chrome OS by Google, mostly used on Chromebooks and Chromeboxes
CHROME_OS = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=None,
versionId=1000,
name='Chrome OS',
aliases=['CrOS'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

#
# First Android 4 device is the Galaxy Nexus phone. Once there are also Tablets with Android 4 we we will have to
# find a solution to distinguish between mobile phones and tablets.
#
ANDROID8 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=8,
name='Android 8.x',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID8_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID8,
versionId=80,
name='Android 8.x Tablet',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID7 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=7,
name='Android 7.x',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID7_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID7,
versionId=70,
name='Android 7.x Tablet',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID6 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=6,
name='Android 6.x',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID6_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID6,
versionId=60,
name='Android 6.x Tablet',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID5 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=5,
name='Android 5.x',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID5_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID5,
versionId=50,
name='Android 5.x Tablet',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID4 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
Expand All@@ -156,7 +297,7 @@ class OperatingSystem(BaseProduct):
parent=ANDROID4,
versionId=40,
name='Android 4.x Tablet',
aliases=['Xoom', 'Transformer'],
aliases=['Xoom', 'Transformer', 'Android 4', 'Android-4'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)
Expand DownExpand Up@@ -241,6 +382,106 @@ class OperatingSystem(BaseProduct):
versionRegexString=None)

# before MAC_OS_X_IPHONE for all older versions
iOS11_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=92,
name='iOS 11 (iPhone)',
aliases=['iPhone OS 11'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS10_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=91,
name='iOS 10 (iPhone)',
aliases=['iPhone OS 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS9_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=90,
name='iOS 9 (iPhone)',
aliases=['iPhone OS 9'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_4_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=49,
name='iOS 8.4 (iPhone)',
aliases=['iPhone OS 8_4'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_3_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=48,
name='iOS 8.3 (iPhone)',
aliases=['iPhone OS 8_3'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_2_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=47,
name='iOS 8.2 (iPhone)',
aliases=['iPhone OS 8_2'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_1_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=46,
name='iOS 8.1 (iPhone)',
aliases=['iPhone OS 8_1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=45,
name='iOS 8 (iPhone)',
aliases=['iPhone OS 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS7_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=44,
name='iOS 7 (iPhone)',
aliases=['iPhone OS 7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS6_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=43,
name='iOS 6 (iPhone)',
aliases=['iPhone OS 6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS5_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
Expand DownExpand Up@@ -554,6 +795,16 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY10 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
versionId=10,
name='BlackBerry 10',
aliases=['BB10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY7 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Updated list of OS's by razius · Pull Request #11 · krux/python-useragentutils · GitHub
Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 setup.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
setup(
name='useragentutils',
packages=['useragentutils'],
version='0.2.4',
version='0.2.5',
description='Python port of the Java user-agent-utils lib',
author='Derek Brans',
author_email='dbrans@gmail.com',
Expand Down
259 changes: 255 additions & 4 deletions useragentutils/operating_system.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,17 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

WINDOWS_10 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=24,
name='Windows 10',
aliases=['Windows NT 6.4', 'Windows NT 10'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)

WINDOWS_81 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand All@@ -44,7 +55,7 @@ class OperatingSystem(BaseProduct):
versionId=22,
name='Windows 8',
aliases=['Windows NT 6.2'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)
Expand All@@ -56,7 +67,7 @@ class OperatingSystem(BaseProduct):
versionId=21,
name='Windows 7',
aliases=['Windows NT 6.1'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -67,7 +78,7 @@ class OperatingSystem(BaseProduct):
versionId=20,
name='Windows Vista',
aliases=['Windows NT 6'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -93,7 +104,47 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

XBOX_OS = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=62,
name='Xbox OS',
aliases=['Xbox', 'Xbox One'],
exclude=None,
deviceType=DeviceType.GAME_CONSOLE,
versionRegexString=None)

# before Win
WINDOWS_10_MOBILE = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=54,
name='Windows Phone 10',
aliases=['Windows Phone 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8_1 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=53,
name='Windows Phone 8.1',
aliases=['Windows Phone 8.1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=52,
name='Windows Phone 8',
aliases=['Windows Phone 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_MOBILE7 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand DownExpand Up@@ -136,10 +187,100 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

# Chrome OS by Google, mostly used on Chromebooks and Chromeboxes
CHROME_OS = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=None,
versionId=1000,
name='Chrome OS',
aliases=['CrOS'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

#
# First Android 4 device is the Galaxy Nexus phone. Once there are also Tablets with Android 4 we we will have to
# find a solution to distinguish between mobile phones and tablets.
#
ANDROID8 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=8,
name='Android 8.x',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID8_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID8,
versionId=80,
name='Android 8.x Tablet',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID7 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=7,
name='Android 7.x',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID7_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID7,
versionId=70,
name='Android 7.x Tablet',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID6 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=6,
name='Android 6.x',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID6_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID6,
versionId=60,
name='Android 6.x Tablet',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID5 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=5,
name='Android 5.x',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID5_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID5,
versionId=50,
name='Android 5.x Tablet',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID4 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
Expand All@@ -156,7 +297,7 @@ class OperatingSystem(BaseProduct):
parent=ANDROID4,
versionId=40,
name='Android 4.x Tablet',
aliases=['Xoom', 'Transformer'],
aliases=['Xoom', 'Transformer', 'Android 4', 'Android-4'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)
Expand DownExpand Up@@ -241,6 +382,106 @@ class OperatingSystem(BaseProduct):
versionRegexString=None)

# before MAC_OS_X_IPHONE for all older versions
iOS11_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=92,
name='iOS 11 (iPhone)',
aliases=['iPhone OS 11'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS10_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=91,
name='iOS 10 (iPhone)',
aliases=['iPhone OS 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS9_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=90,
name='iOS 9 (iPhone)',
aliases=['iPhone OS 9'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_4_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=49,
name='iOS 8.4 (iPhone)',
aliases=['iPhone OS 8_4'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_3_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=48,
name='iOS 8.3 (iPhone)',
aliases=['iPhone OS 8_3'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_2_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=47,
name='iOS 8.2 (iPhone)',
aliases=['iPhone OS 8_2'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_1_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=46,
name='iOS 8.1 (iPhone)',
aliases=['iPhone OS 8_1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=45,
name='iOS 8 (iPhone)',
aliases=['iPhone OS 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS7_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=44,
name='iOS 7 (iPhone)',
aliases=['iPhone OS 7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS6_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=43,
name='iOS 6 (iPhone)',
aliases=['iPhone OS 6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS5_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
Expand DownExpand Up@@ -554,6 +795,16 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY10 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
versionId=10,
name='BlackBerry 10',
aliases=['BB10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY7 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Updated list of OS's by razius · Pull Request #11 · krux/python-useragentutils · GitHub
Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 setup.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
setup(
name='useragentutils',
packages=['useragentutils'],
version='0.2.4',
version='0.2.5',
description='Python port of the Java user-agent-utils lib',
author='Derek Brans',
author_email='dbrans@gmail.com',
Expand Down
259 changes: 255 additions & 4 deletions useragentutils/operating_system.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,17 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

WINDOWS_10 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=24,
name='Windows 10',
aliases=['Windows NT 6.4', 'Windows NT 10'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)

WINDOWS_81 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand All@@ -44,7 +55,7 @@ class OperatingSystem(BaseProduct):
versionId=22,
name='Windows 8',
aliases=['Windows NT 6.2'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)
Expand All@@ -56,7 +67,7 @@ class OperatingSystem(BaseProduct):
versionId=21,
name='Windows 7',
aliases=['Windows NT 6.1'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -67,7 +78,7 @@ class OperatingSystem(BaseProduct):
versionId=20,
name='Windows Vista',
aliases=['Windows NT 6'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -93,7 +104,47 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

XBOX_OS = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=62,
name='Xbox OS',
aliases=['Xbox', 'Xbox One'],
exclude=None,
deviceType=DeviceType.GAME_CONSOLE,
versionRegexString=None)

# before Win
WINDOWS_10_MOBILE = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=54,
name='Windows Phone 10',
aliases=['Windows Phone 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8_1 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=53,
name='Windows Phone 8.1',
aliases=['Windows Phone 8.1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=52,
name='Windows Phone 8',
aliases=['Windows Phone 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_MOBILE7 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand DownExpand Up@@ -136,10 +187,100 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

# Chrome OS by Google, mostly used on Chromebooks and Chromeboxes
CHROME_OS = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=None,
versionId=1000,
name='Chrome OS',
aliases=['CrOS'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

#
# First Android 4 device is the Galaxy Nexus phone. Once there are also Tablets with Android 4 we we will have to
# find a solution to distinguish between mobile phones and tablets.
#
ANDROID8 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=8,
name='Android 8.x',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID8_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID8,
versionId=80,
name='Android 8.x Tablet',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID7 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=7,
name='Android 7.x',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID7_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID7,
versionId=70,
name='Android 7.x Tablet',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID6 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=6,
name='Android 6.x',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID6_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID6,
versionId=60,
name='Android 6.x Tablet',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID5 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=5,
name='Android 5.x',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID5_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID5,
versionId=50,
name='Android 5.x Tablet',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID4 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
Expand All@@ -156,7 +297,7 @@ class OperatingSystem(BaseProduct):
parent=ANDROID4,
versionId=40,
name='Android 4.x Tablet',
aliases=['Xoom', 'Transformer'],
aliases=['Xoom', 'Transformer', 'Android 4', 'Android-4'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)
Expand DownExpand Up@@ -241,6 +382,106 @@ class OperatingSystem(BaseProduct):
versionRegexString=None)

# before MAC_OS_X_IPHONE for all older versions
iOS11_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=92,
name='iOS 11 (iPhone)',
aliases=['iPhone OS 11'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS10_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=91,
name='iOS 10 (iPhone)',
aliases=['iPhone OS 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS9_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=90,
name='iOS 9 (iPhone)',
aliases=['iPhone OS 9'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_4_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=49,
name='iOS 8.4 (iPhone)',
aliases=['iPhone OS 8_4'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_3_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=48,
name='iOS 8.3 (iPhone)',
aliases=['iPhone OS 8_3'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_2_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=47,
name='iOS 8.2 (iPhone)',
aliases=['iPhone OS 8_2'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_1_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=46,
name='iOS 8.1 (iPhone)',
aliases=['iPhone OS 8_1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=45,
name='iOS 8 (iPhone)',
aliases=['iPhone OS 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS7_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=44,
name='iOS 7 (iPhone)',
aliases=['iPhone OS 7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS6_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=43,
name='iOS 6 (iPhone)',
aliases=['iPhone OS 6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS5_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
Expand DownExpand Up@@ -554,6 +795,16 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY10 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
versionId=10,
name='BlackBerry 10',
aliases=['BB10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY7 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Updated list of OS's by razius · Pull Request #11 · krux/python-useragentutils · GitHub
Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 setup.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
setup(
name='useragentutils',
packages=['useragentutils'],
version='0.2.4',
version='0.2.5',
description='Python port of the Java user-agent-utils lib',
author='Derek Brans',
author_email='dbrans@gmail.com',
Expand Down
259 changes: 255 additions & 4 deletions useragentutils/operating_system.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,17 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

WINDOWS_10 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=24,
name='Windows 10',
aliases=['Windows NT 6.4', 'Windows NT 10'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)

WINDOWS_81 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand All@@ -44,7 +55,7 @@ class OperatingSystem(BaseProduct):
versionId=22,
name='Windows 8',
aliases=['Windows NT 6.2'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)
Expand All@@ -56,7 +67,7 @@ class OperatingSystem(BaseProduct):
versionId=21,
name='Windows 7',
aliases=['Windows NT 6.1'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -67,7 +78,7 @@ class OperatingSystem(BaseProduct):
versionId=20,
name='Windows Vista',
aliases=['Windows NT 6'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -93,7 +104,47 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

XBOX_OS = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=62,
name='Xbox OS',
aliases=['Xbox', 'Xbox One'],
exclude=None,
deviceType=DeviceType.GAME_CONSOLE,
versionRegexString=None)

# before Win
WINDOWS_10_MOBILE = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=54,
name='Windows Phone 10',
aliases=['Windows Phone 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8_1 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=53,
name='Windows Phone 8.1',
aliases=['Windows Phone 8.1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=52,
name='Windows Phone 8',
aliases=['Windows Phone 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_MOBILE7 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand DownExpand Up@@ -136,10 +187,100 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

# Chrome OS by Google, mostly used on Chromebooks and Chromeboxes
CHROME_OS = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=None,
versionId=1000,
name='Chrome OS',
aliases=['CrOS'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

#
# First Android 4 device is the Galaxy Nexus phone. Once there are also Tablets with Android 4 we we will have to
# find a solution to distinguish between mobile phones and tablets.
#
ANDROID8 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=8,
name='Android 8.x',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID8_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID8,
versionId=80,
name='Android 8.x Tablet',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID7 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=7,
name='Android 7.x',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID7_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID7,
versionId=70,
name='Android 7.x Tablet',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID6 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=6,
name='Android 6.x',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID6_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID6,
versionId=60,
name='Android 6.x Tablet',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID5 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=5,
name='Android 5.x',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID5_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID5,
versionId=50,
name='Android 5.x Tablet',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID4 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
Expand All@@ -156,7 +297,7 @@ class OperatingSystem(BaseProduct):
parent=ANDROID4,
versionId=40,
name='Android 4.x Tablet',
aliases=['Xoom', 'Transformer'],
aliases=['Xoom', 'Transformer', 'Android 4', 'Android-4'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)
Expand DownExpand Up@@ -241,6 +382,106 @@ class OperatingSystem(BaseProduct):
versionRegexString=None)

# before MAC_OS_X_IPHONE for all older versions
iOS11_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=92,
name='iOS 11 (iPhone)',
aliases=['iPhone OS 11'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS10_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=91,
name='iOS 10 (iPhone)',
aliases=['iPhone OS 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS9_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=90,
name='iOS 9 (iPhone)',
aliases=['iPhone OS 9'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_4_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=49,
name='iOS 8.4 (iPhone)',
aliases=['iPhone OS 8_4'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_3_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=48,
name='iOS 8.3 (iPhone)',
aliases=['iPhone OS 8_3'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_2_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=47,
name='iOS 8.2 (iPhone)',
aliases=['iPhone OS 8_2'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_1_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=46,
name='iOS 8.1 (iPhone)',
aliases=['iPhone OS 8_1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=45,
name='iOS 8 (iPhone)',
aliases=['iPhone OS 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS7_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=44,
name='iOS 7 (iPhone)',
aliases=['iPhone OS 7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS6_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=43,
name='iOS 6 (iPhone)',
aliases=['iPhone OS 6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS5_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
Expand DownExpand Up@@ -554,6 +795,16 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY10 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
versionId=10,
name='BlackBerry 10',
aliases=['BB10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY7 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Updated list of OS's by razius · Pull Request #11 · krux/python-useragentutils · GitHub
Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 setup.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
setup(
name='useragentutils',
packages=['useragentutils'],
version='0.2.4',
version='0.2.5',
description='Python port of the Java user-agent-utils lib',
author='Derek Brans',
author_email='dbrans@gmail.com',
Expand Down
259 changes: 255 additions & 4 deletions useragentutils/operating_system.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,17 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

WINDOWS_10 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=24,
name='Windows 10',
aliases=['Windows NT 6.4', 'Windows NT 10'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)

WINDOWS_81 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand All@@ -44,7 +55,7 @@ class OperatingSystem(BaseProduct):
versionId=22,
name='Windows 8',
aliases=['Windows NT 6.2'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)
Expand All@@ -56,7 +67,7 @@ class OperatingSystem(BaseProduct):
versionId=21,
name='Windows 7',
aliases=['Windows NT 6.1'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -67,7 +78,7 @@ class OperatingSystem(BaseProduct):
versionId=20,
name='Windows Vista',
aliases=['Windows NT 6'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -93,7 +104,47 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

XBOX_OS = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=62,
name='Xbox OS',
aliases=['Xbox', 'Xbox One'],
exclude=None,
deviceType=DeviceType.GAME_CONSOLE,
versionRegexString=None)

# before Win
WINDOWS_10_MOBILE = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=54,
name='Windows Phone 10',
aliases=['Windows Phone 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8_1 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=53,
name='Windows Phone 8.1',
aliases=['Windows Phone 8.1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=52,
name='Windows Phone 8',
aliases=['Windows Phone 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_MOBILE7 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand DownExpand Up@@ -136,10 +187,100 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

# Chrome OS by Google, mostly used on Chromebooks and Chromeboxes
CHROME_OS = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=None,
versionId=1000,
name='Chrome OS',
aliases=['CrOS'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

#
# First Android 4 device is the Galaxy Nexus phone. Once there are also Tablets with Android 4 we we will have to
# find a solution to distinguish between mobile phones and tablets.
#
ANDROID8 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=8,
name='Android 8.x',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID8_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID8,
versionId=80,
name='Android 8.x Tablet',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID7 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=7,
name='Android 7.x',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID7_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID7,
versionId=70,
name='Android 7.x Tablet',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID6 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=6,
name='Android 6.x',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID6_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID6,
versionId=60,
name='Android 6.x Tablet',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID5 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=5,
name='Android 5.x',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID5_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID5,
versionId=50,
name='Android 5.x Tablet',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID4 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
Expand All@@ -156,7 +297,7 @@ class OperatingSystem(BaseProduct):
parent=ANDROID4,
versionId=40,
name='Android 4.x Tablet',
aliases=['Xoom', 'Transformer'],
aliases=['Xoom', 'Transformer', 'Android 4', 'Android-4'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)
Expand DownExpand Up@@ -241,6 +382,106 @@ class OperatingSystem(BaseProduct):
versionRegexString=None)

# before MAC_OS_X_IPHONE for all older versions
iOS11_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=92,
name='iOS 11 (iPhone)',
aliases=['iPhone OS 11'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS10_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=91,
name='iOS 10 (iPhone)',
aliases=['iPhone OS 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS9_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=90,
name='iOS 9 (iPhone)',
aliases=['iPhone OS 9'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_4_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=49,
name='iOS 8.4 (iPhone)',
aliases=['iPhone OS 8_4'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_3_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=48,
name='iOS 8.3 (iPhone)',
aliases=['iPhone OS 8_3'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_2_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=47,
name='iOS 8.2 (iPhone)',
aliases=['iPhone OS 8_2'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_1_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=46,
name='iOS 8.1 (iPhone)',
aliases=['iPhone OS 8_1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=45,
name='iOS 8 (iPhone)',
aliases=['iPhone OS 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS7_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=44,
name='iOS 7 (iPhone)',
aliases=['iPhone OS 7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS6_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=43,
name='iOS 6 (iPhone)',
aliases=['iPhone OS 6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS5_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
Expand DownExpand Up@@ -554,6 +795,16 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY10 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
versionId=10,
name='BlackBerry 10',
aliases=['BB10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY7 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Updated list of OS's by razius · Pull Request #11 · krux/python-useragentutils · GitHub
Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 setup.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
setup(
name='useragentutils',
packages=['useragentutils'],
version='0.2.4',
version='0.2.5',
description='Python port of the Java user-agent-utils lib',
author='Derek Brans',
author_email='dbrans@gmail.com',
Expand Down
259 changes: 255 additions & 4 deletions useragentutils/operating_system.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,17 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

WINDOWS_10 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=24,
name='Windows 10',
aliases=['Windows NT 6.4', 'Windows NT 10'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)

WINDOWS_81 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand All@@ -44,7 +55,7 @@ class OperatingSystem(BaseProduct):
versionId=22,
name='Windows 8',
aliases=['Windows NT 6.2'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None
)
Expand All@@ -56,7 +67,7 @@ class OperatingSystem(BaseProduct):
versionId=21,
name='Windows 7',
aliases=['Windows NT 6.1'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -67,7 +78,7 @@ class OperatingSystem(BaseProduct):
versionId=20,
name='Windows Vista',
aliases=['Windows NT 6'],
exclude=None,
exclude=['Xbox', 'Xbox One'],
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

Expand All@@ -93,7 +104,47 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

XBOX_OS = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=62,
name='Xbox OS',
aliases=['Xbox', 'Xbox One'],
exclude=None,
deviceType=DeviceType.GAME_CONSOLE,
versionRegexString=None)

# before Win
WINDOWS_10_MOBILE = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=54,
name='Windows Phone 10',
aliases=['Windows Phone 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8_1 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=53,
name='Windows Phone 8.1',
aliases=['Windows Phone 8.1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_PHONE8 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
versionId=52,
name='Windows Phone 8',
aliases=['Windows Phone 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

WINDOWS_MOBILE7 = EnumValue(
manufacturer=Manufacturer.MICROSOFT,
parent=WINDOWS,
Expand DownExpand Up@@ -136,10 +187,100 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

# Chrome OS by Google, mostly used on Chromebooks and Chromeboxes
CHROME_OS = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=None,
versionId=1000,
name='Chrome OS',
aliases=['CrOS'],
exclude=None,
deviceType=DeviceType.COMPUTER,
versionRegexString=None)

#
# First Android 4 device is the Galaxy Nexus phone. Once there are also Tablets with Android 4 we we will have to
# find a solution to distinguish between mobile phones and tablets.
#
ANDROID8 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=8,
name='Android 8.x',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID8_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID8,
versionId=80,
name='Android 8.x Tablet',
aliases=['Android 8', 'Android-8'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID7 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=7,
name='Android 7.x',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID7_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID7,
versionId=70,
name='Android 7.x Tablet',
aliases=['Android 7', 'Android-7'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID6 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=6,
name='Android 6.x',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID6_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID6,
versionId=60,
name='Android 6.x Tablet',
aliases=['Android 6', 'Android-6'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID5 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID,
versionId=5,
name='Android 5.x',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

ANDROID5_TABLET = EnumValue(
manufacturer=Manufacturer.GOOGLE,
parent=ANDROID5,
versionId=50,
name='Android 5.x Tablet',
aliases=['Android 5', 'Android-5'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)

ANDROID4 = EnumValue(
manufacturer=Manufacturer.GOOGLE,
Expand All@@ -156,7 +297,7 @@ class OperatingSystem(BaseProduct):
parent=ANDROID4,
versionId=40,
name='Android 4.x Tablet',
aliases=['Xoom', 'Transformer'],
aliases=['Xoom', 'Transformer', 'Android 4', 'Android-4'],
exclude=None,
deviceType=DeviceType.TABLET,
versionRegexString=None)
Expand DownExpand Up@@ -241,6 +382,106 @@ class OperatingSystem(BaseProduct):
versionRegexString=None)

# before MAC_OS_X_IPHONE for all older versions
iOS11_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=92,
name='iOS 11 (iPhone)',
aliases=['iPhone OS 11'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS10_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=91,
name='iOS 10 (iPhone)',
aliases=['iPhone OS 10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS9_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=90,
name='iOS 9 (iPhone)',
aliases=['iPhone OS 9'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_4_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=49,
name='iOS 8.4 (iPhone)',
aliases=['iPhone OS 8_4'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_3_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=48,
name='iOS 8.3 (iPhone)',
aliases=['iPhone OS 8_3'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_2_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=47,
name='iOS 8.2 (iPhone)',
aliases=['iPhone OS 8_2'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_1_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=46,
name='iOS 8.1 (iPhone)',
aliases=['iPhone OS 8_1'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS8_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=45,
name='iOS 8 (iPhone)',
aliases=['iPhone OS 8'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS7_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=44,
name='iOS 7 (iPhone)',
aliases=['iPhone OS 7'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS6_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
versionId=43,
name='iOS 6 (iPhone)',
aliases=['iPhone OS 6'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

iOS5_IPHONE = EnumValue(
manufacturer=Manufacturer.APPLE,
parent=IOS,
Expand DownExpand Up@@ -554,6 +795,16 @@ class OperatingSystem(BaseProduct):
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY10 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
versionId=10,
name='BlackBerry 10',
aliases=['BB10'],
exclude=None,
deviceType=DeviceType.MOBILE,
versionRegexString=None)

BLACKBERRY7 = EnumValue(
manufacturer=Manufacturer.BLACKBERRY,
parent=BLACKBERRY,
Expand Down