Always update metadata with filesize and dimensions after resulting file is downloaded.

Author: mattijsvandruenen

src/class-tiny-compress.php

@@ -85,8 +85,9 @@ public function compress_file($file, $resize_options, $preserve_options) {
         list($output, $details) = $this->compress(file_get_contents($file), $resize_options, $preserve_options);
         file_put_contents($file, $output);
 
+        $details['output'] = self::update_details($file, $details) + $details['output'];
         if ($resize_options) {
-            $details['output'] = self::update_details($file, $details) + $details['output'];
+            $details['output']['resized'] = true;
         }
 
         return $details;
@@ -139,8 +140,7 @@ protected static function update_details($file, $details) {
             'size'    => $size,
             'width'   => $width,
             'height'  => $height,
-            'ratio'   => round($size / $details['input']['size'], 4),
-            'resized' => true
+            'ratio'   => round($size / $details['input']['size'], 4)
         );
     }
 }

test/fixtures/input-copyright.jpg

@@ -163,4 +163,13 @@ public function testResizeDisabledShouldDisplayOriginalDimensionsInEditScreen()
         $this->assertContains('Dimensions: 1080 × 720',
             self::$driver->findElement(WebDriverBy::cssSelector('div.misc-pub-dimensions'))->getText());
     }
+
+    public function testPreserveCopyrightShouldDisplayCorrectImageSizeInMediaLibrary()
+    {
+        $this->set_api_key('PRESERVEJPG123');
+        $this->enable_preserve_copyright();
+        $this->upload_image(dirname(__FILE__) . '/../fixtures/input-copyright.jpg');
+        $this->assertNotContains('files modified after compression',
+            self::$driver->findElement(WebDriverBy::cssSelector('div#tinify-compress-details'))->getText());
+    }
 }

test/integration/CompressIntegrationTest.php

@@ -94,6 +94,18 @@ protected function disable_resize() {
         self::$driver->findElement(WebDriverBy::tagName('form'))->submit();
     }
 
+    protected function enable_preserve_copyright() {
+        $url = wordpress('/wp-admin/options-media.php');
+        if (self::$driver->getCurrentUrl() != $url) {
+            self::$driver->get($url);
+        }
+        $element = self::$driver->findElement(WebDriverBy::id('tinypng_preserve_data_copyright'));
+        if (!$element->getAttribute('checked')) {
+            $element->click();
+        }
+        self::$driver->findElement(WebDriverBy::tagName('form'))->submit();
+    }
+
     protected function view_edit_image($image_title = 'input-example') {
         $url = wordpress('/wp-admin/upload.php');
         if (self::$driver->getCurrentUrl() != $url) {

test/integration/IntegrationTestCase.php

@@ -28,8 +28,24 @@ function mock_jpg_response() {
     header("Compression-Count: {$session['Compression-Count']}");
 
     $response = array(
-        "input" => array("size" => 15391, "type" => "image/jpg"),
-        "output" => array("size" => 13910, "type" => "image/jpg", "ratio" => 0.904)
+        "input" => array("size" => 15391, "type" => "image/jpeg"),
+        "output" => array("size" => 13910, "type" => "image/jpeg", "ratio" => 0.904)
+    );
+    return json_encode($response);
+}
+
+function mock_preserve_jpg_copyright_response() {
+    global $session;
+
+    $session['Compression-Count'] += 1;
+    header('HTTP/1.1 201 Created');
+    header("Location: http://webservice/output/copyright.jpg");
+    header("Content-Type: application/json; charset=utf-8");
+    header("Compression-Count: {$session['Compression-Count']}");
+
+    $response = array(
+        "input" => array("size" => 110329, "type" => "image/jpeg"),
+        "output" => array("size" => 97835, "type" => "image/jpeg", "ratio" => 0.8868)
     );
     return json_encode($response);
 }
@@ -86,6 +102,12 @@ function mock_invalid_json_response() {
     } else {
         echo mock_jpg_response();
     }
+} else if ($api_key == 'PRESERVEJPG123') {
+    if (intval($_SERVER['CONTENT_LENGTH']) == 0) {
+        echo mock_empty_response();
+    } else {
+        echo mock_preserve_jpg_copyright_response();
+    }
 } else if ($api_key == 'JSON1234') {
     if (intval($_SERVER['CONTENT_LENGTH']) == 0) {
         echo mock_empty_response();