Tested 1.0 with new upgraded image optimization flow

Author: aprokopenko

components/Optimizer.php

@@ -102,10 +102,18 @@ public function auto_optimize() {
 			update_post_meta( get_the_ID(), '_just_img_opt_status', Media::STATUS_IN_QUEUE );
 		}
 		require_once ABSPATH . 'wp-admin/includes/file.php';
-		$tries = 1;
+		$tries = 0;
 		do {
 			$this->optimize_images( $attach_ids );
-		} while ( \JustImageOptimizer::$settings->tries_count > $tries++ );
+
+			// remove processed attachments from list.
+			foreach ( $attach_ids as $key => $attach_id ) {
+				$status = (int) get_post_meta( $attach_id, '_just_img_opt_status' );
+				if ( Media::STATUS_PROCESSED === $status ) {
+					unset( $attach_ids[ $key ] );
+				}
+			}
+		} while ( ! empty( $attach_ids ) && \JustImageOptimizer::$settings->tries_count > $tries++ );
 	}
 
 	/**
@@ -150,25 +158,27 @@ public function manual_optimize() {
 	 * @return boolean
 	 */
 	protected function optimize_images( array $attach_ids ) {
-		/* @var $wp_filesystem \WP_Filesystem_Direct */
+		/* @var \WP_Filesystem_Direct $wp_filesystem */
 		global $wp_filesystem;
-		$media               = new Media();
-		$log                 = new Log();
-		$before_attach_found = $attach_ids;
-		$attach_ids          = $media->size_limit( $attach_ids );
+		$media      = new Media();
+		$log        = new Log();
+		$attach_ids = $media->size_limit( $attach_ids );
 		// add filter for WP_FIlesystem permission.
 		add_filter( 'filesystem_method', array( $this, 'filesystem_direct' ) );
 		WP_Filesystem();
 		// set statistics and status before replace images.
 		$request_id = $log->start_request();
 
-		foreach ( $attach_ids as $attach_id ) {
-			$optimize_status = $media->check_optimization_status( $attach_id );
+		foreach ( $attach_ids as $key => $attach_id ) {
+			$optimize_status = (int) get_post_meta( $attach_id, '_just_img_opt_status' );
+			if ( Media::STATUS_PROCESSED === $optimize_status ) {
+				unset( $attach_ids[ $key ] );
+				continue;
+			}
+
 			$file_sizes = $media->get_file_sizes( $attach_id, 'detailed' );
 			$media->save_stats( $attach_id, $file_sizes );
-			if( Media::STATUS_PROCESSED !== $optimize_status ) {
-				$log->save_details( $request_id, $attach_id, $file_sizes );
-			}
+			$log->save_details( $request_id, $attach_id, $file_sizes );
 			update_post_meta( $attach_id, '_just_img_opt_status', Media::STATUS_IN_PROCESS );
 		}
 		// upload images from service.
@@ -188,7 +198,7 @@ protected function optimize_images( array $attach_ids ) {
 			return false;
 		}
 
-		$get_path  = $media->get_uploads_path();
+		$get_path = $media->get_uploads_path();
 
 		// process image replacement.
 		foreach ( $image_files as $key => $file ) {

just-image-optimizer.php

@@ -1,9 +1,10 @@
 <?php
 
 /*
-Plugin Name: Just Image Optimizer BETA
+Plugin Name: Just Image Optimizer
 Description: Compress image files, improve performance and boost your SEO rank using Google Page Speed Insights compression and optimization.
-Version: 0.9.2
+Tags: image, resize, optimize, optimise, compress, performance, optimisation, optimise JPG, pictures, optimizer, Google Page Speed
+Version: 1.0
 Author: JustCoded
 License: GPLv2 or later
 */
@@ -77,7 +78,7 @@ protected function __construct() {
 		$loader = new core\PluginLoader();
 		// init plugin name and version.
 		self::$plugin_name = __( 'Just Image Optimizer', self::TEXTDOMAIN );
-		self::$version     = '0.910';
+		self::$version     = '1.000';
 		self::$opt_version = get_option( self::OPT_VERSION );
 		self::$settings    = new models\Settings();
 		self::$service     = services\ImageOptimizerFactory::create();
@@ -89,7 +90,7 @@ protected function __construct() {
 		new components\Optimizer();
 
 		// admin panel option pages.
-		// we use wp_doing_ajax to prevent version check under ajax
+		// we use wp_doing_ajax to prevent version check under ajax.
 		if ( ! wp_doing_ajax() && $loader->check_migrations_available() ) {
 			new controllers\MigrateController();
 		} else {

migrations/m0x110.php

@@ -7,7 +7,7 @@
 /**
  * Class m0x110
  */
-class m0X110 extends \JustCoded\WP\ImageOptimizer\core\Migration {
+class m0x110 extends \JustCoded\WP\ImageOptimizer\core\Migration {
 	/**
 	 * There are no changes in components structure
 	 *

migrations/m0x910.php migrations/m1x000.phpmigrations/m0x910.php renamed to migrations/m1x000.php

@@ -5,9 +5,9 @@
 use JustCoded\WP\ImageOptimizer\models;
 
 /**
- * Class m0x910
+ * Class m1x000
  */
-class m0X910 extends \JustCoded\WP\ImageOptimizer\core\Migration {
+class m1x000 extends \JustCoded\WP\ImageOptimizer\core\Migration {
 	/**
 	 * There are no changes in components structure
 	 *

models/Log.php

@@ -140,7 +140,17 @@ public function save_details( $request_id, $attach_id, $stats ) {
 		global $wpdb;
 		$table_name = $wpdb->prefix . self::TABLE_IMAGE_LOG_DETAILS;
 
+		$settings      = \JustImageOptimizer::$settings;
+		$not_optimized = Media::get_queued_image_sizes( $attach_id );
+
 		foreach ( $stats as $size => $file_size ) {
+			// skip image sizes which we do not optimize by settings or they are optimized already.
+			if ( ! in_array( $size, $not_optimized, true )
+				|| ( ! $settings->image_sizes_all && ! in_array( $size, $settings->image_sizes, true ) )
+			) {
+				continue;
+			}
+
 			$image_data = image_get_intermediate_size( $attach_id, $size );
 
 			$wpdb->insert(

models/Media.php

@@ -488,7 +488,7 @@ public function size_limit( array $attach_ids ) {
 	 *
 	 * @return int  real image optimization status
 	 */
-	public function check_optimization_status( int $attach_id ) {
+	public static function check_optimization_status( int $attach_id ) {
 		global $wpdb;
 		$table_name = $wpdb->prefix . self::TABLE_IMAGE_STATS;
 
@@ -529,7 +529,7 @@ public function check_optimization_status( int $attach_id ) {
 	 *
 	 * @return string[] image sizes names
 	 */
-	public function get_queued_image_sizes( int $attach_id ) {
+	public static function get_queued_image_sizes( int $attach_id ) {
 		global $wpdb;
 		$table_name = $wpdb->prefix . self::TABLE_IMAGE_STATS;
 		$queued_images = $wpdb->get_col( $wpdb->prepare(

models/Settings.php

@@ -107,7 +107,7 @@ public function reset() {
 		$this->auto_optimize   = get_option( self::DB_OPT_AUTO_OPTIMIZE, '1' );
 		$this->image_limit     = get_option( self::DB_OPT_IMAGE_LIMIT, 5 );
 		$this->size_limit      = get_option( self::DB_OPT_SIZE_LIMIT, 10 );
-		$this->tries_count     = get_option( self::DB_OPT_TRIES_COUNT, 3 );
+		$this->tries_count     = get_option( self::DB_OPT_TRIES_COUNT, 5 );
 		$this->before_regen    = get_option( self::DB_OPT_BEFORE_REGEN );
 		$this->image_sizes_all = get_option( self::DB_OPT_SIZE_CHECKED, '1' );
 		$this->keep_origin     = get_option( self::DB_OPT_KEEP_ORIGIN );

readme.txt

@@ -1,8 +1,9 @@
 === Just Image Optimizer ===
 Contributors: aprokopenko
-Plugin Name: Just Image Optimizer BETA
-Version: 0.9
+Plugin Name: Just Image Optimizer
+Version: 1.0
 Description: Compress image files, improve performance and boost your SEO rank using Google Page Speed Insights compression and optimization.
+Tags: image, resize, optimize, optimise, compress, performance, optimisation, optimise JPG, pictures, optimizer, Google Page Speed
 Author: JustCoded
 Author URI: https://justcoded.com
 Requires at least: 4.4
@@ -29,10 +30,11 @@ https://github.com/justcoded/just-image-optimizer/issues
 
 = Plugin compatibility =
 
-In the upcoming releases, we plan to add compatibility with such plugins :
+In the upcoming releases, we plan to add compatibility with such plugins and features:
 
 * [Regenerate Thumbnails](https://wordpress.org/plugins/regenerate-thumbnails/)
 * [Just Responsive Images](https://wordpress.org/plugins/just-responsive-images/)
+* WordPress MultiSite installation
 
 == Installation ==
 
@@ -62,5 +64,9 @@ No special actions are required during the upgrade.
 
 == Changelog ==
 
+= 1.0 =
+* Upgraded optimization logic to continuosly optimizing images with several tries, due to unstable Google Page Speed API responses.
+* Improved Log.
+
 = 0.9 =
 * First beta version of the plugin. We still work on compatibility with 3rd party plugins and WordPress MultiSite installation.

views/log/index.php

@@ -17,9 +17,8 @@
 			<th>Service</th>
 			<th class="num">Image/Size Limits</th>
 			<th class="num">Attachments #</th>
-			<th class="num">Files #</th>
-			<th class="num">Files optim.</th>
-			<th class="num">Files failed</th>
+			<th class="num">Img Sizes #</th>
+			<th class="num">Optimized / Failed</th>
 			<th class="num">Saved Size</th>
 		</tr>
 		</thead>
@@ -40,8 +39,10 @@
 					<td class="num"><?php echo esc_html( $row[ Log::COL_IMAGE_LIMIT ] ); ?> attachm. / <?php echo esc_html( $row[ Log::COL_SIZE_LIMIT ] ); ?>MB</td>
 					<td class="num"><?php echo esc_html( $model->attach_count( $request_id ) ); ?></td>
 					<td class="num"><?php echo esc_html( $total_files = ! empty( $row['total_count'] ) ? $row['total_count'] : '0' ); ?></td>
-					<td class="num"><?php echo esc_html( $optimized = $model->files_count_stat( $request_id, Log::STATUS_OPTIMIZED ) ); ?></td>
-					<td class="num"><?php echo max($total_files - $optimized, 0); ?></td>
+					<td class="num">
+						<b><?php echo esc_html( $optimized = $model->files_count_stat( $request_id, Log::STATUS_OPTIMIZED ) ); ?></b>
+						/ <span class="text-danger"><?php echo esc_html( max( $total_files - $optimized, 0 ) ); ?></span>
+					</td>
 					<td class="num"><strong><?php echo esc_html( ! empty( $row['total_save'] ) ? size_format( $row['total_save'] ) : '0 B' ); ?></strong></td>
 				</tr>
 			<?php endforeach; ?>
@@ -58,9 +59,8 @@
 			<th>Service</th>
 			<th class="num">Image/Size Limits</th>
 			<th class="num">Attachments #</th>
-			<th class="num">Files #</th>
-			<th class="num">Files optim.</th>
-			<th class="num">Files failed</th>
+			<th class="num">Img Sizes #</th>
+			<th class="num">Optimized / Failed</th>
 			<th class="num">Saved Size</th>
 		</tr>
 		</tfoot>
@@ -70,4 +70,8 @@
 			<?php echo paginate_links( $log_store_data['pagination'] ); ?>
 		</div>
 	</div>
-</div>
+</div>
+
+<style type="text/css">
+	.text-danger { color:#a00; }
+</style>

views/optimize/google-page-speed.php

@@ -4,7 +4,7 @@
  *
  * @var $service \JustCoded\WP\ImageOptimizer\services\GooglePagespeed
  * @var $media \JustCoded\WP\ImageOptimizer\models\Media
- * @var $settings Settings
+ * @var $settings \JustCoded\WP\ImageOptimizer\models\Settings
  * @var $attach_ids array
  */
 
@@ -23,7 +23,7 @@
 	foreach ( $attach_ids as $attach_id ) {
 		if ( $image_sizes = $media->get_queued_image_sizes( $attach_id ) ) {
 			foreach ( $image_sizes as $image_size ) {
-				if( in_array( $image_size, $settings->image_sizes ) ) {
+				if ( $settings->image_sizes_all || in_array( $image_size, $settings->image_sizes, true ) ) {
 					if ( $img_src = $service->get_image_proxy_url( $attach_id, $image_size ) ) {
 						echo '<img src="' . esc_url( $img_src ) . '" />';
 					}