Sync upstream to 5eccbeb22

thinkwelltwd · Apr 4, 2020 · c3308c2 · c3308c2
1 parent b5b1c58
commit c3308c2
Show file tree

Hide file tree

Showing 41 changed files with 12,489 additions and 1,087 deletions.
diff --git a/README.md b/README.md
diff --git a/device_detector/parser/device/base.py b/device_detector/parser/device/base.py
@@ -55,6 +55,7 @@
 DEVICE_BRANDS = {
     '3Q': '3Q',
     '4G': '4Good',
+    'AE': 'Ace',
     'AA': 'AllCall',
     'AC': 'Acer',
     'A9': 'Advan',
@@ -67,11 +68,14 @@
     'AK': 'Akai',
     '1A': 'Alba',
     'AL': 'Alcatel',
+    '4A': 'Aligator',
     'A2': 'Allview',
+    '3A': 'AllDocube',
     'A7': 'Allwinner',
     'A1': 'Altech UEC',
     'A5': 'altron',
     'AN': 'Arnova',
+    '2A': 'Atom',
     'KN': 'Amazon',
     'AG': 'AMGOO',
     'AO': 'Amoi',
@@ -111,6 +115,7 @@
     'B2': 'Blackview',
     'B4': 'bogo',
     'BW': 'Boway',
+    'BZ': 'Bezkam',
     'BX': 'bq',
     'BV': 'Bravis',
     'BR': 'Brondi',
@@ -125,7 +130,9 @@
     'CE': 'Celkon',
     'CC': 'ConCorde',
     'C2': 'Changhong',
+    '2C': 'Ghong',
     'CH': 'Cherry Mobile',
+    '1C': 'Chuwi',
     'L8': 'Clarmin',
     'CK': 'Cricket',
     'C1': 'Crosscall',
@@ -147,11 +154,13 @@
     'CX': 'Crescent',
     'C4': 'Cyrus',
     'CV': 'CVTE',
+    'D5': 'Daewoo',
     'DA': 'Danew',
     'DT': 'Datang',
     'D1': 'Datsun',
     'DE': 'Denver',
     'DX': 'DEXP',
+    'DW': 'DeWalt',
     'DS': 'Desay',
     'DB': 'Dbtel',
     'DC': 'DoCoMo',
@@ -161,6 +170,7 @@
     'D3': 'Digicel',
     'DD': 'Digiland',
     'D2': 'Digma',
+    'D6': 'Divisat',
     'DL': 'Dell',
     'DN': 'DNS',
     'DM': 'DMM',
@@ -179,6 +189,7 @@
     'E6': 'EE',
     'EI': 'Ezio',
     'EM': 'Eks Mobility',
+    'L0': 'Element',
     'EL': 'Elephone',
     'EG': 'Elenberg',
     'EP': 'Easypix',
@@ -225,6 +236,7 @@
     'GS': 'Gigaset',
     'GZ': 'Ginzzu',
     'GC': 'GOCLEVER',
+    'G4': 'Globex',
     'GL': 'Goly',
     'GO': 'Google',
     'G1': 'GoMobile',
@@ -270,6 +282,7 @@
     'I4': 'Inoi',
     'IR': 'iRola',
     'I6': 'Irbis',
+    'IU': 'iRulu',
     'II': 'Inkti',
     'IX': 'Intex',
     'IO': 'i-mobile',
@@ -285,10 +298,14 @@
     'J5': 'Just5',
     'KL': 'Kalley',
     'K4': 'Kaan',
+    'K7': 'Kaiomy',
+    'K6': 'Kanji',
     'KA': 'Karbonn',
     'KD': 'KDDI',
+    'K5': 'KATV1',
     'K1': 'Kiano',
     'KI': 'Kingsun',
+    'KV': 'Kivi',
     'KC': 'Kocaso',
     'KG': 'Kogan',
     'KO': 'Konka',
@@ -331,11 +348,14 @@
     'LX': 'Lexibook',
     'LY': 'LYF',
     'LU': 'Lumus',
+    'L9': 'Luna',
     'MN': 'M4tel',
     'MJ': 'Majestic',
     'MA': 'Manta Multimedia',
+    '5M': 'Mann',
     '2M': 'Masstel',
     'MW': 'Maxwest',
+    '7M': 'Maxcom',
     'M0': 'Maze',
     'MB': 'Mobistel',
     '0M': 'Mecool',
@@ -373,13 +393,17 @@
     '1M': 'MYFON',
     'MG': 'MyWigo',
     'M8': 'Myria',
+    '6M': 'Mystery',
     'N3': 'Navon',
+    'N7': 'National',
+    'N5': 'NOA',
     'NE': 'NEC',
     'NF': 'Neffos',
     'NA': 'Netgear',
     'NU': 'NeuImage',
     'NG': 'NGM',
     'N6': 'Nobby',
+    'NZ': 'NG Optics',
     'NO': 'Nous',
     'NI': 'Nintendo',
     'N1': 'Noain',
@@ -388,10 +412,12 @@
     'NV': 'Nvidia',
     'NB': 'Noblex',
     'NM': 'Nomi',
+    'N0': 'Nuvo',
     'NL': 'NUU Mobile',
     'NY': 'NYX Mobile',
     'NN': 'Nikon',
     'NW': 'Newgen',
+    'NS': 'NewsMy',
     'NX': 'Nexian',
     'NT': 'NextBook',
     'O3': 'O+',
@@ -404,6 +430,7 @@
     'OS': 'Ordissimo',
     'OT': 'O2',
     'OK': 'Ouki',
+    'OE': 'Oukitel',
     'OU': 'OUYA',
     'OO': 'Opsson',
     'OV': 'Overmax',
@@ -422,6 +449,7 @@
     'PL': 'Polaroid',
     'P5': 'Polytron',
     'P9': 'Primepad',
+    'P6': 'Proline',
     'PM': 'Palm',
     'PO': 'phoneOne',
     'PT': 'Pantech',
@@ -441,6 +469,7 @@
     'QM': 'QMobile',
     'QA': 'Quantum',
     'QU': 'Quechua',
+    'QO': 'Qumo',
     'RA': 'Ramos',
     'RC': 'RCA Tablets',
     'RB': 'Readboy',
@@ -456,9 +485,12 @@
     'R3': 'Rombica',
     'RT': 'RT Project',
     'RX': 'Ritmix',
+    'R7': 'Ritzviva',
     'R5': 'Ross&Moor',
     'R2': 'R-TV',
-    'SQ': 'Santin BiTBiZ',
+    'RG': 'RugGear',
+    'RU': 'Runbo',
+    'SQ': 'Santin',
     'SA': 'Samsung',
     'S0': 'Sanei',
     'SD': 'Sega',
@@ -469,6 +501,7 @@
     'SX': 'SFR',
     'SG': 'Sagem',
     'SH': 'Sharp',
+    '7S': 'Shift Phones',
     '3S': 'Shuttle',
     'SI': 'Siemens',
     'SJ': 'Silent Circle',
@@ -482,7 +515,9 @@
     'SO': 'Sony',
     'OI': 'Sonim',
     'SP': 'Spice',
+    '6S': 'Spectrum',
     'SU': 'SuperSonic',
+    '5S': 'Sunvell',
     'S5': 'Supra',
     'SV': 'Selevision',
     'SY': 'Sanyo',
@@ -538,22 +573,28 @@
     'UC': 'U.S. Cellular',
     'UH': 'Uhappy',
     'UL': 'Ulefone',
+    'UG': 'Ugoos',
     'UO': 'Unnecto',
     'UN': 'Unowhy',
     'US': 'Uniscope',
     'UX': 'Unimax',
     'UM': 'UMIDIGI',
     'UU': 'Unonu',
     'UK': 'UTOK',
+    'UA': 'Umax',
     'UT': 'UTStarcom',
+    'UZ': 'Unihertz',
     'VA': 'Vastking',
     'VD': 'Videocon',
     'VE': 'Vertu',
     'VN': 'Venso',
     'V5': 'Vivax',
     'VI': 'Vitelcom',
     'VK': 'VK Mobile',
+    'V7': 'Vinga',
     'VS': 'ViewSonic',
+    'V9': 'Vsun',
+    'V8': 'Vesta',
     'VT': 'Vestel',
     'VR': 'Vernee',
     'V4': 'Verizon',
@@ -578,6 +619,7 @@
     'WY': 'Wexler',
     'WI': 'Wiko',
     'WL': 'Wolder',
+    'WP': 'Wieppo',
     'WG': 'Wolfgang',
     'WO': 'Wonu',
     'W1': 'Woo',
@@ -588,12 +630,15 @@
     'XN': 'Xion',
     'XO': 'Xolo',
     'YA': 'Yarvik',
+    'XR': 'Xoro',
     'Y2': 'Yes',
     'YE': 'Yezz',
     'Y1': 'Yu',
     'YU': 'Yuandao',
     'YS': 'Yusun',
+    'YO': 'Yota',
     'YT': 'Ytone',
+    'YX': 'Yxtel',
     'ZE': 'Zeemi',
     'ZK': 'Zenek',
     'ZO': 'Zonda',

diff --git a/device_detector/parser/settings.py b/device_detector/parser/settings.py
@@ -13,6 +13,7 @@
     'Edge',
     'NetSurf',
     'Servo',
+    'Goanna',
 }
 AVAILABLE_ENGINES_LOWER_CASE = {engine.lower(): engine for engine in AVAILABLE_ENGINES}
 
@@ -233,6 +234,7 @@
     'TB': 'Tenta Browser',
     'TZ': 'Tizen Browser',
     'TS': 'TweakStyle',
+    'TV': 'TV Bro',
     'UB': 'UBrowser',
     'UC': 'UC Browser',
     'UM': 'UC Browser Mini',
@@ -313,6 +315,7 @@
         'UB',
         'LO',
         'VG',
+        'TV',
     ),
     'Firefox': (
         'FF',

diff --git a/device_detector/regexes/upstream/bots.yml b/device_detector/regexes/upstream/bots.yml
@@ -283,13 +283,13 @@
     name: 'CloudFlare'
     url: 'http://www.cloudflare.com'
 
-- regex: 'coccoc/|coccocbot-image'
+- regex: 'coccoc|coccocbot(-ads|-fast|-image|-shopping|-web)?'
   name: 'Cốc Cốc Bot'
-  url: 'http://help.coccoc.com/'
+  url: 'https://help.coccoc.com/en/search-engine/coccoc-robots'
   category: 'Search bot'
   producer:
     name: 'Cốc Cốc'
-    url: 'http://coccoc.com/'
+    url: 'https://coccoc.com/'
 
 - regex: 'collectd'
   name: 'Collectd'
@@ -577,6 +577,14 @@
     name: 'Google Inc.'
     url: 'http://www.google.com'
 
+- regex: 'Google-Cloud-Scheduler'
+  name: 'Google Cloud Scheduler'
+  category: 'Crawler'
+  url: 'https://cloud.google.com/scheduler'
+  producer:
+    name: 'Google Inc.'
+    url: 'https://www.google.com'
+
 - regex: 'Google-Structured-Data-Testing-Tool'
   name: 'Google Structured Data Testing Tool'
   category: 'Validator'
@@ -585,6 +593,14 @@
     name: 'Google Inc.'
     url: 'http://www.google.com'
 
+- regex: 'GoogleStackdriverMonitoring'
+  name: 'Google Stackdriver Monitoring'
+  category: 'Site Monitor'
+  url: 'https://cloud.google.com/monitoring'
+  producer:
+    name: 'Google Inc.'
+    url: 'https://www.google.com'
+
 - regex: 'via ggpht\.com GoogleImageProxy'
   name: 'Gmail Image Proxy'
   category: 'Crawler'

diff --git a/device_detector/regexes/upstream/client/browser_engine.yml b/device_detector/regexes/upstream/client/browser_engine.yml
@@ -34,3 +34,6 @@
 
 - regex: 'Servo'
   name: 'Servo'
+
+- regex: 'Goanna'
+  name: 'Goanna'
diff --git a/device_detector/regexes/upstream/client/browsers.yml b/device_detector/regexes/upstream/client/browsers.yml
@@ -405,6 +405,11 @@
 
 
 #Pale Moon
+- regex: '.*Goanna.*PaleMoon(?:/(\d+[\.\d]+))?'
+  name: 'Pale Moon'
+  version: '$1'
+  engine:
+    default: 'Goanna'
 - regex: 'PaleMoon(?:/(\d+[\.\d]+))?'
   name: 'Pale Moon'
   version: '$1'
@@ -1074,6 +1079,11 @@
   name: 'NTENT Browser'
   version: '$1'
 
+# TV Bro
+- regex: 'TV Bro/(\d+[\.\d]+)'
+  name: 'TV Bro'
+  version: '$1'
+
 # Chrome Webview
 - regex: 'Version/.* Chrome(?:/(\d+[\.\d]+))?'
   name: 'Chrome Webview'

diff --git a/device_detector/regexes/upstream/client/libraries.yml b/device_detector/regexes/upstream/client/libraries.yml
@@ -91,3 +91,18 @@
   name: 'RestSharp'
   version: '$1'
   url: 'http://restsharp.org/'
+
+- regex: 'scalaj-http/(\d+[\.\d]+)'
+  name: 'ScalaJ HTTP'
+  version: '$1'
+  url: 'https://github.com/scalaj/scalaj-http'
+
+- regex: 'REST::Client/(\d+)'
+  name: 'Perl REST::Client'
+  version: '$1'
+  url: 'https://metacpan.org/pod/REST::Client'
+
+- regex: 'node-fetch/(\d+[\.\d]+)'
+  name: 'Node Fetch'
+  version: $1
+  url: 'https://github.com/node-fetch/node-fetch'
diff --git a/device_detector/regexes/upstream/client/mediaplayers.yml b/device_detector/regexes/upstream/client/mediaplayers.yml
@@ -91,4 +91,12 @@
 
 - regex: 'GoogleChirp(?:/(\d+[\.\d]+))?'
   name: 'Google Podcasts'
-  version: '$1'
+  version: '$1'
+
+- regex: 'Music Player Daemon (?:(\d+[\.\d]+))?'
+  name: 'Music Player Daemon'
+  version: '$1'
+
+- regex: 'mpv (?:(\d+[\.\d]+))?'
+  name: 'mpv'
+  version: '$1'