3.6.4 Prevent items from being re-processed (#74)

* Prevent items from being re-processed

* Remove unused var

* v3.6.4

Author: tijmenbruggeman

config/wpcli-dist.Dockerfile

@@ -0,0 +1,13 @@
+FROM wpcli/wp-cli:2-php8.2-alpine
+
+RUN apk add --no-cache git zip unzip
+
+RUN git config --global url."https://github.com/".insteadOf git@github.com: \
+ && git config --global url."https://".insteadOf git://
+
+ENV WP_CLI_PACKAGES_DIR=/var/www/.wp-cli
+
+RUN wp package install wp-cli/dist-archive-command:@stable
+
+WORKDIR /var/www/html
+ENTRYPOINT ["wp"]

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://tinypng.com/
 Tags: compress images, compression, image size, page speed, performance
 Requires at least: 4.0
 Tested up to: 6.8
-Stable tag: 3.6.3
+Stable tag: 3.6.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -174,6 +174,9 @@ A: You can upgrade to a paid account by adding your *Payment details* on your [a
 A: When the conversion feature is enabled (to convert images to AVIF or WebP), each image will use double the number of credits: one for compression and one for format conversion.
 
 == Changelog ==
+= 3.6.4 =
+* added a guard to prevent bulk processing to requeue already processed images
+
 = 3.6.3 =
 * Changed the source priority for picture elements
 

src/class-tiny-plugin.php

@@ -18,7 +18,7 @@
 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 class Tiny_Plugin extends Tiny_WP_Base {
-	const VERSION = '3.6.3';
+	const VERSION = '3.6.4';
 	const MEDIA_COLUMN = self::NAME;
 	const DATETIME_FORMAT = 'Y-m-d G:i:s';
 
@@ -252,6 +252,7 @@ public function enqueue_scripts( $hook ) {
 			'pluginVersion' => self::version(),
 			'L10nAllDone' => __( 'All images are processed', 'tiny-compress-images' ),
 			'L10nNoActionTaken' => __( 'No action taken', 'tiny-compress-images' ),
+			'L10nDuplicate' => __( 'Image was already processed', 'tiny-compress-images' ),
 			'L10nBulkAction' => __( 'Compress Images', 'tiny-compress-images' ),
 			'L10nBulkMarkCompressed' => __( 'Mark as Compressed', 'tiny-compress-images' ),
 			'L10nCancelled' => __( 'Cancelled', 'tiny-compress-images' ),

src/js/bulk-optimization.js

@@ -1,4 +1,5 @@
 (function() {
+  const processedItems = [];
   var parallelCompressions = 5;
 
   function updateProgressBar(successFullCompressions) {
@@ -148,6 +149,14 @@
       return;
     }
 
+    const itemID = items[i].ID;
+    if (processedItems.includes(itemID)) {
+      const row = jQuery('#optimization-items tr').eq(parseInt(i, 10) + 1);
+      row.find('.status')
+        .attr('data-status', 'skipped-duplicate')
+        .html('<span class="icon dashicons dashicons-no alert"></span>' + tinyCompress.L10nDuplicate);
+    }
+
     var row = jQuery('#optimization-items tr').eq(parseInt(i, 10)+1);
     row.find('.status').removeClass('todo');
     row.find('.status').html('<span class="icon spinner"></span>' + tinyCompress.L10nCompressing).attr('data-status', 'compressing');
@@ -158,12 +167,13 @@
       data: {
         _nonce: tinyCompress.nonce,
         action: 'tiny_compress_image_for_bulk',
-        id: items[i].ID,
+        id: itemID,
         current_size: window.currentLibraryBytes
       },
       success: function(data) { bulkOptimizationCallback(null, data, items, i); },
       error: function(xhr, textStatus, errorThrown) { bulkOptimizationCallback(errorThrown, null, items, i, parallelCompressions); }
     });
+    processedItems.push(itemID);
     jQuery('#tiny-progress span').html(i + 1);
   }
 
@@ -176,6 +186,7 @@
     window.optimizationCancelled = false;
     window.totalRowsDrawn = 0;
     window.currentLibraryBytes = parseInt(jQuery('#optimized-library-size').data('bytes'), 10);
+    processedItems.splice(0, processedItems.length);
 
     jQuery('div.progress').css('animation', 'progress-bar 80s linear infinite');
     jQuery('div#optimization-spinner').css('display', 'inline-block');

tiny-compress-images.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: TinyPNG - JPEG, PNG & WebP image compression
  * Description: Speed up your website. Optimize your JPEG, PNG, and WebP images automatically with TinyPNG.
- * Version: 3.6.3
+ * Version: 3.6.4
  * Author: TinyPNG
  * Author URI: https://tinypng.com
  * Text Domain: tiny-compress-images