Changeset 4564

Timestamp:

12/21/2016 07:40:41 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: Allow importing of plugins which lack a trunk readme.txt file but have tagged versions.
This is currently supported by the existing directory, and a number of older (and some recent) plugins rely upon this behaviour, since it's easy to support, we might as well continue to do so.

See #1724

File:

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

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

@@ -283 +283 @@
         $tmp_dir = Filesystem::temp_directory( "process-{$plugin_slug}" );
 
+        // We assume the stable tag is trunk to start with.
+        $stable_tag = 'trunk';
+
         // Find the trunk readme file, list remotely to avoid checking out the entire directory.
-        $trunk_files = SVN::ls( self::PLUGIN_SVN_BASE . "/{$plugin_slug}/trunk" );
+        $trunk_files = SVN::ls( self::PLUGIN_SVN_BASE . "/{$plugin_slug}/trunk" ) ?: array();
+
+        // Find the list of tagged versions of the plugin.
+        $tagged_versions = SVN::ls( "https://plugins.svn.wordpress.org/{$plugin_slug}/tags/" ) ?: array();
+        $tagged_versions = array_map( function( $item ) {
+            return rtrim( $item, '/' );
+        }, $tagged_versions );
+
+        // Not all plugins utilise `trunk`, some just tag versions.
         if ( ! $trunk_files ) {
-            throw new Exception( 'Plugin has no files in trunk.' );
+            if ( ! $tagged_versions ) {
+                throw new Exception( 'Plugin has no files in trunk, nor tags.' );
+            }
+
+            $stable_tag = array_reduce( $tagged_versions, function( $a, $b ) {
+                return version_compare( $a, $b, '>' ) ? $a : $b;
+            } );
         }
 
@@ -304 +321 @@
 
             $stable_tag = $trunk_readme->stable_tag;
-        } else {
-            $stable_tag = 'trunk';
         }
 
@@ -338 +353 @@
         }
         if ( ! $exported ) {
+            // Catch the case where exporting a tag finds nothing, but there was nothing in trunk either.
+            if ( ! $trunk_files ) {
+                throw new Exception( 'Plugin has no files in trunk, nor tags.' );
+            }
+
             $stable_tag = 'trunk';
             // Either stable_tag = trunk, or the stable_tag tag didn't exist.
@@ -381 +401 @@
         }
 
-        $tagged_versions = SVN::ls( "https://plugins.svn.wordpress.org/{$plugin_slug}/tags/" ) ?: array();
-        $tagged_versions = array_map( function( $item ) {
-            return rtrim( $item, '/' );
-        }, $tagged_versions );
-
         // Find screenshots in the stable plugin folder (but don't overwrite /assets/)
         foreach ( Filesystem::list_files( "$tmp_dir/export/", false /* non-recursive */, '!^screenshot-\d+\.(jpeg|jpg|png|gif)$!' ) as $plugin_screenshot ) {