Merge pull request #7 from justcoded/develop

v1.0 Added tries in optimization process, optimize only not optimize images

Author: aprokopenko

components/Optimizer.php

@@ -73,6 +73,7 @@ public function set_attachment_in_queue( $post_id ) {
 	 */
 	public function auto_optimize() {
 		$attach_ids = array();
+
 		$queue_args = array(
 			'post_type'      => 'attachment',
 			'post_status'    => 'inherit',
@@ -94,13 +95,25 @@ public function auto_optimize() {
 			),
 		);
 		$set_queue  = new \WP_Query( $queue_args );
+
 		while ( $set_queue->have_posts() ) {
 			$set_queue->the_post();
 			$attach_ids[] = get_the_ID();
 			update_post_meta( get_the_ID(), '_just_img_opt_status', Media::STATUS_IN_QUEUE );
 		}
-		require ABSPATH . 'wp-admin/includes/file.php';
-		$this->optimize_images( $attach_ids );
+		require_once ABSPATH . 'wp-admin/includes/file.php';
+		$tries = 0;
+		do {
+			$this->optimize_images( $attach_ids );
+
+			// 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++ );
 	}
 
 	/**
@@ -117,9 +130,14 @@ public function filesystem_direct() {
 	 */
 	public function manual_optimize() {
 		$attach_id = (int) $_POST['attach_id'];
+		$model     = new Media();
+
+		$tries = 1;
+		do {
+			$this->optimize_images( [ $attach_id ] );
+			$optimize_status = $model->check_optimization_status( $attach_id );
+		} while ( Media::STATUS_PROCESSED !== $optimize_status && \JustImageOptimizer::$settings->tries_count > $tries++ );
 
-		$this->optimize_images( [ $attach_id ] );
-		$model           = new Media();
 		$attach_stats    = $model->get_total_attachment_stats( $attach_id );
 		$data_statistics = array(
 			'saving_percent' => ( ! empty( $attach_stats[0]->percent ) ? $attach_stats[0]->percent : 0 ),
@@ -136,21 +154,28 @@ public function manual_optimize() {
 	 * Function for optimize images
 	 *
 	 * @param array $attach_ids Attachment ids.
+	 *
+	 * @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 ) {
+		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 );
 			$log->save_details( $request_id, $attach_id, $file_sizes );
@@ -166,13 +191,14 @@ protected function optimize_images( array $attach_ids ) {
 		if ( ! $status || 0 === count( glob( $dir ) ) || empty( $image_files ) ) {
 			foreach ( $attach_ids as $attach_id ) {
 				$log->update_status( $attach_id, $request_id, Log::STATUS_REMOVED );
-				$media->clean_statistics( $attach_id );
+				$optimize_status = $media->check_optimization_status( $attach_id );
+				update_post_meta( $attach_id, '_just_img_opt_status', $optimize_status );
 			}
 			$wp_filesystem->rmdir( $dir, true );
 			return false;
 		}
 
-		$get_path  = $media->get_uploads_path();
+		$get_path = $media->get_uploads_path();
 
 		// process image replacement.
 		foreach ( $image_files as $key => $file ) {
@@ -196,7 +222,8 @@ protected function optimize_images( array $attach_ids ) {
 			$file_sizes = $media->get_file_sizes( $attach_id, 'detailed' );
 			$media->update_stats( $attach_id, $file_sizes );
 			$log->update_details( $request_id, $attach_id, $file_sizes );
-			update_post_meta( $attach_id, '_just_img_opt_status', Media::STATUS_PROCESSED );
+			$optimize_status = $media->check_optimization_status( $attach_id );
+			update_post_meta( $attach_id, '_just_img_opt_status', $optimize_status );
 		}
 
 		$wp_filesystem->rmdir( $dir, true );

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
+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.900';
+		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/m1x000.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace JustCoded\WP\ImageOptimizer\migrations;
+
+use JustCoded\WP\ImageOptimizer\models;
+
+/**
+ * Class m1x000
+ */
+class m1x000 extends \JustCoded\WP\ImageOptimizer\core\Migration {
+	/**
+	 * There are no changes in components structure
+	 *
+	 * @return bool
+	 */
+	public function test() {
+		// no compatibility issues.
+		return false;
+	}
+
+	/**
+	 * Update DB table
+	 * update bytes count columns from varchar to bigint.
+	 *
+	 * @return boolean
+	 */
+	public function update() {
+		global $wpdb;
+		$table_stats       = $wpdb->prefix . models\Media::TABLE_IMAGE_STATS;
+		$table_log_details = $wpdb->prefix . models\Log::TABLE_IMAGE_LOG_DETAILS;
+		$table_log         = $wpdb->prefix . models\Log::TABLE_IMAGE_LOG;
+
+		$wpdb->query( "ALTER TABLE `{$table_stats}` CHANGE `bytes_before` `bytes_before` BIGINT(20)  NOT NULL;" );
+		$wpdb->query( "ALTER TABLE `{$table_stats}` CHANGE `bytes_after` `bytes_after` BIGINT(20)  NOT NULL;" );
+
+		$wpdb->query( "ALTER TABLE `{$table_log_details}` CHANGE `bytes_before` `bytes_before` BIGINT(20)  NOT NULL;" );
+		$wpdb->query( "ALTER TABLE `{$table_log_details}` CHANGE `bytes_after` `bytes_after` BIGINT(20)  NOT NULL;" );
+
+		return true;
+	}
+}
+

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

@@ -13,15 +13,16 @@ class Media extends core\Model {
 
 	const TABLE_IMAGE_STATS = 'image_optimize';
 
-	const COL_ATTACH_ID = 'attach_id';
-	const COL_ATTACH_NAME = 'attach_name';
-	const COL_IMAGE_SIZE = 'image_size';
+	const COL_ATTACH_ID    = 'attach_id';
+	const COL_ATTACH_NAME  = 'attach_name';
+	const COL_IMAGE_SIZE   = 'image_size';
 	const COL_BYTES_BEFORE = 'bytes_before';
-	const COL_BYTES_AFTER = 'bytes_after';
+	const COL_BYTES_AFTER  = 'bytes_after';
 
-	const STATUS_IN_QUEUE = 1;
-	const STATUS_IN_PROCESS = 2;
-	const STATUS_PROCESSED = 3;
+	const STATUS_IN_QUEUE           = 1;
+	const STATUS_IN_PROCESS         = 2;
+	const STATUS_PROCESSED          = 3;
+	const STATUS_PARTIALY_PROCESSED = 4;
 
 	/**
 	 * Arguments query array to use.
@@ -40,7 +41,7 @@ class Media extends core\Model {
 	/**
 	 * Save attachment stats before optimize
 	 *
-	 * @param int $attach_id Attach ID.
+	 * @param int   $attach_id Attach ID.
 	 * @param array $stats Array with stats attachments.
 	 */
 	public function save_stats( $attach_id, $stats ) {
@@ -480,4 +481,67 @@ public function size_limit( array $attach_ids ) {
 		return $attach_ids;
 	}
 
+	/**
+	 * Check optimization table and define what is the real optimization status.
+	 *
+	 * @param int $attach_id Attachment ID to check.
+	 *
+	 * @return int  real image optimization status
+	 */
+	public static function check_optimization_status( int $attach_id ) {
+		global $wpdb;
+		$table_name = $wpdb->prefix . self::TABLE_IMAGE_STATS;
+
+		$tried_images = $wpdb->get_var( $wpdb->prepare(
+			"
+			SELECT COUNT(`id`)
+			FROM $table_name
+			WHERE `attach_id` = %d
+			",
+			$attach_id
+		) );
+		
+		$failed_images = $wpdb->get_var( $wpdb->prepare(
+			"
+			SELECT COUNT(`id`)
+			FROM $table_name
+			WHERE `attach_id` = %d
+				AND `bytes_before` <= `bytes_after`
+			",
+			$attach_id
+		) );
+		
+		$status = static::STATUS_IN_QUEUE;
+		if ( $tried_images ) {
+			$status = static::STATUS_PROCESSED;
+			if ( $failed_images ) {
+				$status = static::STATUS_PARTIALY_PROCESSED;
+			}
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Get queued image sizes, which are not optimized yet.
+	 *
+	 * @param int $attach_id Attachment ID to get image sizes in queue.
+	 *
+	 * @return string[] image sizes names
+	 */
+	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(
+			"
+			SELECT image_size
+			FROM $table_name
+			WHERE `attach_id` = %d
+				AND `bytes_before` <= `bytes_after`
+			",
+			$attach_id
+		) );
+		return $queued_images;
+	}
+
 }

models/Settings.php

@@ -18,6 +18,7 @@ class Settings extends core\Model {
 	const DB_OPT_BEFORE_REGEN  = 'joi_before_regen';
 	const DB_OPT_SIZE_CHECKED  = 'joi_image_sizes_all';
 	const DB_OPT_KEEP_ORIGIN   = 'joi_keep_origin';
+	const DB_OPT_TRIES_COUNT   = 'joi_tries_count';
 
 	/**
 	 * Optimize all image sizes or not.
@@ -47,6 +48,12 @@ class Settings extends core\Model {
 	 */
 	public $image_limit;
 
+	/**
+	 * Tries count for optimization request
+	 *
+	 * @var int
+	 */
+	public $tries_count;
 	/**
 	 * Files size limit per one optimization request
 	 *
@@ -80,6 +87,7 @@ class Settings extends core\Model {
 		'auto_optimize'   => 'int',
 		'image_limit'     => 'int',
 		'size_limit'      => 'int',
+		'tries_count'     => 'int',
 		'before_regen'    => 'int',
 		'keep_origin'     => 'int',
 	);
@@ -99,6 +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, 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 );
@@ -127,6 +136,7 @@ public function save() {
 		update_option( self::DB_OPT_AUTO_OPTIMIZE, $this->auto_optimize );
 		update_option( self::DB_OPT_SIZE_CHECKED, $this->image_sizes_all );
 		update_option( self::DB_OPT_KEEP_ORIGIN, $this->keep_origin );
+		update_option( self::DB_OPT_TRIES_COUNT, $this->tries_count );
 		$this->reset();
 
 		flush_rewrite_rules();