Add a separate job type to deploy just one post

Author: john-shaffer

src/Controller.php

@@ -472,6 +472,7 @@ public static function wp2staticUISaveAdvancedOptions() : void {
     public static function wp2staticEnqueueJobs( ?int $post_id = null ) : void {
         // check each of these in order we want to enqueue
         $job_types = [
+            'autoJobQueueDirectDeployPost' => 'direct_deploy_post',
             'autoJobQueueDetection' => 'detect',
             'autoJobQueueCrawling' => 'crawl',
             'autoJobQueuePostProcessing' => 'post_process',
@@ -630,7 +631,12 @@ public static function wp2staticProcessQueue() : void {
                         break;
                     case 'direct_deploy':
                         $deployer = new DirectDeployer();
-
+                        WsLog::l( 'Starting direct deployment' );
+                        $deployer->deploy();
+                        $deployer->deployComplete();
+                        break;
+                    case 'direct_deploy_post':
+                        $deployer = new DirectDeployer();
                         $post_id = $job->triggering_post_id;
                         if ( $post_id ) {
                             $path = wp_make_link_relative(get_permalink($post_id));
@@ -639,12 +645,9 @@ public static function wp2staticProcessQueue() : void {
                             WsLog::l( 'Starting direct deployment for path ' . $path );
                             $deployer->deployPaths( $detected );
                         } else {
-                            WsLog::l( 'Starting direct deployment' );
-                            $deployer->deploy();
+                            WsLog::w( 'No post ID found for direct deployment post' );
                         }
-
                         $deployer->deployComplete();
-
                         break;
                     default:
                         WsLog::l( 'Trying to process unknown job type' );

src/CoreOptions.php

@@ -188,6 +188,13 @@ public static function optionSpecs() : array {
                 'Direct Deploy',
                 ''
             ),
+            self::makeOptionSpec(
+                'boolean',
+                'autoJobQueueDirectDeployPost',
+                '0',
+                'Direct Deploy Post',
+                ''
+            ),
             self::makeOptionSpec(
                 'string',
                 'basicAuthUser',
@@ -824,6 +831,12 @@ public static function savePosted( string $screen = 'core' ) : void {
                     [ 'name' => 'autoJobQueueDirectDeploy' ]
                 );
 
+                $wpdb->update(
+                    $table_name,
+                    [ 'value' => isset( $_POST['autoJobQueueDirectDeployPost'] ) ? 1 : 0 ],
+                    [ 'name' => 'autoJobQueueDirectDeployPost' ]
+                );
+
                 break;
             case 'advanced':
                 $crawl_concurrency = intval( $_POST['crawlConcurrency'] );

src/JobQueue.php

@@ -166,12 +166,13 @@ public static function squashQueue() : void {
             'post_process',
             'deploy',
             'direct_deploy',
+            'direct_deploy_post',
         ];
 
         foreach ( $job_types as $job_type ) {
             // get all jobs for a type where status is 'waiting'
-            if ( $job_type === 'direct_deploy' ) {
-                // Don't collapse direct_deploys that target a specific
+            if ( $job_type === 'direct_deploy_post' ) {
+                // Don't collapse direct_deploy_post jobs that target a specific
                 // single post
                 $waiting_jobs = $wpdb->get_results(
                     "SELECT * FROM $table_name

src/ViewRenderer.php

@@ -263,6 +263,7 @@ public static function renderJobsPage() : void {
             'autoJobQueuePostProcessing' => CoreOptions::get( 'autoJobQueuePostProcessing' ),
             'autoJobQueueDeployment' => CoreOptions::get( 'autoJobQueueDeployment' ),
             'autoJobQueueDirectDeploy' => CoreOptions::get( 'autoJobQueueDirectDeploy' ),
+            'autoJobQueueDirectDeployPost' => CoreOptions::get( 'autoJobQueueDirectDeployPost' ),
         ];
 
         $view = apply_filters( 'wp2static_render_jobs_page_vars', $view );

views/jobs-page.php

@@ -103,6 +103,9 @@
                 <td style="text-align:center;">
                     <?php echo $label( 'autoJobQueueDirectDeploy' ); ?>
                 </td>
+                <td style="text-align:center;">
+                    <?php echo $label( 'autoJobQueueDirectDeployPost' ); ?>
+                </td>
             </tr>
         </thead>
         <tbody>
@@ -112,6 +115,7 @@
                 <td><?php echo $input( 'autoJobQueuePostProcessing' ); ?></td>
                 <td><?php echo $input( 'autoJobQueueDeployment' ); ?></td>
                 <td><?php echo $input( 'autoJobQueueDirectDeploy' ); ?></td>
+                <td><?php echo $input( 'autoJobQueueDirectDeployPost' ); ?></td>
             </tr>
         </tbody>
     </table>