Not compressing images multiple times when different sizes with the same filename exist.

Frank Evers · Frank Evers · commit dca65341d006 · 2015-09-23T17:42:22.000+02:00
diff --git a/bin/docker-functions b/bin/docker-functions
diff --git a/bin/integration-tests b/bin/integration-tests
@@ -7,7 +7,13 @@ use IO::Socket;
 use Time::HiRes qw(usleep);
 
 my $dir = dirname($0);
-my $hostip = `boot2docker ip`;
+
+my $hostip;
+if (`which docker-machine`) {
+  $hostip = `docker-machine ip default`;
+} else {
+  $hostip = `boot2docker ip`;
+}
 
 sub check_port {
     my ($ip, $port, $times, $sleep) = @_;
diff --git a/bin/restore-wordpress b/bin/restore-wordpress
@@ -19,7 +19,13 @@ source $DIR/docker-functions
 export WORDPRESS_VERSION=$version
 export WORDPRESS_DATABASE=wordpress_$version
 export MYSQL_ROOT_PASSWORD=root
-export HOST_IP=$(boot2docker ip)
+
+if hash docker-machine 2>/dev/null; then
+  export HOST_IP=$(docker-machine ip default)
+else
+  export HOST_IP=$(boot2docker ip)
+fi
+
 export MYSQL_DUMP_FILE=tmp/mysqldump_wordpress_$version.sql.gz
 
 gunzip -c < $MYSQL_DUMP_FILE | mysql -h $HOST_IP -u root "-p$MYSQL_ROOT_PASSWORD"  $WORDPRESS_DATABASE
diff --git a/bin/test-wordpress b/bin/test-wordpress
@@ -26,7 +26,13 @@ fi
 export WORDPRESS_VERSION=$version
 export WORDPRESS_DATABASE=wordpress_$version
 export MYSQL_ROOT_PASSWORD=root
-export HOST_IP=$(boot2docker ip)
+
+if hash docker-machine 2>/dev/null; then
+  export HOST_IP=$(docker-machine ip default)
+else
+  export HOST_IP=$(boot2docker ip)
+fi
+
 export HOST_PORT=80$version
-export WORDPRESS_URL=http://$(boot2docker ip):$HOST_PORT
+export WORDPRESS_URL=http://$HOST_IP:$HOST_PORT
 vendor/bin/phpunit "$PHPUNIT_ARG"
diff --git a/config/Dockerfile-wordpress-37 b/config/Dockerfile-wordpress-37
@@ -2,9 +2,9 @@ FROM wordpress:4
 
 RUN docker-php-ext-install mysql
 
-ENV WORDPRESS_VERSION 3.7.8
-ENV WORDPRESS_UPSTREAM_VERSION 3.7.8
-ENV WORDPRESS_SHA1 f6a326bc7fe8805a142d3c3e5db7857c336d8a75
+ENV WORDPRESS_VERSION 3.7.11
+ENV WORDPRESS_UPSTREAM_VERSION 3.7.11
+ENV WORDPRESS_SHA1 7b331b23756520beee83fa1530a1e43bf510b5c5
 
 # upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
 RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz \
diff --git a/config/Dockerfile-wordpress-38 b/config/Dockerfile-wordpress-38
@@ -2,9 +2,9 @@ FROM wordpress:4
 
 RUN docker-php-ext-install mysql
 
-ENV WORDPRESS_VERSION 3.8.8
-ENV WORDPRESS_UPSTREAM_VERSION 3.8.8
-ENV WORDPRESS_SHA1 8c5875ae76cdc9fb545e9e30591c67021bb1fafd
+ENV WORDPRESS_VERSION 3.8.11
+ENV WORDPRESS_UPSTREAM_VERSION 3.8.11
+ENV WORDPRESS_SHA1 d58349c2aea01aa97ce4452bfe62347a9b82d28a
 
 # upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
 RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz \
diff --git a/config/Dockerfile-wordpress-39 b/config/Dockerfile-wordpress-39
@@ -1,8 +1,8 @@
 FROM wordpress:4
 
-ENV WORDPRESS_VERSION 3.9.6
-ENV WORDPRESS_UPSTREAM_VERSION 3.9.6
-ENV WORDPRESS_SHA1 373c185080d0e3b2cd748277d013894e8a3af0d9
+ENV WORDPRESS_VERSION 3.9.9
+ENV WORDPRESS_UPSTREAM_VERSION 3.9.9
+ENV WORDPRESS_SHA1 559edda1c178879d73ad234b098b8080506fbd71
 
 # upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
 RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz \
diff --git a/config/Dockerfile-wordpress-40 b/config/Dockerfile-wordpress-40
@@ -1,8 +1,8 @@
 FROM wordpress:4
 
-ENV WORDPRESS_VERSION 4.0.5
-ENV WORDPRESS_UPSTREAM_VERSION 4.0.5
-ENV WORDPRESS_SHA1 23de8e24ea68a19723b6ebc95f44c8d32df97a8e
+ENV WORDPRESS_VERSION 4.0.8
+ENV WORDPRESS_UPSTREAM_VERSION 4.0.8
+ENV WORDPRESS_SHA1 6a3511025d9b9ccfec45efdad27d67a85ecce595
 
 # upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
 RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz \
diff --git a/config/Dockerfile-wordpress-41 b/config/Dockerfile-wordpress-41
@@ -1,8 +1,8 @@
 FROM wordpress:4
 
-ENV WORDPRESS_VERSION 4.1.5
-ENV WORDPRESS_UPSTREAM_VERSION 4.1.5
-ENV WORDPRESS_SHA1 85bc3f20d0ee8c98f9eabeba48eb37fe732eab33
+ENV WORDPRESS_VERSION 4.1.8
+ENV WORDPRESS_UPSTREAM_VERSION 4.1.8
+ENV WORDPRESS_SHA1 f3dc8f554312eeee5145c7eaaf85506e01a3d738
 
 # upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
 RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz \
diff --git a/config/Dockerfile-wordpress-42 b/config/Dockerfile-wordpress-42
@@ -1,8 +1,8 @@
 FROM wordpress:4
 
-ENV WORDPRESS_VERSION 4.2.2
-ENV WORDPRESS_UPSTREAM_VERSION 4.2.2
-ENV WORDPRESS_SHA1 d3a70d0f116e6afea5b850f793a81a97d2115039
+ENV WORDPRESS_VERSION 4.2.5
+ENV WORDPRESS_UPSTREAM_VERSION 4.2.5
+ENV WORDPRESS_SHA1 a8944f75f51b4687648a9a272e15dc17b9e25577
 
 # upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
 RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz \
diff --git a/config/Dockerfile-wordpress-43 b/config/Dockerfile-wordpress-43
@@ -0,0 +1,15 @@
+FROM wordpress:4
+
+ENV WORDPRESS_VERSION 4.3.1
+ENV WORDPRESS_UPSTREAM_VERSION 4.3.1
+ENV WORDPRESS_SHA1 b2e5652a6d2333cabe7b37459362a3e5b8b66221
+
+# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
+RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz \
+  && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
+  && tar -xzf wordpress.tar.gz -C /usr/src/ \
+  && rm wordpress.tar.gz \
+  && chown -R www-data:www-data /usr/src/wordpress
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["apache2-foreground"]
diff --git a/readme.txt b/readme.txt
@@ -20,8 +20,10 @@ Make your website faster by compressing your JPEG and PNG images. This plugin au
 * Easy bulk compression of your existing media library.
 * Compress individual images already in your media library.
 * Multisite support with a single API key.
+* Color profiles are translated to the standard RGB color space.
 * See your usage directly from the media settings and during bulk compression.
 * Select which thumbnail sizes of an image may be compressed.
+* Converts from CMYK to RGB to save more space and maximize compatibility.
 * Automatic detection of images that can be recompressed.
 * No file size limit.
 
diff --git a/src/class-tiny-metadata.php b/src/class-tiny-metadata.php
@@ -58,10 +58,17 @@ private function parse_wp_metadata($wp_metadata) {
 
         $this->filenames[self::ORIGINAL] = "$path_prefix${path_info['basename']}";
         $this->urls[self::ORIGINAL] = "$url_prefix${path_info['basename']}";
+
+        $unique_sizes = array();
         if (isset($wp_metadata['sizes']) && is_array($wp_metadata['sizes'])) {
             foreach ($wp_metadata['sizes'] as $size => $info) {
-                $this->filenames[$size] = "$path_prefix${info['file']}";
-                $this->urls[$size] = "$url_prefix${info['file']}";
+                $filename = $info['file'];
+
+                if (!isset($unique_sizes[$filename])) {
+                    $this->filenames[$size] = "$path_prefix$filename";
+                    $this->urls[$size] = "$url_prefix$filename";
+                    $unique_sizes[$filename] = true;
+                }
             }
         }
     }
@@ -128,8 +135,8 @@ public function get_success_sizes() {
         return array_filter(array_keys($this->values), array($this, 'is_compressed'));
     }
 
-    public function get_missing_sizes($tinify_sizes) {
-        $sizes = array_intersect($this->get_sizes(), $tinify_sizes);
+    public function get_uncompressed_sizes($active_tinify_sizes) {
+        $sizes = array_intersect($this->get_sizes(), $active_tinify_sizes);
         return array_diff($sizes, $this->get_success_sizes());
     }
 
diff --git a/src/class-tiny-plugin.php b/src/class-tiny-plugin.php
@@ -101,18 +101,20 @@ private function compress($metadata, $attachment_id) {
         $failed = 0;
 
         $compressor = $this->settings->get_compressor();
-        $sizes = $this->settings->get_tinify_sizes();
-        $missing = $tiny_metadata->get_missing_sizes($sizes);
-        foreach ($missing as $size) {
+        $active_tinify_sizes = $this->settings->get_active_tinify_sizes();
+        $uncompressed_sizes = $tiny_metadata->get_uncompressed_sizes($active_tinify_sizes);
+
+        foreach ($uncompressed_sizes as $uncompressed_size) {
             try {
-                $tiny_metadata->add_request($size);
+                $tiny_metadata->add_request($uncompressed_size);
                 $tiny_metadata->update();
+                $response = $compressor->compress_file($tiny_metadata->get_filename($uncompressed_size));
+                $responses[$uncompressed_size] = $response;
 
-                $response = $compressor->compress_file($tiny_metadata->get_filename($size));
-                $tiny_metadata->add_response($response, $size);
+                $tiny_metadata->add_response($response, $uncompressed_size);
                 $success++;
             } catch (Tiny_Exception $e) {
-                $tiny_metadata->add_exception($e, $size);
+                $tiny_metadata->add_exception($e, $uncompressed_size);
                 $failed++;
             }
         }
@@ -190,11 +192,15 @@ public function render_media_column($column, $id) {
     }
 
     private function render_compress_details($tiny_metadata) {
-        $missing = $tiny_metadata->get_missing_sizes($this->settings->get_tinify_sizes());
+        $missing = $tiny_metadata->get_uncompressed_sizes($this->settings->get_active_tinify_sizes());
         $success = count($tiny_metadata->get_success_sizes());
         $total = count($missing) + $success;
         $progress = count($tiny_metadata->get_in_progress_sizes());
 
+        $duplicates = count($this->settings->get_active_tinify_sizes()) - $total;
+        $success += $duplicates;
+        $total += $duplicates;
+
         if (count($missing) > 0) {
             printf(self::translate_escape('Compressed %d out of %d sizes'), $success, $total);
             echo '<br/>';
@@ -205,7 +211,7 @@ private function render_compress_details($tiny_metadata) {
                 self::translate_escape('Compress') . '</button>';
             echo '<div class="spinner hidden"></div>';
         } elseif ($progress > 0) {
-            printf(self::translate_escape('Compressing %d sizes...'), count($this->settings->get_tinify_sizes()));
+            printf(self::translate_escape('Compressing %d sizes...'), count($this->settings->get_active_tinify_sizes()));
         } else {
             printf(self::translate_escape('Compressed %d out of %d sizes'), $success, $total);
             $savings = $tiny_metadata->get_savings();
diff --git a/src/class-tiny-settings.php b/src/class-tiny-settings.php
@@ -134,7 +134,7 @@ public function get_sizes() {
         return $this->sizes;
     }
 
-    public function get_tinify_sizes() {
+    public function get_active_tinify_sizes() {
         if (is_array($this->tinify_sizes)) {
             return $this->tinify_sizes;
         }
diff --git a/test/helpers/setup.php b/test/helpers/setup.php
@@ -103,8 +103,12 @@ function setup_wordpress_site($driver) {
     }
     $driver->findElement(WebDriverBy::name('weblog_title'))->sendKeys('Wordpress test');
     $driver->findElement(WebDriverBy::name('user_name'))->clear()->sendKeys('admin');
-    $driver->findElement(WebDriverBy::name('admin_password'))->sendKeys('admin');
-    $driver->findElement(WebDriverBy::name('admin_password2'))->sendKeys('admin');
+    if (wordpress_version() > 42) {
+        $driver->findElement(WebDriverBy::id('pass1-text'))->clear()->sendKeys('a')->sendKeys('dmin');
+    } else {
+        $driver->findElement(WebDriverBy::name('admin_password'))->sendKeys('admin');
+        $driver->findElement(WebDriverBy::name('admin_password2'))->sendKeys('admin');
+    }
     $driver->findElement(WebDriverBy::name('admin_email'))->sendKeys('developers@voormedia.com');
     $driver->findElement(WebDriverBy::tagName('form'))->submit();
     $h1s = $driver->findElements(WebDriverBy::tagName('h1'));
@@ -118,13 +122,16 @@ function setup_wordpress_site($driver) {
 }
 
 function login($driver) {
+    print "Logging in to Wordpress... ";
     $driver->get(wordpress('/wp-login.php'));
     $driver->findElement(WebDriverBy::tagName('body'))->click();
     $driver->findElement(WebDriverBy::name('log'))->clear()->click()->sendKeys('admin');
     $driver->findElement(WebDriverBy::name('pwd'))->clear()->click()->sendKeys('admin');
     $driver->findElement(WebDriverBy::tagName('form'))->submit();
-    if ($driver->findElement(WebDriverBy::tagName('h2'))->getText() == 'Dashboard') {
-        print "Successfully logged into WordPress.\n";
+
+    $dashboardHeading = $driver->findElement(WebDriverBy::xpath("//html/body//div[@class='wrap']/*[self::h1 or self::h2]"));
+    if ($dashboardHeading->getText() == 'Dashboard') {
+        print "success!\n";
     } else {
         var_dump($driver->getPageSource());
         throw new UnexpectedValueException('Login failed.');
@@ -157,7 +164,6 @@ function reset_webservice() {
     curl_setopt_array($request, array(
         CURLOPT_URL => 'http://' . getenv('HOST_IP') .':8080/reset',
     ));
-
     $response = curl_exec($request);
     curl_close($request);
 }
diff --git a/test/integration/BulkCompressIntegrationTest.php b/test/integration/BulkCompressIntegrationTest.php
@@ -35,7 +35,7 @@ private function prepare($normal=1, $large=0) {
         $this->enable_compression_sizes(array('thumbnail', 'medium', 'large'));
     }
 
-    public function testBulkCompressShouldFromMediaShouldOnlyCompressSelected() {
+    public function testBulkCompressFromMediaShouldOnlyCompressSelected() {
         $this->prepare(1, 2);
 
         self::$driver->get(wordpress('/wp-admin/upload.php?orderby=title&order=asc'));
diff --git a/test/integration/SettingsIntegrationTest.php b/test/integration/SettingsIntegrationTest.php
@@ -89,6 +89,7 @@ public function testShouldPersistNoSizes() {
     public function testStatusPresenceOK() {
         reset_webservice();
         $this->set_api_key('PNG123');
+        self::$driver->wait(2)->until(WebDriverExpectedCondition::presenceOfElementLocated(WebDriverBy::cssSelector('#tiny-compress-status p')));
         $elements = self::$driver->findElement(WebDriverBy::id('tiny-compress-status'))->findElements(WebDriverBy::tagName('p'));
         $statuses = array_map('innerText', $elements);
         $this->assertContains('API connection successful', $statuses);
@@ -97,6 +98,7 @@ public function testStatusPresenceOK() {
 
     public function testStatusPresenseFail() {
         $this->set_api_key('INVALID123');
+        self::$driver->wait(2)->until(WebDriverExpectedCondition::presenceOfElementLocated(WebDriverBy::cssSelector('#tiny-compress-status p')));
         $elements = self::$driver->findElement(WebDriverBy::id('tiny-compress-status'))->findElements(WebDriverBy::tagName('p'));
         $statuses = array_map('innerText', $elements);
         $this->assertContains('API connection unsuccessful', $statuses);
diff --git a/test/unit/TinyMetadataTest.php b/test/unit/TinyMetadataTest.php
@@ -0,0 +1,41 @@
+<?php
+
+require_once(dirname(__FILE__) . "/TinyTestCase.php");
+
+class Tiny_Metadata_Test extends TinyTestCase {
+    public function setUp() {
+        parent::setUp();
+
+        $this->wp->addOption("tinypng_api_key", "test123");
+        $this->wp->addOption("tinypng_sizes[0]", "on");
+        $this->wp->addOption("tinypng_sizes[custom-size]", "on");
+        $this->wp->addOption("tinypng_sizes[custom-size-2]", "on");
+        $this->wp->addImageSize('custom-size', array('width' => 150, 'height' => 150));
+        $this->wp->addImageSize('custom-size-2', array('width' => 150, 'height' => 150));
+        $this->wp->createImages();
+
+        $wp_metadata = array();
+        $wp_metadata['file'] = "2015/09/panda.jpg";
+        $wp_metadata['width'] = 1080;
+        $wp_metadata['height'] = 720;
+        $wp_metadata['sizes'] = array();
+
+        $wp_metadata['sizes']['custom-size'] = array();
+        $wp_metadata['sizes']['custom-size']['file'] = "panda-150x150.jpg";
+        $wp_metadata['sizes']['custom-size']['width'] = 150;
+        $wp_metadata['sizes']['custom-size']['height'] = 150;
+
+        $wp_metadata['sizes']['custom-size-2'] = array();
+        $wp_metadata['sizes']['custom-size-2']['file'] = "panda-150x150.jpg";
+        $wp_metadata['sizes']['custom-size-2']['width'] = 150;
+        $wp_metadata['sizes']['custom-size-2']['height'] = 150;
+
+        $this->subject = new Tiny_Metadata(150, $wp_metadata);
+    }
+
+    public function testGetUncompressedSizesShouldReturnOnlyUniqueSizes() {
+        $tinify_sizes = array(Tiny_Metadata::ORIGINAL, "custom-size", "custom-size-2");
+        $uncompressed_sizes = array(Tiny_Metadata::ORIGINAL, "custom-size");
+        $this->assertEquals($uncompressed_sizes, $this->subject->get_uncompressed_sizes($tinify_sizes));
+    }
+}
