fix(bulk): fix indefinite spinner and stuck counter in Generate Missing Next-Gen

Seven bugs caused the bulk next-gen generation flow to spin indefinitely:

Bug 1 (CustomFolders): SQL JOIN did not filter on fo.active = 1, so files
  from inactive folders inflated the count with entries never processed.

Bug 2 (CustomFolders): WHERE clause included OR fi.data IS NULL, admitting
  files with no optimization data that always fail generate_nextgen_versions().

Bug 3 (Bulk): no-backup error on the first context aborted the entire loop,
  silently skipping valid media library images.

Bug 4 (WP): status condition included mt1.meta_key IS NULL, queuing images
  with _imagify_data but no _imagify_status row, which always fail with
  not_optimized.

Bug 5 (AbstractProcess): when the API reported WebP larger than original,
  str_replace corrupted the storage key (full@imagify-webp -> full), so the
  @imagify-webp entry was never written and the image matched every subsequent
  NOT LIKE poll indefinitely.

Bug 6 (WP, CustomFolders): mime-type exclusion silently failed because
  explode/str_replace left a leading space on the mime string; webp source
  files were included in the queue.

Bug 7 (WP, CustomFolders): .webp files stored with wrong post_mime_type
  (e.g. image/jpeg) slipped past the SQL exclusion and were permanently stuck
  as remaining = 1.

Closes #1041

Author: Miraeld

classes/Bulk/Bulk.php

@@ -242,21 +242,17 @@ public function run_generate_nextgen( array $contexts, array $formats ) {
 		foreach ( $contexts as $context ) {
 			foreach ( $formats as $format ) {
 				$media = $this->get_bulk_instance( $context )->get_optimized_media_ids_without_format( $format );
-				if ( ! $media['ids'] && $media['errors']['no_backup'] ) {
-					// No backup, no next-gen.
-					return [
-						'success' => false,
-						'message' => 'no-backup',
-					];
-				} elseif ( ! $media['ids'] && $media['errors']['no_file_path'] ) {
+				if ( ! $media['ids'] && $media['errors']['no_file_path'] ) {
 					// Error.
 					return [
 						'success' => false,
 						'message' => __( 'The path to the selected files could not be retrieved.', 'imagify' ),
 					];
 				}
 
-				$medias[ $context ] = $media['ids'];
+				if ( $media['ids'] ) {
+					$medias[ $context ] = $media['ids'];
+				}
 			}
 		}
 

classes/Bulk/CustomFolders.php

@@ -114,19 +114,20 @@ public function get_optimized_media_ids_without_format( $format ) {
 		if ( ! isset( $mime ) && empty( $mime ) ) {
 			$mime = 'image/webp';
 		}
-		$mime_types     = str_replace( ",'" . $mime . "'", '', $mime_types );
+		$mime = trim( $mime );
+		$mime_types     = str_replace( [ ", '" . $mime . "'", ",'" . $mime . "'" ], '', $mime_types );
 		$nextgen_suffix = constant( imagify_get_optimization_process_class_name( 'custom-folders' ) . '::' . strtoupper( $format ) . '_SUFFIX' );
 		$files          = $wpdb->get_results(
 			$wpdb->prepare( // WPCS: unprepared SQL ok.
 				"
 			SELECT fi.file_id, fi.path
 			FROM $files_table as fi
 			INNER JOIN $folders_table AS fo
-				ON ( fi.folder_id = fo.folder_id )
+				ON ( fi.folder_id = fo.folder_id AND fo.active = 1 )
 			WHERE
 				fi.mime_type IN ( $mime_types )
 				AND ( fi.status = 'success' OR fi.status = 'already_optimized' )
-				AND ( fi.data NOT LIKE %s OR fi.data IS NULL )
+				AND fi.data NOT LIKE %s
 			ORDER BY fi.file_id DESC",
 				'%' . $wpdb->esc_like( $nextgen_suffix . '";a:4:{s:7:"success";b:1;' ) . '%'
 			)
@@ -159,6 +160,12 @@ public function get_optimized_media_ids_without_format( $format ) {
 			$file_path   = Imagify_Files_Scan::remove_placeholder( $file->path );
 			$backup_path = Imagify_Custom_Folders::get_file_backup_path( $file_path );
 
+			// Skip files whose extension already matches the target format
+			// (e.g. a .webp file stored with incorrect post_mime_type).
+			if ( strtolower( pathinfo( $file_path, PATHINFO_EXTENSION ) ) === $format ) {
+				continue;
+			}
+
 			if ( ! $this->filesystem->exists( $backup_path ) ) {
 				// No backup, no WebP.
 				$data['errors']['no_backup'][] = $file_id;

classes/Bulk/WP.php

@@ -206,7 +206,8 @@ public function get_optimized_media_ids_without_format( $format ) {
 		if ( ! isset( $mime ) && empty( $mime ) ) {
 			$mime = 'image/webp';
 		}
-		$mime_types   = str_replace( ",'" . $mime . "'", '', $mime_types );
+		$mime = trim( $mime );
+		$mime_types   = str_replace( [ ", '" . $mime . "'", ",'" . $mime . "'" ], '', $mime_types );
 		$statuses     = Imagify_DB::get_post_statuses();
 		$nodata_join  = '';
 		$nodata_where = '';
@@ -233,7 +234,7 @@ public function get_optimized_media_ids_without_format( $format ) {
 					ON ( p.ID = mt2.post_id AND mt2.meta_key = '_imagify_data' )
 			WHERE
 				p.post_mime_type IN ( $mime_types )
-				AND (mt1.meta_key IS NULL OR mt1.meta_value = 'success' OR mt1.meta_value = 'already_optimized' )
+				AND (mt1.meta_value = 'success' OR mt1.meta_value = 'already_optimized' )
 				AND mt2.meta_value NOT LIKE %s
 				AND p.post_type = 'attachment'
 				AND p.post_status IN ( $statuses )
@@ -296,6 +297,12 @@ public function get_optimized_media_ids_without_format( $format ) {
 				continue;
 			}
 
+			// Skip files whose extension already matches the target format
+			// (e.g. a .webp file stored with incorrect post_mime_type).
+			if ( strtolower( pathinfo( $file_path, PATHINFO_EXTENSION ) ) === $format ) {
+				continue;
+			}
+
 			$backup_path = get_imagify_attachment_backup_path( $file_path );
 
 			if ( ! $this->filesystem->exists( $backup_path ) ) {

classes/Optimization/Process/AbstractProcess.php

@@ -1970,9 +1970,6 @@ public function update_size_optimization_data( $response, $size, $level ) {
 		 */
 		$data = (array) apply_filters( "imagify{$_unauthorized}_file_optimization_data", $data, $response, $size, $level, $this->get_data() );
 
-		if ( property_exists( $response, 'message' ) ) {
-			$size = str_replace( $this->format, '', $size );
-		}
 		// Store.
 		$this->get_data()->update_size_optimization_data( $size, $data );