Changeset 12175

Timestamp:

11/01/2022 05:41:04 AM (11 months ago)

Author:

dd32

Message:

Plugin Directory: Don't delete submitted ZIP files immediately upon approval/rejection, and instead delete them x days afterwards.

This provides some room for re-reviewing recently-rejected or recently-approved plugins when required.

Closes ​https://github.com/WordPress/wordpress.org/pull/106.
Fixes #5636.

Location:

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

Files:

• admin/class-status-transitions.php (modified) (4 diffs)
• admin/metabox/class-review-tools.php (modified) (2 diffs)
• jobs/class-manager.php (modified) (2 diffs)

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

@@ -203 +203 @@
      */
     public function approved( $post_id, $post ) {
-        $attachments   = get_attached_media( 'application/zip', $post_id );
         $plugin_author = get_user_by( 'id', $post->post_author );
 
@@ -214 +213 @@
         /*
          Temporarily disable SVN prefill from ZIP files
+        $attachments = get_attached_media( 'application/zip', $post_id );
         if ( $attachments ) {
             $attachment = end( $attachments );
@@ -229 +229 @@
         SVN::import( $dir, 'http://plugins.svn.wordpress.org/' . $post->post_name, sprintf( 'Adding %1$s by %2$s.', $post->post_title, $plugin_author->user_login ) );
 
-        // Delete zips.
-        foreach ( $attachments as $attachment ) {
-            wp_delete_attachment( $attachment->ID, true );
-        }
-
         // Grant commit access.
         Tools::grant_plugin_committer( $post->post_name, $plugin_author );
@@ -255 +250 @@
         $original_permalink = $post->post_name;
         $submission_date    = get_the_modified_date( 'F j, Y', $post_id );
-
-        // Delete zips.
-        foreach ( get_attached_media( 'application/zip', $post_id ) as $attachment ) {
-            wp_delete_attachment( $attachment->ID, true );
-        }
 
         // Change slug to 'rejected-plugin-name-rejected' to free up 'plugin-name'.

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php

@@ -113 +113 @@
         ] );
 
-        if ( in_array( $post->post_status, [ 'draft', 'pending', 'new' ], true ) ) {
-
-            $zip_files = array();
-            foreach ( get_attached_media( 'application/zip', $post ) as $zip_file ) {
-                $zip_files[ $zip_file->post_date ] = array( wp_get_attachment_url( $zip_file->ID ), $zip_file );
-            }
+        $zip_files = array();
+        foreach ( get_attached_media( 'application/zip', $post ) as $zip_file ) {
+            $zip_files[ $zip_file->post_date ] = array( wp_get_attachment_url( $zip_file->ID ), $zip_file );
+        }
+
+        if ( $zip_files ) {
             uksort( $zip_files, function ( $a, $b ) {
                 return strtotime( $a ) < strtotime( $b );
             } );
-
-            $zip_url = get_post_meta( $post->ID, '_submitted_zip', true );
-            if ( $zip_url ) {
-                // Back-compat only.
-                $zip_files['User provided URL'] = array( $zip_url, null );
-            }
 
             echo '<p><strong>Zip files:</strong></p>';
@@ -133 +127 @@
             foreach ( $zip_files as $zip_date => $zip ) {
                 list( $zip_url, $zip_file ) = $zip;
-                $zip_size                   = is_object( $zip_file ) ? size_format( filesize( get_attached_file( $zip_file->ID ) ), 1 ) : 'unknown size';
-
-                printf( '<li>%s <a href="%s">%s</a> (%s)</li>', esc_html( $zip_date ), esc_url( $zip_url ), esc_html( $zip_url ), esc_html( $zip_size ) );
+                $zip_size                   = size_format( filesize( get_attached_file( $zip_file->ID ) ), 1 );
+
+                printf(
+                    '<li>%1$s <a href="%2$s">%3$s</a> (%4$s)</li>',
+                    esc_html( $zip_date ),
+                    esc_url( $zip_url ),
+                    esc_html( basename( $zip_url ) ),
+                    esc_html( $zip_size )
+                );
             }
             echo '</ul>';
-
+        }
+
+        if ( in_array( $post->post_status, [ 'draft', 'pending', 'new' ], true ) ) {
             $slug_restricted = [];
             $slug_reserved   = [];

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

@@ -24 +24 @@
         add_action( 'plugin_directory_update_api_check', array( __NAMESPACE__ . '\API_Update_Updater', 'cron_trigger' ) );
         add_action( 'plugin_directory_translation_sync', array( __NAMESPACE__ . '\Translation_Sync', 'cron_trigger' ) );
+        add_action( 'plugin_directory_zip_cleanup', array( __NAMESPACE__ . '\Zip_Cleanup', 'cron_trigger' ) );
 
         // A cronjob to check cronjobs
@@ -259 +260 @@
             wp_schedule_event( time() + 60, 'daily', 'plugin_directory_translation_sync' );
         }
+        if ( ! wp_next_scheduled ( 'plugin_directory_zip_cleanup' ) ) {
+            wp_schedule_event( time() + 60, 'daily', 'plugin_directory_zip_cleanup' );
+        }
 
         // Check to see if `WP_CORE_LATEST_RELEASE` has changed since we last ran.