Changeset 10044

Timestamp:

07/09/2020 07:35:02 AM (4 years ago)

Author:

dd32

Message:

Plugin Directory: When importing plugins, use the last commit date to the stable tag as the Last Updated value for the plugin.

This allows for WordPress.org to re-import plugins/blocks without affecting the last-updated date displayed.

Props coreymckrill, dd32.
Fixes #5242.

Location:

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

Files:

• cli/class-import.php (modified) (7 diffs)
• tools/class-svn.php (modified) (1 diff)

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

@@ -75 +75 @@
         $stable_tag      = $data['stable_tag'];
         $tagged_versions = $data['tagged_versions'];
+        $last_modified   = $data['last_modified'];
         $blocks          = $data['blocks'];
         $block_files     = $data['block_files'];
@@ -103 +104 @@
             ( $svn_changed_tags && in_array( ( $stable_tag ?: 'trunk' ), $svn_changed_tags, true ) )
         ) {
-            $plugin->post_modified = $plugin->post_modified_gmt = current_time( 'mysql' );
+            if ( $last_modified ) {
+                $plugin->post_modified = $plugin->post_modified_gmt = $last_modified;
+            } else {
+                $plugin->post_modified = $plugin->post_modified_gmt = current_time( 'mysql' );
+            }
         }
 
@@ -331 +336 @@
         if ( $trunk_readme_files ) {
             $trunk_readme_file = reset( $trunk_readme_files );
+            // Preference readme.txt over readme.md if both exist.
             foreach ( $trunk_readme_files as $f ) {
                 if ( '.txt' == strtolower( substr( $f, -4 ) ) ) {
@@ -344 +350 @@
         }
 
-        $exported = false;
+        $svn_info = false;
         if ( $stable_tag && 'trunk' != $stable_tag ) {
-            $svn_export = SVN::export(
-                self::PLUGIN_SVN_BASE . "/{$plugin_slug}/tags/{$stable_tag}",
-                $tmp_dir . '/export',
-                array(
-                    'ignore-externals',
-                )
-            );
-            // Handle tags which we store as 0.blah but are in /tags/.blah
-            if ( ! $svn_export['result'] && '0.' == substr( $stable_tag, 0, 2 ) ) {
+            $stable_url = self::PLUGIN_SVN_BASE . "/{$plugin_slug}/tags/{$stable_tag}";
+            $svn_info = SVN::info( $stable_url );
+
+            if ( ! $svn_info['result'] && '0.' === substr( $stable_tag, 0, 2 ) ) {
+                // Handle tags which we store as 0.blah but are in /tags/.blah
                 $_stable_tag = substr( $stable_tag, 1 );
-                $svn_export  = SVN::export(
-                    self::PLUGIN_SVN_BASE . "/{$plugin_slug}/tags/{$_stable_tag}",
-                    $tmp_dir . '/export',
-                    array(
-                        'ignore-externals',
-                    )
-                );
-            }
-            if ( $svn_export['result'] && false !== $this->find_readme_file( $tmp_dir . '/export' ) ) {
-                $exported = true;
-            } else {
-                // Clear out any files that exist in the export.
-                Filesystem::rmdir( $tmp_dir . '/export' );
-            }
-        }
-        if ( ! $exported ) {
+                $stable_url  = self::PLUGIN_SVN_BASE . "/{$plugin_slug}/tags/{$_stable_tag}";
+                $svn_info    = SVN::info( $stable_url );
+            }
+
+            // Verify that the tag has files, falling back to trunk if not.
+            if ( ! SVN::ls( $stable_tag ) ) {
+                $svn_info = false;
+            }
+        }
+
+        if ( ! $svn_info || ! $svn_info['result'] ) {
+            $stable_tag = 'trunk';
+            $stable_url = self::PLUGIN_SVN_BASE . "/{$plugin_slug}/trunk";
+            $svn_info   = SVN::info( $stable_url );
+        }
+
+        if ( ! $svn_info['result'] ) {
+            throw new Exception( 'Could not find stable SVN URL: ' . implode( ' ', reset( $svn_info['errors'] ) ) );
+        }
+
+        $last_modified = false;
+        if ( preg_match( '/^([0-9]{4}\-[0-9]{2}\-[0-9]{2} [0-9]{1,2}:[0-9]{2}:[0-9]{2})/', $svn_info['result']['Last Changed Date'] ?? '', $m ) ) {
+            $last_modified = $m[0];
+        }
+
+        $svn_export = SVN::export(
+            $stable_url,
+            $tmp_dir . '/export',
+            array(
+                'ignore-externals',
+            )
+        );
+
+        if ( ! $svn_export['result'] || empty( $svn_export['revision'] ) ) {
             // Catch the case where exporting a tag finds nothing, but there was nothing in trunk either.
             if ( ! $trunk_files ) {
@@ -377 +397 @@
             }
 
-            $stable_tag = 'trunk';
-            // Either stable_tag = trunk, or the stable_tag tag didn't exist.
-            $svn_export = SVN::export(
-                self::PLUGIN_SVN_BASE . "/{$plugin_slug}/trunk",
-                $tmp_dir . '/export',
-                array(
-                    'ignore-externals',
-                )
-            );
-            if ( ! $svn_export['result'] || empty( $svn_export['revision'] ) ) {
-                throw new Exception( 'Could not create SVN export: ' . implode( ' ', reset( $svn_export['errors'] ) ) );
-            }
+            throw new Exception( 'Could not create SVN export: ' . implode( ' ', reset( $svn_export['errors'] ) ) );
         }
 
@@ -402 +411 @@
 
         // Now we look in the /assets/ folder for banners, screenshots, and icons.
-        $assets            = array(
+        $assets = array(
             'screenshot' => array(),
             'banner'     => array(),
             'icon'       => array(),
         );
+
         $svn_assets_folder = SVN::ls( self::PLUGIN_SVN_BASE . "/{$plugin_slug}/assets/", true /* verbose */ );
         if ( $svn_assets_folder ) { // /assets/ may not exist.
@@ -557 +567 @@
         } ) );
 
-        return compact( 'readme', 'stable_tag', 'tmp_dir', 'plugin_headers', 'assets', 'tagged_versions', 'blocks', 'block_files' );
+        return compact( 'readme', 'stable_tag', 'last_modified', 'tmp_dir', 'plugin_headers', 'assets', 'tagged_versions', 'blocks', 'block_files' );
     }
 

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

@@ -8 +8 @@
  */
 class SVN {
+    /**
+     * Get SVN info about a URL.
+     *
+     * @static
+     *
+     * @param string $url     The URL of the svn repo.
+     * @param array  $options Optional. A list of options to pass to SVN. Default: empty array.
+     *
+     * @return array {
+     *     @type bool|array $result False on failure. Otherwise an associative array.
+     *     @type bool|array $errors Whether any errors or warnings were encountered.
+     * }
+     */
+    public static function info( $url, $options = array() ) {
+        $esc_url = escapeshellarg( $url );
+
+        $options[]   = 'non-interactive';
+        if ( empty( $options['username'] ) ) {
+            $options['username'] = PLUGIN_SVN_MANAGEMENT_USER;
+            $options['password'] = PLUGIN_SVN_MANAGEMENT_PASS;
+        }
+        $esc_options = self::parse_esc_parameters( $options );
+
+        $output = self::shell_exec( "svn info $esc_options $esc_url 2>&1" );
+        if ( preg_match( '!URL: ' . untrailingslashit( $url ) . '\n!i', $output ) ) {
+            $lines  = explode( "\n", $output );
+            $result = array_filter( array_reduce(
+                $lines,
+                function( $carry, $item ) {
+                    $pair = explode( ':', $item, 2 );
+                    if ( isset( $pair[1] ) ) {
+                        $key = trim( $pair[0] );
+                        $carry[ $key ] = trim( $pair[1] );
+                    } else {
+                        $carry[] = trim( $pair[0] );
+                    }
+
+                    return $carry;
+                },
+                array()
+            ) );
+            $errors = false;
+        } else {
+            $result   = false;
+            $errors   = self::parse_svn_errors( $output );
+        }
+
+        return compact( 'result', 'errors' );
+    }
 
     /**