Changeset 7072

Timestamp:

04/10/2018 02:42:42 AM (7 years ago)

Author:

dd32

Message:

Plugin Directory: Use geopattern icon assets in the plugins/update-check API response.

This change populates the update_source table which the update-check API uses, another change is needed to the update check itself to pull them through.
Additionally a bin script to trigger an update for a single row (or all) is included.

See #3265.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• bin/rebuild-update_source-table.php (copied) (copied from sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/resync-ratings.php) (1 diff)
• class-template.php (modified) (4 diffs)
• jobs/class-api-update-updater.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/rebuild-update_source-table.php

@@ -40 +40 @@
 
 $slugs = $wpdb->get_col( $sql );
+if ( ! $slugs ) {
+    fwrite( STDERR, "Error! The plugin(s) could not be located.\n" );
+    die();
+}
 
 foreach ( $slugs as $i => $slug ) {
+    echo ++$i . '/' . count( $slugs ) . "\t" . $slug . "\n";
 
-    $post = Plugin_Directory::get_plugin_post( $slug );
-    if ( ! $post ) {
-            continue;
-    }
-
-    echo $i . '/' . count( $slugs ) . "\t" . $post->post_name . "\n";
-
-    update_post_meta(
-            $post->ID,
-            'rating',
-            \WPORG_Ratings::get_avg_rating( 'plugin', $post->post_name )
-    );
-
-    update_post_meta(
-            $post->ID,
-            'ratings',
-            \WPORG_Ratings::get_rating_counts( 'plugin', $post->post_name )
-    );
+    Jobs\API_Update_Updater::update_single_plugin( $slug );
 
     clear_memory_caches();

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

@@ -390 +390 @@
         if ( ! $icon || 'publish' !== $plugin->post_status ) {
             $generated = true;
-            $icon = self::get_geopattern_icon_url( $plugin );
+            $icon = $svg = self::get_geopattern_icon_url( $plugin );
         }
 
@@ -441 +441 @@
      *
      * @param int|\WP_Post|null $post   Optional. Post ID or post object. Defaults to global $post.
-     * @param string            $output Optional. Output type. 'html' or 'raw'. Default: 'raw'.
+     * @param string            $output Optional. Output type. 'html', 'raw', or 'raw_with_rtl'. Default: 'raw'.
      * @return mixed
      */
@@ -473 +473 @@
         }
 
-        if ( is_rtl() ) {
+        if ( is_rtl() || 'raw_with_rtl' == $output ) {
             foreach ( $rtl_banners as $info ) {
                 switch ( $info['resolution'] ) {
                     case '1544x500':
-                        $banner_2x = self::get_asset_url( $plugin, $info );
+                        $field = 'raw_with_rtl' == $output ? 'banner_2x_rtl' : 'banner_2x';
+                        $$field = self::get_asset_url( $plugin, $info );
                         break;
 
                     case '772x250':
-                        $banner = self::get_asset_url( $plugin, $info );
+                        $field = 'raw_with_rtl' == $output ? 'banner_rtl' : 'banner';
+                        $$field = self::get_asset_url( $plugin, $info );
                         break;
                 }
@@ -506 +508 @@
 
             case 'raw':
+            case 'raw_with_rtl':
             default:
-                return compact( 'banner', 'banner_2x' );
+                return compact( 'banner', 'banner_2x', 'banner_rtl', 'banner_2x_rtl' );
         }
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-api-update-updater.php

@@ -3 +3 @@
 
 use WordPressdotorg\Plugin_Directory\Plugin_Directory;
+use WordPressdotorg\Plugin_Directory\Template;
 
 /**
@@ -62 +63 @@
         }
 
-        $data           = array(
+        $data = array(
             'plugin_id'       => $post->ID,
             'plugin_slug'     => $post->post_name,
@@ -75 +76 @@
             'requires_php'    => get_post_meta( $post->ID, 'requires_php', true ),
             'upgrade_notice'  => '',
+            'assets'          => serialize( self::get_plugin_assets( $post ) ),
             'last_updated'    => $post->post_modified,
         );
@@ -112 +114 @@
     }
 
+    static function get_plugin_assets( $post ) {
+        $icons = $banners = $banners_rtl = array();
+
+        $raw_icons   = Template::get_plugin_icon( $post, 'raw' );
+        $raw_banners = Template::get_plugin_banner( $post, 'raw_with_rtl' );
+
+        // Banners
+        if ( !empty( $raw_banners['banner_2x'] ) ) {
+            $banners['2x'] = $raw_banners['banner_2x'];
+        }
+        if ( !empty( $raw_banners['banner'] ) ) {
+            $banners['1x'] = $raw_banners['banner'];
+        }
+        if ( $banners ) {
+            $banners['default']  = $banners['2x'] ?? $banners['1x'];
+        }
+
+        // RTL Banners (get_plugin_banner 'raw_with_rtl' returns these)
+        if ( !empty( $raw_banners['banner_2x_rtl'] ) ) {
+            $banners_rtl['2x'] = $raw_banners['banner_2x_rtl'];
+        }
+        if ( !empty( $raw_banners['banner_rtl'] ) ) {
+            $banners_rtl['1x'] = $raw_banners['banner_rtl'];
+        }
+        if ( $banners_rtl ) {
+            $banners_rtl['default']  = $banners_rtl['2x'] ?? $banners_rtl['1x'];
+        }
+
+        // Icons.
+        if ( !empty( $raw_icons['icon_2x'] ) ) {
+            $icons['2x'] = $raw_icons['icon_2x'];
+        }
+        if ( !empty( $raw_icons['icon'] ) ) {
+            $icons['1x'] = $raw_icons['icon'];
+        }
+        if ( !empty( $raw_icons['svg'] ) ) {
+            $icons['svg'] = $raw_icons['svg'];
+
+            // We don't need to set the 1x field when it's the SVG.
+            if ( isset( $icons['1x'] ) && $icons['1x'] == $icons['svg'] ) {
+                unset( $icons['1x'] );
+            }
+        }
+        if ( $icons ) {
+            $icons['default'] = $icons['svg'] ?? ( $icons['2x'] ?? $icons['1x'] );
+        }
+
+        return (object) compact( 'icons', 'banners', 'banners_rtl' );
+    }
+
 }
 
@@ -128 +180 @@
   `requires_php` varchar(128) NOT NULL DEFAULT '',
   `upgrade_notice` text,
+  `assets` text NOT NULL DEFAULT '',
   `last_updated` datetime NOT NULL,
   PRIMARY KEY (`plugin_id`),