Changeset 4520

Timestamp:

12/13/2016 09:44:54 AM (10 years ago)

Author:

dd32

Message:

Plugin Directory: Shift SVN Watching, Plugin Imports, and Plugin i18n imports to Jobs.

See #2330.

Location:

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

Files:

• bin/svn-watcher.php (deleted)
• class-plugin-directory.php (modified) (2 diffs)
• cli/class-import.php (modified) (1 diff)
• cli/class-svn-watcher.php (modified) (10 diffs)
• jobs/class-manager.php (added)
• jobs/class-plugin-i18n-import.php (added)
• jobs/class-plugin-import.php (added)
• jobs/class-svn-watcher.php (added)

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

@@ -43 +43 @@
 
                 // Cron tasks.
-                add_action( 'admin_init', array( $this, 'register_cron_tasks' ) );
-                add_action( 'plugin_directory_meta_sync', array( __NAMESPACE__ . '\Jobs\Meta_Sync', 'cron_trigger' ) );
+                new Jobs\Manager();
 
                 // oEmbed whitlisting.
@@ -466 +465 @@
                                 require_once( __DIR__ . '/libs/site-search/jetpack-search.php' );
                                 \Jetpack_Search::instance();
-                }
-
-        }
-
-        /**
-         * Queue all of our cron tasks.
-         */
-        function register_cron_tasks() {
-                if ( ! wp_next_scheduled ( 'plugin_directory_meta_sync' ) ) {
-                        wp_schedule_event( time(), 'hourly', 'plugin_directory_meta_sync' );
                 }
         }

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

@@ -160 +160 @@
                 // Update all readme meta
                 foreach ( $this->readme_fields as $readme_field ) {
-                        $value = ( 'tested' == $readme_field ) ? $tested : $readme->field;
+                        $value = ( 'tested' == $readme_field ) ? $tested : $readme->$readme_field;
                         update_post_meta( $plugin->ID, $readme_field, wp_slash( $value ) );
                 }

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

@@ -2 +2 @@
 namespace WordPressdotorg\Plugin_Directory\CLI;
 use WordPressdotorg\Plugin_Directory\Plugin_Directory;
+use WordPressdotorg\Plugin_Directory\Jobs;
 use WordPressdotorg\Plugin_Directory\Tools\SVN;
 use Exception;
@@ -14 +15 @@
         const SVN_URL      = 'https://plugins.svn.wordpress.org/';
         const PHP          = '/usr/local/bin/php';
-        const PROCESS_I18N = true;
-
-        public function __construct() {
-                $this->watch();
-        }
 
         /**
@@ -24 +20 @@
          */
         public function watch() {
-                $svn_rev_option_name = 'svn_rev_' . php_uname( 'n' );
+                $svn_rev_option_name = 'svn_rev_last_processed';
 
                 $last_rev_processed = $this->get_option( $svn_rev_option_name );
@@ -37 +33 @@
                 }
 
-                if ( $last_rev_processed == $head_rev ) {
+                if ( $last_rev_processed >= $head_rev ) {
                         // Nothing to do!
                         return;
                 }
+
+                // We don't want to re-process the last rev processed, so bump past it
+                $last_rev_processed++;
 
                 echo "Processing changes from $last_rev_processed to $head_rev..\n";
@@ -51 +50 @@
                         }
 
-                        $esc_plugin_slug  = escapeshellarg( $plugin_slug );
-                        $esc_changed_tags = escapeshellarg( implode( ',', $plugin_data['tags_touched'] ) );
-                        $esc_revision     = escapeshellarg( $plugin_data['revision'] );
+                        Jobs\Plugin_Import::queue( $plugin_slug, $plugin_data );
 
-                        $cmd = self::PHP . ' ' . dirname( __DIR__ ) . "/bin/import-plugin.php --plugin {$esc_plugin_slug} --changed-tags {$esc_changed_tags} --revision {$esc_revision}";
-
-                        echo "\$$cmd\n";
-                        echo shell_exec( $cmd ) . "\n";
-
-                        if ( self::PROCESS_I18N && 'nothing-much' === $plugin_slug ) {
-                                $plugin     = Plugin_Directory::get_plugin_post( $plugin_slug );
-                                $stable_tag = $plugin->stable_tag;
-
-                                $i18n_processes = [];
-                                if ( in_array( 'trunk', $plugin_data['tags_touched'] ) ) {
-                                        if ( $plugin_data['code_touched'] ) {
-                                                $i18n_processes[] = 'trunk|code';
-                                        }
-                                        if ( $plugin_data['readme_touched'] ) {
-                                                $i18n_processes[] = 'trunk|readme';
-                                        }
-                                }
-                                if ( in_array( $stable_tag, $plugin_data['tags_touched'] ) ) {
-                                        if ( $plugin_data['code_touched'] ) {
-                                                $i18n_processes[] = "{$stable_tag}|code";
-                                        }
-                                        if ( $plugin_data['readme_touched'] ) {
-                                                $i18n_processes[] = "{$stable_tag}|readme";
-                                        }
-                                }
-
-                                $this->process_i18n_for_plugin( $plugin_slug, $i18n_processes );
-                        }
-
-                        $this->update_option( $svn_rev_option_name, $plugin_data['revision'] );
+                        $this->update_option( $svn_rev_option_name, min( $plugin_data['revisions'] ) );
                 }
 
                 // Update it to HEAD again. We do this as $plugin_data['revision'] may be set to PREVHEAD in the event the latest 2 (or more) commits are to a single plugin.
                 $this->update_option( $svn_rev_option_name, $head_rev );
-        }
-
-        /**
-         * Processes i18n import tasks.
-         *
-         * @param string $plugin_slug
-         * @param array $i18n_processes
-         */
-        protected function process_i18n_for_plugin( $plugin_slug, $i18n_processes ) {
-                foreach ( $i18n_processes as $process ) {
-                        list( $tag, $type ) = explode( '|', $process );
-
-                        $esc_plugin_slug = escapeshellarg( $plugin_slug );
-                        $esc_tag         = escapeshellarg( $tag );
-                        $esc_type        = escapeshellarg( $type );
-
-                        $cmd = self::PHP . ' ' . dirname( __DIR__ ) . "/bin/import-plugin-to-glotpress.php --plugin {$esc_plugin_slug} --tag {$esc_tag} --type {$esc_type}";
-
-                        echo "\n\$$cmd\n";
-                        echo shell_exec( $cmd ) . "\n";
-                }
         }
 
@@ -123 +69 @@
 
                 $logs = SVN::log( self::SVN_URL, array( $rev, $head_rev ) );
-                if ( $logs['error'] ) {
-                        throw new Exception( "Could not fetch plugins.svn logs: " . implode( ', ', $logs['error'] ) );
+                if ( $logs['errors'] ) {
+                        throw new Exception( "Could not fetch plugins.svn logs: " . implode( ', ', $logs['errors'] ) );
                 }
 
-                // If no changes (either no log entries, or HEAD was the same as $rev)
-                if ( ! count( $logs['log'] ) || ( 1 == count( $logs['log'] ) && $rev == array_keys( $logs['log'] )[0] ) ) {
+                // nothing new to report
+                if ( ! $logs['log'] ) {
                         return array();
                 }
@@ -144 +90 @@
                                         'code_touched' => false,
                                         'assets_touched' => false,
-                                        'revision' => PHP_INT_MAX,
+                                        'revisions' => array(),
                                 );
                         }
@@ -150 +96 @@
 
                         // Keep track of the lowest revision number we've seen for this plugin
-                        $plugin['revision'] = min( $plugin['revision'], $log['revision'] );
+                        $plugin['revisions'][] = $log['revision'];
                         foreach ( $log['paths'] as $path ) {
                                 $path_parts = explode('/', trim( $path, '/' ) );
@@ -183 +129 @@
                 // Sort plugins by minimum revision, it should already be in this order, but double check.
                 uasort( $plugins, function( $a, $b ) {
-                        if ( $a['revision'] == $b['revision'] ) {
+                        if ( min( $a['revisions'] ) == min( $b['revisions'] ) ) {
                                 return 0;
                         }
 
-                        return ( $a['revision'] < $b['revision'] ) ? -1 : 1;
+                        return ( min( $a['revisions'] ) < min( $b['revisions'] ) ) ? -1 : 1;
                 } );
 
@@ -207 +153 @@
 
         /**
-         * An implementation of `get_option()~ which doesn't utilise the cache.
+         * An implementation of `get_option()` which doesn't utilise the cache.
          * As this is a long-running script, we don't want to hit an alloptions race condition bug.
          *