Changeset 9137

Timestamp:

09/13/2019 03:57:15 PM (5 years ago)

Author:

tellyworth

Message:

Plugins: improve import of block metadata.

This adds a default block_title if none is available, and uses the stable_tag for assets.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php (modified) (3 diffs)

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

@@ -193 +193 @@
             if ( $changed || count ( get_post_meta( $plugin->ID, 'block_name' ) ) !== count ( $blocks ) ) {
                 delete_post_meta( $plugin->ID, 'block_name' );
+                delete_post_meta( $plugin->ID, 'block_title' );
                 foreach ( $blocks as $block ) {
                     add_post_meta( $plugin->ID, 'block_name', $block->name, false );
+                    add_post_meta( $plugin->ID, 'block_title', ( $block->title ?: $plugin->post_title ), false );
                 }
             }
@@ -200 +202 @@
             delete_post_meta( $plugin->ID, 'all_blocks' );
             delete_post_meta( $plugin->ID, 'block_name' );
+            delete_post_meta( $plugin->ID, 'block_title' );
         }
 
@@ -459 +462 @@
         // Find blocks dist/build JS files
         $block_files = array();
-        $dist_files = SVN::ls( 'https://plugins.svn.wordpress.org' . "/{$plugin_slug}/trunk/dist" ) ?: array();
-        $build_files = SVN::ls( 'https://plugins.svn.wordpress.org' . "/{$plugin_slug}/trunk/build" ) ?: array();
+        $dist_files = SVN::ls( 'https://plugins.svn.wordpress.org' . "/{$plugin_slug}/{$stable_tag}/dist" ) ?: array();
+        $build_files = SVN::ls( 'https://plugins.svn.wordpress.org' . "/{$plugin_slug}/{$stable_tag}/build" ) ?: array();
 
         foreach ( $dist_files as $file ) {
-            $block_files[] = '/trunk/dist/' . $file;
+            $block_files[] = "/{$stable_tag}/dist/" . $file;
         }
 
         foreach ( $build_files as $file ) {
-            $block_files[] = '/trunk/build/' . $file;
+            $block_files[] = "/{$stable_tag}/build/" . $file;
         }
 
         if ( empty( $block_files ) ) {
             foreach ( $files_with_blocks as $file ) {
-                $block_files[] = '/trunk/' . $file;
+                $block_files[] = "/{$stable_tag}/" . $file;
             }
         }