Changeset 13711

Timestamp:

05/16/2024 03:06:24 AM (8 months ago)

Author:

dd32

Message:

Plugin Direcrory: When Release Confirmation is enabled, and a tag for a non-confirmed release is deleted, remove the release.

Fixes #5900.

Location:

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

Files:

• class-plugin-directory.php (modified) (3 diffs)
• cli/class-import.php (modified) (2 diffs)
• jobs/class-plugin-import.php (modified) (3 diffs)

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

@@ -1784 +1784 @@
     /**
      * Fetch a specific release of the plugin, by tag.
+     *
+     * @param string $plugin Plugin slug.
+     * @param string $tag    Release tag.
+     * @return array|bool
      */
     public static function get_release( $plugin, $tag ) {
@@ -1799 +1803 @@
     /**
      * Add a Plugin Release to the internal storage.
+     *
+     * @param string $plugin Plugin slug.
+     * @param array  $data   Release data.
+     * @return bool
      */
     public static function add_release( $plugin, $data ) {
@@ -1844 +1852 @@
 
         return update_post_meta( $plugin->ID, 'releases', $releases );
+    }
+
+    /**
+     * Remove a Plugin Release from the internal storage.
+     *
+     * @param string $plugin Plugin slug.
+     * @param string $tag    Release tag.
+     * @return bool
+     */
+    public static function remove_release( $plugin, $tag ) {
+        $result   = false;
+        $plugin   = self::get_plugin_post( $plugin );
+        $releases = self::get_releases( $plugin );
+
+        // Remove the release in question.
+        foreach ( $releases as $i => $r ) {
+            if ( $r['tag'] === $tag && ! $r['confirmed'] ) {
+                unset( $releases[ $i ] );
+
+                $result = update_post_meta( $plugin->ID, 'releases', $releases );
+            }
+        }
+
+        return $result;
     }
 

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

@@ -78 +78 @@
      * @param string $plugin_slug            The slug of the plugin to import.
      * @param array  $svn_changed_tags       A list of tags/trunk which the SVN change touched. Optional.
+     * @param array  $svn_tags_deleted       A list of tags/trunk which were deleted in the SVN change. Optional.
      * @param array  $svn_revision_triggered The SVN revision which this import has been triggered by. Optional.
      */
-    public function import_from_svn( $plugin_slug, $svn_changed_tags = array( 'trunk' ), $svn_revision_triggered = 0 ) {
+    public function import_from_svn( $plugin_slug, $svn_changed_tags = array( 'trunk' ), $svn_tags_deleted = array(), $svn_revision_triggered = 0 ) {
         // Reset properties.
         $this->warnings = [];
@@ -192 +193 @@
 
                     echo "Plugin release {$svn_changed_tag} not confirmed; email triggered.\n";
+                }
+            }
+
+            // Check to see if any of the releases were deleted.
+            foreach ( $svn_tags_deleted as $svn_deleted_tag ) {
+                // Note: Confirmed releases will not be deleted, only unconfirmed ones.
+                if ( Plugin_Directory::remove_release( $plugin, $svn_deleted_tag ) ) {
+                    echo "Plugin tag {$svn_deleted_tag} deleted; release removed.\n";
                 }
             }

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

@@ -14 +14 @@
     public static function queue( $plugin_slug, $plugin_data ) {
         // To avoid a situation where two imports run concurrently, if one is already scheduled, run it 1hr later (We'll trigger it after the current one finishes).
-        $when_to_run = time() + 10;
+        $when_to_run = time() + 5;
         if ( $next_scheduled = Manager::get_scheduled_time( "import_plugin:{$plugin_slug}", 'last' ) ) {
             $when_to_run = $next_scheduled + HOUR_IN_SECONDS;
@@ -36 +36 @@
         // Set some default values if not included from the caller.
         $plugin_data['tags_touched']   ??= array( 'trunk' );
+        $plugin_data['tags_deleted']   ??= array();
         $plugin_data['revisions']      ??= [ 0 ];
         $plugin_data['readme_touched'] ??= true;
@@ -42 +43 @@
 
         $tags_touched = $plugin_data['tags_touched'];
+        $tags_deleted = $plugin_data['tags_deleted'];
         $revision     = max( (array) $plugin_data['revisions'] );
 
         $importer = new CLI\Import();
         try {
-            $importer->import_from_svn( $plugin_slug, $tags_touched, $revision );
+            $importer->import_from_svn( $plugin_slug, $tags_touched, $tags_deleted, $revision );
         } catch ( Exception $e ) {
             fwrite( STDERR, "[{$plugin_slug}] Plugin Import Failed: " . $e->getMessage() . "\n" );