Changeset 38949

Timestamp:

10/26/2016 07:27:51 AM (8 years ago)

Author:

mikeschroder

Message:

Media: Add support for rendering PDF thumbnails.

When support for PDFs is available, on upload,
render 'Thumbnail', 'Medium', 'Large', and 'Full' sizes of
the first page, and save them in attachment meta.

Use these renders within Add Media, Media Gallery and List views,
Attachment Details, Post/Attachment Edit screens, and Attachment pages.

Support available by default via Imagick -> ImageMagick -> Ghostscript,
but can be provided by any WP_Image_Editor that supports PDFs.

Props adamsilverstein, azaozz, celloexpressions, desrosj, dglingren, ericlewis, ipstenu, joemcgill, joyously, markoheijnen, melchoyce, mikeschroder, tomauger.
Fixes #31050.

Location:

trunk

Files:

• src/wp-admin/includes/image.php (modified) (2 diffs)
• src/wp-admin/includes/media.php (modified) (1 diff)
• src/wp-includes/class-wp-image-editor-imagick.php (modified) (2 diffs)
• src/wp-includes/media-template.php (modified) (2 diffs)
• src/wp-includes/media.php (modified) (6 diffs)
• tests/phpunit/data/images/wordpress-gsoc-flyer.pdf (added)
• tests/phpunit/tests/image/functions.php (modified) (1 diff)

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

@@ -77 +77 @@
     $metadata = array();
     $support = false;
-    if ( preg_match('!^image/!', get_post_mime_type( $attachment )) && file_is_displayable_image($file) ) {
+    $mime_type = get_post_mime_type( $attachment );
+
+    if ( preg_match( '!^image/!', $mime_type ) && file_is_displayable_image( $file ) ) {
         $imagesize = getimagesize( $file );
         $metadata['width'] = $imagesize[0];
@@ -202 +204 @@
         }
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     // Remove the blob of binary data from the array.

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

@@ -2767 +2767 @@
         echo wp_video_shortcode( $attr );
 
-    else :
+    elseif ( isset( $thumb_url[0] ) ):
+
+        ?>
+        <div class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
+            <p id="thumbnail-head-<?php echo $attachment_id; ?>">
+                <img class="thumbnail" src="<?php echo set_url_scheme( $thumb_url[0] ); ?>" style="max-width:100%" alt="" />
+            </p>
+        </div>
+        <?php
+
+    else:
 
         /**

trunk/src/wp-includes/class-wp-image-editor-imagick.php

@@ -74 +74 @@
             'flipimage',
             'flopimage',
+
         );
 
@@ -145 +146 @@
 
         try {
-            $this->image = new Imagick( $this->file );
+            $this->image = new Imagick();
+            $file_parts = pathinfo( $this->file );
+
+            // By default, PDFs are rendered in a very low resolution.
+            // We want the thumbnail to be readable, so increase the rendering dpi.
+            if ( 'pdf' == strtolower( $file_parts['extension'] ) ) {
+                $this->image->setResolution( 128, 128 );
+            }
+
+            // Reading image after Imagick instantiation because `setResolution`
+            // only applies correctly before the image is read.
+            $this->image->readImage( $this->file );
 
             if ( ! $this->image->valid() )

trunk/src/wp-includes/media-template.php

@@ -291 +291 @@
                 <# if ( data.uploading ) { #>
                     <div class="media-progress-bar"><div></div></div>
-                <# } else if ( 'image' === data.type && data.sizes && data.sizes.large ) { #>
+                <# } else if ( data.sizes && data.sizes.large ) { #>
                     <img class="details-image" src="{{ data.sizes.large.url }}" draggable="false" alt="" />
-                <# } else if ( 'image' === data.type && data.sizes && data.sizes.full ) { #>
+                <# } else if ( data.sizes && data.sizes.full ) { #>
                     <img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" alt="" />
                 <# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
@@ -455 +455 @@
                         <# if ( data.image && data.image.src && data.image.src !== data.icon ) { #>
                             <img src="{{ data.image.src }}" class="thumbnail" draggable="false" alt="" />
+
+
                         <# } else { #>
                             <img src="{{ data.icon }}" class="icon" draggable="false" alt="" />

trunk/src/wp-includes/media.php

@@ -184 +184 @@
  */
 function image_downsize( $id, $size = 'medium' ) {
-
-    if ( !wp_attachment_is_image($id) )
-        return false;
+    $is_image = wp_attachment_is_image( $id );
 
     /**
@@ -210 +208 @@
     $is_intermediate = false;
     $img_url_basename = wp_basename($img_url);
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     // try for a new style intermediate size
@@ -685 +696 @@
     if ( is_array( $size ) ) {
         $candidates = array();
+
+
+
+
+
 
         foreach ( $imagedata['sizes'] as $_size => $data ) {
@@ -739 +755 @@
 
     // include the full filesystem path of the intermediate file
-    if ( empty($data['path']) && !empty($data['file']) ) {
+    if ( empty() ) {
         $file_url = wp_get_attachment_url($post_id);
         $data['path'] = path_join( dirname($imagedata['file']), $data['file'] );
@@ -3124 +3140 @@
         $response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
 
-    if ( $meta && 'image' === $type ) {
+    if ( $meta &&  ) {
         $sizes = array();
 
@@ -3172 +3188 @@
         }
 
-        $sizes['full'] = array( 'url' => $attachment_url );
-
-        if ( isset( $meta['height'], $meta['width'] ) ) {
-            $sizes['full']['height'] = $meta['height'];
-            $sizes['full']['width'] = $meta['width'];
-            $sizes['full']['orientation'] = $meta['height'] > $meta['width'] ? 'portrait' : 'landscape';
-        }
-
-        $response = array_merge( $response, array( 'sizes' => $sizes ), $sizes['full'] );
-    } elseif ( $meta && 'video' === $type ) {
+        if ( 'image' === $type ) {
+            $sizes['full'] = array( 'url' => $attachment_url );
+
+            if ( isset( $meta['height'], $meta['width'] ) ) {
+                $sizes['full']['height'] = $meta['height'];
+                $sizes['full']['width'] = $meta['width'];
+                $sizes['full']['orientation'] = $meta['height'] > $meta['width'] ? 'portrait' : 'landscape';
+            }
+
+            $response = array_merge( $response, $sizes['full'] );
+        } elseif ( $meta['sizes']['full']['file'] ) {
+            $sizes['full'] = array(
+                'url'         => $base_url . $meta['sizes']['full']['file'],
+                'height'      => $meta['sizes']['full']['height'],
+                'width'       => $meta['sizes']['full']['width'],
+                'orientation' => $meta['sizes']['full']['height'] > $meta['sizes']['full']['width'] ? 'portrait' : 'landscape'
+            );
+        }
+
+        $response = array_merge( $response, array( 'sizes' => $sizes ) );
+    }
+
+    if ( $meta && 'video' === $type ) {
         if ( isset( $meta['width'] ) )
             $response['width'] = (int) $meta['width'];

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

@@ -352 +352 @@
         WP_Image_Editor_Mock::$save_return = array();
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }