Changeset 5984 for sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php

Timestamp:

10/02/2017 03:53:11 PM (9 years ago)

Author:

coffee2code

Message:

Browse Happy API: Add support for Amazon Silk as a browser and Fire OS as a platform.

• Adds Amazon Silk as a recognized browser
• Changes existing "Kindle" to "Kindle Browser"
• Removes hacky override that set Kindle's platform to "Kindle"
• Attributes Amazon Silk and Kindle Browser to Fire OS platform
• Omits version number from Kindle Browser
• Updates existing Kindle unit tests to reflect these changes

File:

• sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php (modified) (5 diffs)

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php

@@ -49 +49 @@
     // Properly set platform if Android is actually being reported.
     if ( 'Linux' === $data['platform'] && false !== strpos( $user_agent, 'Android' ) ) {
-        $data['platform'] = 'Android';
+        if ( strpos( $user_agent, 'Kindle' ) ) {
+            $data['platform'] = 'Fire OS';
+        } else {
+            $data['platform'] = 'Android';
+        }
     } elseif ( 'Windows Phone' === $data['platform'] ) {
         $data['platform'] = 'Windows Phone OS';
     }
 
-    if ( in_array( $data['platform'], array( 'Android', 'iPad', 'iPhone', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
+    if ( in_array( $data['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
         $data['mobile'] = true;
     }
 
     preg_match_all(
-        '%(?P<name>Opera Mini|Opera|OPR|Edge|Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
+        '%(?P<name>Opera Mini|Opera|OPR|Edge|Trident|Silk|Camino|Kindle|Firefox|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
         $user_agent,
         $result,
@@ -93 +97 @@
     }
     // Nokia Browser
-    elseif ( $key = array_search( 'NokiaBrowser', $result['name'] ) ) {
+    elseif ( false !== ( $key = array_search( 'NokiaBrowser', $result['name'] ) ) ) {
         $data['name']     = 'Nokia Browser';
         $data['version']  = $result['version'][ $key ];
         $data['mobile']   = true;
-    } elseif ( 'AppleWebKit' == $result['name'][0] ) {
+    }
+    // Amazon Silk
+    elseif ( false !== ( $key = array_search( 'Silk', $result['name'] ) ) ) {
+        $data['name']     = 'Amazon Silk';
+        $data['version']  = $result['version'][ $key ];
+        $version          = '';
+    }
+    // Kindle Browser
+    elseif ( false !== ( $key = array_search( 'Kindle', $result['name'] ) ) ) {
+        $data['name']     = 'Kindle Browser';
+        $data['version']  = $result['version'][ $key ];
+    }
+    // AppleWebKit-emulating browsers
+    elseif ( 'AppleWebKit' == $result['name'][0] ) {
         if ( $key = array_search( 'Edge', $result['name'] ) ) {
             $data['name'] = 'Microsoft Edge';
@@ -106 +123 @@
             } elseif ( 'Android' === $data['platform'] ) {
                 $data['name'] = 'Android Browser';
+            } elseif ( 'Fire OS' === $data['platform'] ) {
+                $data['name'] = 'Kindle Browser';
             } else {
                 $data['name'] = 'Mobile Safari';
@@ -117 +136 @@
         } elseif ( ! empty( $data['platform'] ) && 'PlayBook' == $data['platform'] ) {
             $data['name'] = 'PlayBook';
-        } elseif ( $key = array_search( 'Kindle', $result['name'] ) ) {
-            $data['name'] = 'Kindle';
         } elseif ( $key = array_search( 'Safari', $result['name'] ) ) {
             if ( 'Android' === $data['platform'] ) {
@@ -155 +172 @@
     }
 
-    if ( in_array( $data['name'], array( 'Kindle' ) ) ) {
-        $data['platform'] = $data['name'];
+    // Set the platform for Amazon-related browsers.
+    if ( in_array( $data['name'], array( 'Amazon Silk', 'Kindle Browser' ) ) ) {
+        $data['platform'] = 'Fire OS';
+        $data['mobile']   = true;
     }