Merge pull request #8 from justcoded/develop

Compatibility with JIO, Regenerate thumbnails

Author: aprokopenko

components/MediaInfo.php

@@ -24,19 +24,34 @@ public function __construct() {
 		add_action( 'admin_print_scripts-upload.php', array( $this, 'registerAssets' ) );
 		add_action( 'admin_print_scripts-post.php', array( $this, 'registerAssets' ) );
 		add_action( 'add_meta_boxes_attachment', array( $this, 'add_optimize_meta_boxes' ), 99 );
-		add_action( 'wp_ajax_regeneratethumbnail', array( $this, 'clean_stats' ), 5 );
 
+		// clean stats on regenerate thumbnails regen.
+		add_filter( 'wp_generate_attachment_metadata', array( $this, 'clean_stats' ), 99, 2 );
 	}
 
 	/**
 	 * Clean attachment statistics with Regenerate Thumbnails
+	 *
+	 * @param array $metadata Attachment new metadata.
+	 * @param int   $attachment_id Attachment ID.
+	 *
+	 * @return array
 	 */
-	public function clean_stats() {
-		if ( ! empty( $_REQUEST['id'] ) ) {
-			$attach_id = (int) $_REQUEST['id'];
+	public function clean_stats( $metadata, $attachment_id ) {
+		// Regenerate thumbnails has no any hooks, we can define this only by REST_REQUEST.
+		if ( defined( 'REST_REQUEST' )
+			&& ! empty( $attachment_id )
+			&& (
+				// In different cases it send POST or GET request, so we check some keys it submit.
+				isset( $_POST['regeneration_args'] )
+				|| isset( $_GET['only_regenerate_missing_thumbnails'] )
+				|| ( ! empty( $_SERVER['REQUEST_URI'] ) && false !== strpos( $_SERVER['REQUEST_URI'], 'regenerate-thumbnails' ) )
+		     )
+		) {
 			$media = new Media();
-			$media->clean_statistics( $attach_id );
+			$media->clean_statistics( $attachment_id );
 		}
+		return $metadata;
 	}
 
 	/**

components/Optimizer.php

@@ -141,8 +141,8 @@ public function manual_optimize() {
 		$attach_stats    = $model->get_total_attachment_stats( $attach_id );
 		$data_statistics = array(
 			'saving_percent' => ( ! empty( $attach_stats[0]->percent ) ? $attach_stats[0]->percent : 0 ),
-			'saving_size'    => ( ! empty( $attach_stats[0]->saving_size ) ? size_format( $attach_stats[0]->saving_size ) : 0 ),
-			'total_size'     => ( ! empty( $attach_stats[0]->disk_usage ) ? size_format( $attach_stats[0]->disk_usage ) : 0 ),
+			'saving_size'    => ( ! empty( $attach_stats[0]->saving_size ) ? jio_size_format( $attach_stats[0]->saving_size ) : 0 ),
+			'total_size'     => ( ! empty( $attach_stats[0]->disk_usage ) ? jio_size_format( $attach_stats[0]->disk_usage ) : 0 ),
 			'count_images'   => $model->get_count_images( $attach_id ),
 		);
 		header( 'Content-Type: application/json; charset=' . get_bloginfo( 'charset' ) );

functions.php

@@ -25,3 +25,20 @@ function sanitize_float( $number ) {
 		return (float) $number;
 	}
 }
+
+if ( ! function_exists( 'jio_size_format' ) ) {
+	/**
+	 * Print file size friendly number with 1 decimal for MB/GB and 0 decimals for KB.
+	 *
+	 * @param int $bytes Bytes size.
+	 *
+	 * @return string Friendly file size.
+	 */
+	function jio_size_format( $bytes ) {
+		$size = size_format( $bytes, 1 );
+		if ( false !== strpos( $size, 'KB' ) ) {
+			$size = size_format( $bytes, 0 );
+		}
+		return $size;
+	}
+}

just-image-optimizer.php

@@ -4,7 +4,7 @@
 Plugin Name: Just Image Optimizer
 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
-Version: 1.0
+Version: 1.1
 Author: JustCoded
 License: GPLv2 or later
 */
@@ -78,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     = '1.000';
+		self::$version     = '1.100';
 		self::$opt_version = get_option( self::OPT_VERSION );
 		self::$settings    = new models\Settings();
 		self::$service     = services\ImageOptimizerFactory::create();

models/Media.php

@@ -269,15 +269,18 @@ public function get_file_sizes( $id, $type = 'detailed' ) {
 		WP_Filesystem();
 		$total_size  = 0;
 		$sizes_array = array();
-		$attachments = wp_get_attachment_metadata( $id );
+		$meta = wp_get_attachment_metadata( $id );
 		$get_path    = $this->get_uploads_path();
-		if ( ! $attachments ) {
+		if ( ! $meta ) {
 			return 0;
 		}
-		foreach ( $attachments['sizes'] as $size_key => $attachment ) {
-			foreach ( $get_path as $path ) {
-				if ( $wp_filesystem->exists( $path . '/' . $attachment['file'] ) ) {
-					$sizes_array[ $size_key ] = $this->get_filesize( $path . '/' . $attachment['file'] );
+
+		foreach ( $meta['sizes'] as $size_key => $attachment ) {
+			if( basename( $meta['file'] ) !== $attachment['file'] ) {
+				foreach ( $get_path as $path ) {
+					if ( $wp_filesystem->exists( $path . '/' . $attachment['file'] ) ) {
+						$sizes_array[ $size_key ] = $this->get_filesize( $path . '/' . $attachment['file'] );
+					}
 				}
 			}
 		}
@@ -351,7 +354,7 @@ public static function image_dimensions() {
 			);
 		}
 
-		return $sizes;
+		return apply_filters( 'jio_settings_image_sizes', $sizes );
 
 	}
 
@@ -448,7 +451,7 @@ public function get_disk_space_size() {
 	public function size_format_explode( $bytes ) {
 		$size = array(
 			'bytes' => $bytes,
-			'unit'  => size_format( $bytes ),
+			'unit'  => jio_size_format( $bytes ),
 		);
 
 		return $size;

readme.txt

@@ -1,7 +1,7 @@
 === Just Image Optimizer ===
 Contributors: aprokopenko
 Plugin Name: Just Image Optimizer
-Version: 1.0
+Version: 1.1
 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
@@ -30,11 +30,12 @@ https://github.com/justcoded/just-image-optimizer/issues
 
 = Plugin compatibility =
 
-In the upcoming releases, we plan to add compatibility with such plugins and features:
+Plugin is compatible with such plugins:
 
 * [Regenerate Thumbnails](https://wordpress.org/plugins/regenerate-thumbnails/)
 * [Just Responsive Images](https://wordpress.org/plugins/just-responsive-images/)
-* WordPress MultiSite installation
+
+In the upcoming releases, we plan to add compatibility with WordPress MultiSite installation.
 
 == Installation ==
 
@@ -64,6 +65,10 @@ No special actions are required during the upgrade.
 
 == Changelog ==
 
+= 1.1 =
+* Added compatibility with Just Responsive Images plugin (v1.5+)
+* Added compatibility with Regenerate Thumbnails plugin (v3+)
+
 = 1.0 =
 * Upgraded optimization logic to continuosly optimizing images with several tries, due to unstable Google Page Speed API responses.
 * Improved Log.

views/dashboard/index.php

@@ -34,8 +34,8 @@
 		</div>
 		<div class="column middle">
 			<h2>Disk Space Saving</h2>
-			<p><strong><?php echo esc_html($dash_saving_percent); ?>% saved</strong> (<?php echo size_format( $dash_saving_size ); ?>),
-				disk usage: <?php echo size_format( $model->get_images_disk_usage() ); ?></p>
+			<p><strong><?php echo esc_html($dash_saving_percent); ?>% saved</strong> (<?php echo jio_size_format( $dash_saving_size ); ?>),
+				disk usage: <?php echo jio_size_format( $model->get_images_disk_usage() ); ?></p>
 			<div id="saving" style="height: 300px; width: 95%;"></div>
 		</div>
 

views/log/index.php

@@ -43,7 +43,7 @@
 						<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>
+					<td class="num"><strong><?php echo esc_html( ! empty( $row['total_save'] ) ? jio_size_format( $row['total_save'] ) : '0 B' ); ?></strong></td>
 				</tr>
 			<?php endforeach; ?>
 		<?php else : ?>

views/log/single-log.php

@@ -38,8 +38,8 @@
 					</td>
 					<td><?php echo esc_html( $row[ Log::COL_IMAGE_SIZE ] ); ?></td>
 					<td><?php echo esc_html( $row[ Log::COL_ATTACH_NAME ] ); ?></td>
-					<td class="num"><?php echo size_format( $row[ Log::COL_BYTES_BEFORE ] ); ?></td>
-					<td class="num"><?php echo size_format( $row[ Log::COL_BYTES_AFTER ] ); ?></td>
+					<td class="num"><?php echo jio_size_format( $row[ Log::COL_BYTES_BEFORE ] ); ?></td>
+					<td class="num"><?php echo jio_size_format( $row[ Log::COL_BYTES_AFTER ] ); ?></td>
 					<td><?php echo esc_html( $model->get_status_message( $row[ Log::COL_STATUS ] ) ); ?></td>
 				</tr>
 			<?php endforeach; ?>

views/media/column.php

@@ -14,9 +14,9 @@
 <?php if ( Media::STATUS_PROCESSED === $image_status || Media::STATUS_PARTIALY_PROCESSED === $image_status ) : ?>
 	<?php if ( ! empty( $total_stats[0]->percent ) ) : ?>
 		<p><?php echo esc_html( $total_stats[0]->percent ); ?>% saved
-			(<?php echo esc_html( ! empty( $total_stats[0]->saving_size ) ? size_format( $total_stats[0]->saving_size ) : 0 ); ?>)
+			(<?php echo esc_html( ! empty( $total_stats[0]->saving_size ) ? jio_size_format( $total_stats[0]->saving_size ) : 0 ); ?>)
 		</p>
-		<p>disk usage: <?php echo size_format( $total_stats[0]->disk_usage ); ?>
+		<p>disk usage: <?php echo jio_size_format( $total_stats[0]->disk_usage ); ?>
 			(<?php echo esc_html( $model->get_count_images( $id ) ); ?> images) </p>
 		<?php if ( Media::STATUS_PARTIALY_PROCESSED === $image_status ) : ?>
 			<em>&nbsp; * can be better,