add queue validate to keep queue up to date.

Author: DavidCramer

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-sync-queue.php

@@ -233,10 +233,20 @@ public function get_queue_status() {
 	}
 
 	/**
-	 * Build the upload sync queue.
+	 * Validate the queue is up to date and populate with unsynced assets.
 	 */
-	public function build_queue() {
+	public function validate_queue() {
 
+		$queue = $this->get_queue();
+		if ( ! empty( $queue['processing'] ) ) {
+			foreach ( $queue['processing'] as $attachment_id ) {
+				if ( $this->plugin->get_component( 'sync' )->is_synced( $attachment_id ) ) {
+					$this->mark( $attachment_id, 'done' );
+				}
+			}
+			// Get queue to get new version with marked processing.
+			$queue = $this->get_queue();
+		}
 		$args = array(
 			'post_type'           => 'attachment',
 			'post_mime_type'      => array( 'image', 'video' ),
@@ -260,6 +270,28 @@ public function build_queue() {
 
 		$attachments = new \WP_Query( $args );
 		$ids         = $attachments->get_posts();
+		// Reset Threads.
+		foreach ( $this->threads as $thread ) {
+			$queue[ $thread ]               = array();
+			$queue['run_status'][ $thread ] = array();
+		}
+		// Add items to pending queue.
+		if ( ! empty( $ids ) ) {
+			$chunk_size = ceil( count( $ids ) / count( $this->threads ) );
+			$chunks     = array_chunk( $ids, $chunk_size );
+			foreach ( $chunks as $index => $chunk ) {
+				$queue[ $this->threads[ $index ] ] = $chunk;
+			}
+		}
+
+		$this->set_queue( $queue );
+	}
+
+	/**
+	 * Build the upload sync queue.
+	 */
+	public function build_queue() {
+
 		// Transform attachments.
 		$return = array(
 			'done'       => array(),
@@ -272,16 +304,8 @@ public function build_queue() {
 			$return['run_status'][ $thread ] = array();
 		}
 
-		// Add items to pending queue.
-		if ( ! empty( $ids ) ) {
-			$chunk_size = ceil( count( $ids ) / count( $this->threads ) );
-			$chunks     = array_chunk( $ids, $chunk_size );
-			foreach ( $chunks as $index => $chunk ) {
-				$return[ $this->threads[ $index ] ] = $chunk;
-			}
-		}
-
 		$this->set_queue( $return );
+		$this->validate_queue();
 
 		return $return;
 	}

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/sync-media-footer.php

@@ -9,11 +9,15 @@
 if ( ! $this->plugin->components['sync']->managers['queue']->is_running() ) {
 	// Rebuild on load.
 	$this->plugin->components['sync']->managers['queue']->build_queue();
+} else {
+	// Check and confirm queue is in fact valid.
+	$this->plugin->components['sync']->managers['queue']->validate_queue();
 }
 
+
 ?>
 <button type="submit" class="button button-primary"><?php esc_html_e( 'Save Changes', 'cloudinary' ); ?></button>
-<hr />
+<hr/>
 <div class="sync settings-tab-section">
 	<h2><?php esc_html_e( 'Bulk-Sync WordPress Media with Cloudinary (optional)', 'cloudinary' ); ?></h2>
 
@@ -29,7 +33,7 @@
 		</button>
 		<span id="progress-wrapper" class="sync-media-progress">
 			<span class="progress-text">
-				<img src="<?php echo esc_url( CLDN_URL . 'css/loading.svg'); ?>" alt="<?php esc_attr_e( 'Syncing…', 'cloudinary' ); ?>">
+				<img src="<?php echo esc_url( CLDN_URL . 'css/loading.svg' ); ?>" alt="<?php esc_attr_e( 'Syncing…', 'cloudinary' ); ?>">
 				<?php esc_html_e( 'Syncing…', 'cloudinary' ); ?>
 			</span>
 		</span>