Changeset 11232

Timestamp:

09/14/2021 07:19:00 AM (5 years ago)

Author:

dd32

Message:

Theme Directory: Add a cron task to monitor themes.svn.wordpress.org for new commits.

See #5899.

Location:

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

Files:

• jobs/class-manager.php (modified) (3 diffs)
• jobs/class-svn-import.php (added)
• lib/class-exec-with-logging.php (modified) (4 diffs)
• theme-directory.php (modified) (1 diff)

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

@@ -28 +28 @@
         // A cronjob to check cronjobs.
         add_action( 'theme_directory_check_cronjobs', [ $this, 'register_cron_tasks' ] );
+
+        // Import from SVN tasks.
+        add_action( 'theme_directory_svn_import_watcher', [ __NAMESPACE__ . '\SVN_Import', 'watcher_trigger' ] );
+        add_action( 'theme_directory_svn_import', [ __NAMESPACE__ . '\SVN_Import', 'import_trigger' ] );
     }
 
@@ -42 +46 @@
             'interval' => 15 * MINUTE_IN_SECONDS,
             'display'  => 'Every 15 minutes',
+        ];
+
+        $schedules['every_5m']  = [
+            'interval' => 5 * MINUTE_IN_SECONDS,
+            'display'  => 'Every 5 minutes',
         ];
 
@@ -60 +69 @@
             wp_schedule_event( time() + 60, 'every_15m', 'theme_directory_check_cronjobs' );
         }
+
+        if ( ! wp_next_scheduled( 'theme_directory_svn_import_watcher' ) ) {
+            wp_schedule_event( time() + 60, 'every_5m', 'theme_directory_svn_import_watcher' );
+        }
     }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-exec-with-logging.php

@@ -3 +3 @@
 
 /**
- * Simple `exec()` wrapper which adds error reporting to WordPress.org.
+ * Simple `exec()` wrappers which add error reporting to WordPress.org.
  *
- * @package WordPressdotorg\Theme_Directory
+ * @package WordPressdotorg\Theme_Directory\Lib
  */
 trait Exec_With_Logging {
@@ -18 +18 @@
      * @return false|string False on failure, last line of output on success, as per exec().
      */
-    public function exec( $command, &$output = null, &$return_var = null ) {
+    public static function exec( $command, &$output = null, &$return_var = null ) {
         $proc = proc_open(
             $command,
@@ -27 +27 @@
             $pipes
         );
+
+        if ( ! $proc ) {
+            return false;
+        }
 
         $stdout = stream_get_contents( $pipes[1] );
@@ -77 +81 @@
     }
 
+    /**
+     * Execute a shell process, same behaviour as `shell_exec()` but with PHP Warnings/Notices generated on errors.
+     * 
+     * @param string $command Command to execute. Escape it.
+     * 
+     * @return false|string False on failure, output on success, mostly per shell_exec().
+     */
+    public static function shell_exec( $command ) {
+        $output     = [];
+        $return_var = 0;
+        $return = self::exec( $command, $output, $return_var );
+
+        // Diverge from shell_exec(): return false for any error.
+        if ( $return_var > 0 || false === $return || ! $output ) {
+            return false;
+        }
+
+        return implode( "\n", $output );
+    }
 }

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

@@ -27 +27 @@
 include __DIR__ . '/query-modifications.php';
 
+// Load the GitHub API client.
+include __DIR__ . '/lib/class-github.php';
+include __DIR__ . '/lib/class-exec-with-logging.php';
+
 // Load repo jobs.
 include __DIR__ . '/jobs/class-manager.php';
 include __DIR__ . '/jobs/class-trac-sync.php';
+include __DIR__ . '/jobs/class-svn-import.php';
 new WordPressdotorg\Theme_Directory\Jobs\Manager();
-
-// Load the GitHub API client.
-include __DIR__ . '/lib/class-github.php';
-include __DIR__ . '/lib/class-exec-with-logging.php';
 
 // Load the Rest API Endpoints.