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

Timestamp:

05/20/2020 04:32:44 AM (4 years ago)

Author:

tellyworth

Message:

Plugin dir: improve block asset detection

Fixes the logic for handling tag paths.

Props coreymckrill, ryelle.
See #5207.

File:

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

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

@@ -465 +465 @@
         }
 
+        if ( 'trunk' === $stable_tag ) {
+            $stable_path = $stable_tag;
+        } else {
+            $stable_path = "tags/$stable_tag";
+        }
+
         // Find blocks dist/build JS files
         $block_files = 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();
+        $dist_files = SVN::ls( 'https://plugins.svn.wordpress.org' . "/{$plugin_slug}/{$stable_path}/dist" ) ?: array();
+        $build_files = SVN::ls( 'https://plugins.svn.wordpress.org' . "/{$plugin_slug}/{$stable_path}/build" ) ?: array();
 
         foreach ( $dist_files as $file ) {
-            $block_files[] = "/{$stable_tag}/dist/" . $file;
+            $block_files[] = "/{$stable_path}/dist/" . $file;
         }
 
         foreach ( $build_files as $file ) {
-            $block_files[] = "/{$stable_tag}/build/" . $file;
+            $block_files[] = "/{$stable_path}/build/" . $file;
         }
 
         if ( empty( $block_files ) ) {
             foreach ( $files_with_blocks as $file ) {
-                $block_files[] = "/{$stable_tag}/" . $file;
+                $block_files[] = "/{$stable_path}/" . $file;
             }
         }