Changeset 46459

Timestamp:

10/11/2019 07:52:12 AM (5 years ago)

Author:

mikeschroder

Message:

Media: Update fallback previews to support _wp_make_subsizes()

Allows fallback previews (PDF by default, in core) to save image meta
after each size is generated to allow for resuming, and make sizes
immediately available.

Props azaozz, antpb, progremzion, mikeschroder.
See #48111.

Location:

trunk

Files:

• src/wp-admin/includes/image.php (modified) (1 diff)
• tests/phpunit/tests/image/functions.php (modified) (3 diffs)

trunk/src/wp-admin/includes/image.php

@@ -582 +582 @@
                 // Resize based on the full size image, rather than the source.
                 if ( ! is_wp_error( $uploaded ) ) {
-                    $editor = wp_get_image_editor( $uploaded['path'] );
+                    $image_file = $uploaded['path'];
                     unset( $uploaded['path'] );
 
-                    if ( ! is_wp_error( $editor ) ) {
-                        $metadata['sizes']         = $editor->multi_resize( $merged_sizes );
-                        $metadata['sizes']['full'] = $uploaded;
-                    }
+                    $metadata['sizes'] = array(
+                        'full' => $uploaded,
+                    );
+
+                    // Save the meta data before any image post-processing errors could happen.
+                    wp_update_attachment_metadata( $attachment_id, $metadata );
+
+                    // Create sub-sizes saving the image meta after each.
+                    $metadata = _wp_make_subsizes( $merged_sizes, $image_file, $metadata, $attachment_id );
                 }
             }

trunk/tests/phpunit/tests/image/functions.php

@@ -436 +436 @@
         $expected = array(
             'sizes' => array(
+                'full'      => array(
+                    'file'      => 'wordpress-gsoc-flyer-pdf.jpg',
+                    'width'     => 1088,
+                    'height'    => 1408,
+                    'mime-type' => 'image/jpeg',
+                ),
+                'medium'    => array(
+                    'file'      => 'wordpress-gsoc-flyer-pdf-232x300.jpg',
+                    'width'     => 232,
+                    'height'    => 300,
+                    'mime-type' => 'image/jpeg',
+                ),
+                'large'     => array(
+                    'file'      => 'wordpress-gsoc-flyer-pdf-791x1024.jpg',
+                    'width'     => 791,
+                    'height'    => 1024,
+                    'mime-type' => 'image/jpeg',
+                ),
                 'thumbnail' => array(
                     'file'      => 'wordpress-gsoc-flyer-pdf-116x150.jpg',
@@ -442 +460 @@
                     'mime-type' => 'image/jpeg',
                 ),
+            ),
+        );
+
+        $metadata = wp_generate_attachment_metadata( $attachment_id, $test_file );
+        $this->assertSame( $expected, $metadata );
+
+        unlink( $test_file );
+        foreach ( $metadata['sizes'] as $size ) {
+            unlink( '/tmp/' . $size['file'] );
+        }
+    }
+
+    /**
+     * Crop setting for PDF.
+     *
+     * @ticket 43226
+     */
+    public function test_crop_setting_for_pdf() {
+
+        if ( ! wp_image_editor_supports( array( 'mime_type' => 'application/pdf' ) ) ) {
+            $this->markTestSkipped( 'Rendering PDFs is not supported on this system.' );
+        }
+
+        update_option( 'medium_crop', 1 );
+
+        $orig_file = DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf';
+        $test_file = get_temp_dir() . 'wordpress-gsoc-flyer.pdf';
+        copy( $orig_file, $test_file );
+
+        $attachment_id = $this->factory->attachment->create_object(
+            $test_file,
+            0,
+            array(
+                'post_mime_type' => 'application/pdf',
+            )
+        );
+
+        $this->assertNotEmpty( $attachment_id );
+
+        $expected = array(
+            'sizes' => array(
+                'full'      => array(
+                    'file'      => 'wordpress-gsoc-flyer-pdf.jpg',
+                    'width'     => 1088,
+                    'height'    => 1408,
+                    'mime-type' => 'image/jpeg',
+                ),
                 'medium'    => array(
-                    'file'      => 'wordpress-gsoc-flyer-pdf-232x300.jpg',
-                    'width'     => 232,
+                    'file'      => 'wordpress-gsoc-flyer-pdf-300x300.jpg',
+                    'width'     => 300,
                     'height'    => 300,
                     'mime-type' => 'image/jpeg',
@@ -454 +519 @@
                     'mime-type' => 'image/jpeg',
                 ),
-                'full'      => array(
-                    'file'      => 'wordpress-gsoc-flyer-pdf.jpg',
-                    'width'     => 1088,
-                    'height'    => 1408,
-                    'mime-type' => 'image/jpeg',
-                ),
-            ),
-        );
-
-        $metadata = wp_generate_attachment_metadata( $attachment_id, $test_file );
-        $this->assertSame( $expected, $metadata );
-
-        unlink( $test_file );
-        foreach ( $metadata['sizes'] as $size ) {
-            unlink( '/tmp/' . $size['file'] );
-        }
-    }
-
-    /**
-     * Crop setting for PDF.
-     *
-     * @ticket 43226
-     */
-    public function test_crop_setting_for_pdf() {
-
-        if ( ! wp_image_editor_supports( array( 'mime_type' => 'application/pdf' ) ) ) {
-            $this->markTestSkipped( 'Rendering PDFs is not supported on this system.' );
-        }
-
-        update_option( 'medium_crop', 1 );
-
-        $orig_file = DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf';
-        $test_file = get_temp_dir() . 'wordpress-gsoc-flyer.pdf';
-        copy( $orig_file, $test_file );
-
-        $attachment_id = $this->factory->attachment->create_object(
-            $test_file,
-            0,
-            array(
-                'post_mime_type' => 'application/pdf',
-            )
-        );
-
-        $this->assertNotEmpty( $attachment_id );
-
-        $expected = array(
-            'sizes' => array(
                 'thumbnail' => array(
                     'file'      => 'wordpress-gsoc-flyer-pdf-116x150.jpg',
                     'width'     => 116,
                     'height'    => 150,
-                    'mime-type' => 'image/jpeg',
-                ),
-                'medium'    => array(
-                    'file'      => 'wordpress-gsoc-flyer-pdf-300x300.jpg',
-                    'width'     => 300,
-                    'height'    => 300,
-                    'mime-type' => 'image/jpeg',
-                ),
-                'large'     => array(
-                    'file'      => 'wordpress-gsoc-flyer-pdf-791x1024.jpg',
-                    'width'     => 791,
-                    'height'    => 1024,
-                    'mime-type' => 'image/jpeg',
-                ),
-                'full'      => array(
-                    'file'      => 'wordpress-gsoc-flyer-pdf.jpg',
-                    'width'     => 1088,
-                    'height'    => 1408,
                     'mime-type' => 'image/jpeg',
                 ),