Merge pull request #162 from wp-cli/fix/read-error-in-exif-discovery

Fix read error detection in EXIF discovery
wp-cli · Sep 2, 2022 · 7e35526 · 7e35526
2 parents 0d5fa2a + 56f2c03
commit 7e35526
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/features/media-regenerate.feature b/features/media-regenerate.feature
@@ -1561,6 +1561,7 @@ Feature: Regenerate WordPress attachments
     # Make canola.jpg fail.
     Given a wp-content/uploads/canola.jpg file:
       """
+      We need to have some bytes at least to avoid a PHP notice in exif_imagetype().
       """
 
     When I try `WP_CLI_TEST_MEDIA_REGENERATE_PDF=1 wp media regenerate --yes`

diff --git a/src/Media_Command.php b/src/Media_Command.php
@@ -605,6 +605,14 @@ private function process_regeneration( $id, $skip_delete, $only_missing, $image_
 			return;
 		}
 
+		// On read error, we might only get the filesize returned and nothing else.
+		if ( 1 === count( $metadata ) && array_key_exists( 'filesize', $metadata ) && ! ( $is_pdf && $image_size ) ) {
+			WP_CLI::warning( sprintf( 'Read error while retrieving metadata. (ID %d)', $id ) );
+			WP_CLI::log( "$progress Couldn't regenerate thumbnails for $att_desc." );
+			$errors++;
+			return;
+		}
+
 		if ( $image_size ) {
 			if ( $this->update_attachment_metadata_for_image_size( $id, $metadata, $image_size ) ) {
 				WP_CLI::log( "$progress Regenerated $thumbnail_desc for $att_desc." );