Improve detection of manufacturers and products.

Adds Huawei, Lenovo, Oppo and Xiaomi as manufacturers as well.

Author: bnjmnt4n

platform.js

@@ -451,13 +451,17 @@
       'Google': { 'Google TV': 1, 'Nexus': 1 },
       'HP': { 'TouchPad': 1 },
       'HTC': {},
+      'Huawei': {},
+      'Lenovo': {},
       'LG': {},
       'Microsoft': { 'Xbox': 1, 'Xbox One': 1 },
       'Motorola': { 'Xoom': 1 },
       'Nintendo': { 'Wii U': 1,  'Wii': 1 },
       'Nokia': { 'Lumia': 1 },
+      'Oppo': {},
       'Samsung': { 'Galaxy S': 1, 'Galaxy S2': 1, 'Galaxy S3': 1, 'Galaxy S4': 1 },
-      'Sony': { 'PlayStation': 1, 'PlayStation Vita': 1 }
+      'Sony': { 'PlayStation': 1, 'PlayStation Vita': 1 },
+      'Xiaomi': { 'Mi': 1, 'Redmi': 1 }
     });
 
     /* Detectable operating systems (order is important). */
@@ -624,18 +628,6 @@
     // Convert layout to an array so we can add extra details.
     layout && (layout = [layout]);
 
-    // Detect product names that contain their manufacturer's name.
-    if (manufacturer && !product) {
-      product = getProduct([manufacturer]);
-    }
-    // Clean up Google TV.
-    if ((data = /\bGoogle TV\b/.exec(product))) {
-      product = data[0];
-    }
-    // Detect simulators.
-    if (/\bSimulator\b/i.test(ua)) {
-      product = (product ? product + ' ' : '') + 'Simulator';
-    }
     // Detect Android products.
     // Browsers on Android devices typically provide their product IDS after "Android;"
     // up to "Build" or ") AppleWebKit".
@@ -649,6 +641,22 @@
         .replace(/^[a-z]{2}-[a-z]{2};\s*/i, '')
         || null;
     }
+    // Detect product names that contain their manufacturer's name.
+    if (manufacturer && !product) {
+      product = getProduct([manufacturer]);
+    } else if (manufacturer && product) {
+      product = product
+        .replace(RegExp('^(' + qualify(manufacturer) + ')[-_.\\s]', 'i'), manufacturer + ' ')
+        .replace(RegExp('^(' + qualify(manufacturer) + ')[-_.]?(\\w)', 'i'), manufacturer + ' $2');
+    }
+    // Clean up Google TV.
+    if ((data = /\bGoogle TV\b/.exec(product))) {
+      product = data[0];
+    }
+    // Detect simulators.
+    if (/\bSimulator\b/i.test(ua)) {
+      product = (product ? product + ' ' : '') + 'Simulator';
+    }
     // Detect Opera Mini 8+ running in Turbo/Uncompressed mode on iOS.
     if (name == 'Opera Mini' && /\bOPiOS\b/.test(ua)) {
       description.push('running in Turbo/Uncompressed mode');

test/test.js

@@ -166,12 +166,13 @@
       'os': 'Android'
     },
 
-    'Android Browser 4.0 (like Chrome 33.0.0.0) on HUAWEI H891L (Android 4.4.4)': {
+    'Android Browser 4.0 (like Chrome 33.0.0.0) on Huawei H891L (Android 4.4.4)': {
       'ua': 'Mozilla/5.0 (Linux; Android 4.4.4; HUAWEI H891L Build/HuaweiH891L) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/33.0.0.0 Mobile Safari/537.36',
       'layout': 'Blink',
+      'manufacturer': 'Huawei',
       'name': 'Android Browser',
       'os': 'Android 4.4.4',
-      'product': 'HUAWEI H891L',
+      'product': 'Huawei H891L',
       'version': '4.0'
     },
 
@@ -598,13 +599,13 @@
       'version': '63.0.3239.132'
     },
 
-    'Chrome Mobile 16.0.912.77 on HTC (Android 4.0.3)': {
+    'Chrome Mobile 16.0.912.77 on HTC Sensation XE with Beats Audio (Android 4.0.3)': {
       'ua': 'Mozilla/5.0 (Linux; U; Android 4.0.3; zh-cn; HTC Sensation XE with Beats Audio Build/IML74K) AppleWebKit/535.7 (KHTML, like Gecko) CrMo/16.0.912.77 Mobile Safari/535.7',
       'layout': 'WebKit',
       'manufacturer': 'HTC',
       'name': 'Chrome Mobile',
       'os': 'Android 4.0.3',
-      'product': 'HTC',
+      'product': 'HTC Sensation XE with Beats Audio',
       'version': '16.0.912.77'
     },