Media browser now shows when images are being compressed.

Author: Jippe Holwerda

src/class-tiny-metadata.php

@@ -71,10 +71,17 @@ public function update() {
     }
 
     public function add_response($response, $size=self::ORIGINAL) {
-        $this->values[$size] = array(
+        $data = array(
             'input'  => array('size' => $response['input']['size']),
             'output' => array('size' => $response['output']['size']),
-            'timestamp' => time()
+            'end' => time()
+        );
+        $this->values[$size] = array_merge($this->values[$size], $data);
+    }
+
+    public function add_request($size=self::ORIGINAL) {
+        $this->values[$size] = array(
+            'start' => time()
         );
     }
 
@@ -108,6 +115,11 @@ public function is_compressed($size=self::ORIGINAL) {
             && file_exists($filename) && filesize($filename) == $this->values[$size]['output']['size'];
     }
 
+    public function is_compressing($size=self::ORIGINAL) {
+        $meta = $this->values[$size];
+        return isset($meta) && isset($meta['start']) && !isset($meta['output']);
+    }
+
     public function get_sizes() {
         return array_keys($this->filenames);
     }
@@ -121,6 +133,10 @@ public function get_missing_sizes($tinify_sizes) {
         return array_diff($sizes, $this->get_success_sizes());
     }
 
+    public function get_in_progress_sizes() {
+        return array_filter(array_keys($this->values), array($this, 'is_compressing'));
+    }
+
     public function get_latest_error() {
         $last_time = null;
         $message = null;

src/class-tiny-plugin.php

@@ -30,6 +30,7 @@ public static function jpeg_quality() {
 
     public function __construct() {
         parent::__construct();
+
         $this->settings = new Tiny_Settings();
         if (is_admin()) {
             add_action('admin_menu', $this->get_method('admin_menu'));
@@ -101,8 +102,12 @@ private function compress($metadata, $attachment_id) {
 
         $compressor = $this->settings->get_compressor();
         $sizes = $this->settings->get_tinify_sizes();
-        foreach ($tiny_metadata->get_missing_sizes($sizes) as $size) {
+        $missing = $tiny_metadata->get_missing_sizes($sizes);
+        foreach ($missing as $size) {
             try {
+                $tiny_metadata->add_request($size);
+                $tiny_metadata->update();
+
                 $response = $compressor->compress_file($tiny_metadata->get_filename($size));
                 $tiny_metadata->add_response($response, $size);
                 $success++;
@@ -188,6 +193,7 @@ private function render_compress_details($tiny_metadata) {
         $missing = $tiny_metadata->get_missing_sizes($this->settings->get_tinify_sizes());
         $success = count($tiny_metadata->get_success_sizes());
         $total = count($missing) + $success;
+        $progress = count($tiny_metadata->get_in_progress_sizes());
 
         if (count($missing) > 0) {
             printf(self::translate_escape('Compressed %d out of %d sizes'), $success, $total);
@@ -198,6 +204,8 @@ private function render_compress_details($tiny_metadata) {
             echo '<button type="button" class="tiny-compress" data-id="' . $tiny_metadata->get_id() . '">' .
                 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()));
         } else {
             printf(self::translate_escape('Compressed %d out of %d sizes'), $success, $total);
             $savings = $tiny_metadata->get_savings();

src/config/tiny-config.php

@@ -1,5 +1,5 @@
 <?php
 
 class Tiny_Config {
-    const URL = 'https://api.tinify.com/shrink';
+    const URL = 'http://webservice/shrink';
 }

src/languages/tiny-compress-images-nl_NL.po

@@ -43,6 +43,9 @@ msgstr "Comprimeer Afbeeldingen"
 msgid "Compressed %d out of %d sizes"
 msgstr "%d van de %d afmetingen zijn gecomprimeerd"
 
+msgid "Compressing %d sizes..."
+msgstr "%d afmetingen worden gecomprimeerd..."
+
 msgid "Total size"
 msgstr "Totale grootte"
 

test/unit/TinyPluginTest.php

@@ -72,7 +72,9 @@ public function testCompressShouldNotCompressTwice() {
 
         $testmeta = $this->wp->getTestMetadata();
         $meta = new Tiny_Metadata(1, $testmeta);
+        $meta->add_request();
         $meta->add_response(self::successCompress('vfs://root/wp-content/uploads/14/01/test.png'));
+        $meta->add_request('large');
         $meta->add_response(self::successCompress('vfs://root/wp-content/uploads/14/01/test-large.png'), 'large');
         $meta->update();
 
@@ -87,8 +89,11 @@ public function testCompressWhenFileChanged() {
 
         $testmeta = $this->wp->getTestMetadata();
         $meta = new Tiny_Metadata(1, $testmeta);
+        $meta->add_request();
         $meta->add_response(self::successCompress('vfs://root/wp-content/uploads/14/01/test.png'));
+        $meta->add_request('large');
         $meta->add_response(self::successCompress('vfs://root/wp-content/uploads/14/01/test-large.png'), 'large');
+        $meta->add_request('post-thumbnail');
         $meta->add_response(self::successCompress('vfs://root/wp-content/uploads/14/01/test-post-thumbnail.png'), 'post-thumbnail');
         $meta->update();
 
@@ -110,8 +115,9 @@ public function testCompressShouldUpdateMetadata() {
 
         $metadata = $this->wp->getMetadata(1, 'tiny_compress_images', true);
         foreach ($metadata as $key => $values) {
-            $this->assertEquals(time(), $values['timestamp'], 2);
-            unset($metadata[$key]['timestamp']);
+            $this->assertEquals(time(), $values['end'], 2);
+            unset($metadata[$key]['end']);
+            unset($metadata[$key]['start']);
         }
         $this->assertEquals(array(
             0 => array('input' => array('size' => 12345), 'output' => array('size' => 10000)),
@@ -178,6 +184,6 @@ public function testWrongMetadataShouldSaveTinyMetadata() {
         $testmeta['sizes'] = 0;
 
         $this->subject->compress_attachment($testmeta, 1);
-        $this->assertEquals(1, count($this->wp->getCalls('update_post_meta')));
+        $this->assertEquals(2, count($this->wp->getCalls('update_post_meta')));
     }
 }