Closes #794 display the smaller size on image library data

classes/Bulk/Bulk.php

@@ -185,6 +185,7 @@ public function run_optimize( string $context, int $optimization_level ) {
 			$result = $this->get_bulk_instance( $context )->get_optimized_media_ids_without_format( $format );
 			$media_ids['ids'] = array_merge( $media_ids['ids'], $result['ids'] );
 		}
+
 		$get_unoptimized_media_ids = $this->get_bulk_instance( $context )->get_unoptimized_media_ids( $optimization_level );
 
 		$media_ids['ids'] = array_merge( $media_ids['ids'], $get_unoptimized_media_ids );
@@ -597,20 +598,18 @@ public function bulk_get_stats_callback() {
 	 * @param array $old_value The old option value.
 	 * @param array $value The new option value.
 	 *
-	 * Please note that the convert_to_avif new value is a checkbox,
-	 * so it equals 1 when it's set otherwise it's not set.
-	 * That's why we need to use empty function when checking its value.
-	 *
 	 * @return void
 	 */
 	public function maybe_generate_missing_nextgen( $old_value, $value ) {
-		if ( empty( $old_value['convert_to_avif'] ) === empty( $value['convert_to_avif'] ) ) {
-			// Old value = new value so do nothing.
+		if ( isset( $old_value['convert_to_avif'] ) && isset( $value['convert_to_avif'] ) ) {
+			return;
+		}
+
+		if ( ! isset( $old_value['convert_to_avif'] ) && ! isset( $value['convert_to_avif'] ) ) {
 			return;
 		}
 
-		if ( empty( $value['convert_to_avif'] ) ) {
-			// new value is disabled, do nothing.
+		if ( isset( $value['convert_to_avif'] ) && ! (bool) $value['convert_to_avif'] ) {
 			return;
 		}
 

classes/Optimization/Data/AbstractData.php

@@ -281,32 +281,35 @@ public function get_original_size( $human_format = true, $decimals = 2 ) {
 
 	/**
 	 * Get the file size of the full size file.
-	 * If the WebP size is available, it is used.
+	 * If the Nextgen size is available, it is used.
 	 *
 	 * @since  1.9
 	 * @access public
 	 * @author Grégory Viguier
 	 *
 	 * @param  bool $human_format True to display the image human format size (1Mb).
 	 * @param  int  $decimals     Precision of number of decimal places.
-	 * @param  bool $use_webp     Use the WebP size if available.
+	 * @param  bool $use_nextgen     Use the Nextgen size if available.
 	 * @return string|int
 	 */
-	public function get_optimized_size( $human_format = true, $decimals = 2, $use_webp = true ) {
+	public function get_optimized_size( $human_format = true, $decimals = 2, $use_nextgen = true ) {
 		if ( ! $this->is_valid() ) {
 			return $human_format ? imagify_size_format( 0, $decimals ) : 0;
 		}
 
-		$data  = $this->get_optimization_data();
-		$media = $this->get_media();
+		$data   = $this->get_optimization_data();
+		$media  = $this->get_media();
+		$format = 'webp';
 
-		if ( $use_webp ) {
-			$process_class_name = imagify_get_optimization_process_class_name( $media->get_context() );
-			$webp_size_name     = 'full' . constant( $process_class_name . '::WEBP_SUFFIX' );
-		}
+		$process_class_name     = imagify_get_optimization_process_class_name( $media->get_context() );
+		$nextgen_avif_size_name = 'full' . constant( $process_class_name . '::AVIF_SUFFIX' );
+		$nextgen_webp_size_name = 'full' . constant( $process_class_name . '::WEBP_SUFFIX' );
 
-		if ( $use_webp && ! empty( $data['sizes'][ $webp_size_name ]['optimized_size'] ) ) {
-			$size = (int) $data['sizes'][ $webp_size_name ]['optimized_size'];
+		if ( $use_nextgen ) {
+			$size = (int) $data['sizes'][ $nextgen_webp_size_name ]['optimized_size'];
+			if ( ! empty( $data['sizes'][ $nextgen_avif_size_name ]['optimized_size'] ) ) {
+				$size = (int) $data['sizes'][ $nextgen_avif_size_name ]['optimized_size'];
+			}
 		} elseif ( ! empty( $data['sizes']['full']['optimized_size'] ) ) {
 			$size = (int) $data['sizes']['full']['optimized_size'];
 		} else {
@@ -320,18 +323,21 @@ public function get_optimized_size( $human_format = true, $decimals = 2, $use_we
 		// If nothing in the database, try to get the info from the file.
 		$filepath = false;
 
-		if ( $use_webp && ! empty( $data['sizes'][ $webp_size_name ]['success'] ) ) {
-			// Try with the WebP file first.
+		if ( $use_nextgen ) {
+			if ( ! empty( $data['sizes'][ $nextgen_avif_size_name ]['success'] ) ) {
+				$format = 'avif';
+			}
+			// Try with the Nextgen file first.
 			$filepath = $media->get_raw_fullsize_path();
-			$filepath = $filepath ? imagify_path_to_webp( $filepath ) : false;
+			$filepath = $filepath ? imagify_path_to_nextgen( $filepath, $format ) : false;
 
 			if ( ! $filepath || ! $this->filesystem->exists( $filepath ) ) {
 				$filepath = false;
 			}
 		}
 
 		if ( ! $filepath ) {
-			// No WebP? The full size then.
+			// No Nextgen? The full size then.
 			$filepath = $media->get_fullsize_path();
 		}
 
@@ -418,15 +424,20 @@ public function get_saving_percent() {
 		}
 
 		$process_class_name = imagify_get_optimization_process_class_name( $this->get_media()->get_context() );
-		$webp_size_name     = 'full' . constant( $process_class_name . '::WEBP_SUFFIX' );
+		$nextgen_webp_size_name     = 'full' . constant( $process_class_name . '::WEBP_SUFFIX' );
+		$nextgen_avif_size_name     = 'full' . constant( $process_class_name . '::AVIF_SUFFIX' );
 
-		$percent = $this->get_size_data( $webp_size_name, 'percent' );
+		$percent = $this->get_size_data( $nextgen_avif_size_name, 'percent' );
 
+		// Check for webp version if avif is not found.
 		if ( ! $percent ) {
-			$percent = $this->get_size_data( 'full', 'percent' );
+			$percent = $this->get_size_data( $nextgen_webp_size_name, 'percent' );
 		}
 
-		$percent = $percent ? $percent : 0;
+		if ( ! $percent ) {
+			$percent = $this->get_size_data( 'full', 'percent' );
+		}
+		$percent = $percent ?: 0;
 
 		return round( (float) $percent, 2 );
 	}

classes/Optimization/Data/DataInterface.php

@@ -208,18 +208,18 @@ public function get_original_size( $human_format = true, $decimals = 2 );
 
 	/**
 	 * Get the file size of the full size file.
-	 * If the WebP size is available, it is used.
+	 * If the Nextgen size is available, it is used.
 	 *
 	 * @since  1.9
 	 * @access public
 	 * @author Grégory Viguier
 	 *
 	 * @param  bool $human_format True to display the image human format size (1Mb).
 	 * @param  int  $decimals     Precision of number of decimal places.
-	 * @param  bool $use_webp     Use the WebP size if available.
+	 * @param  bool $use_nextgen     Use the Nextgen size if available.
 	 * @return string|int
 	 */
-	public function get_optimized_size( $human_format = true, $decimals = 2, $use_webp = true );
+	public function get_optimized_size( $human_format = true, $decimals = 2, $use_nextgen = true );
 
 
 	/** ----------------------------------------------------------------------------------------- */

classes/Optimization/Data/Noop.php

@@ -208,18 +208,18 @@ public function get_original_size( $human_format = true, $decimals = 2 ) {
 
 	/**
 	 * Get the file size of the full size file.
-	 * If the WebP size is available, it is used.
+	 * If the Nextgen size is available, it is used.
 	 *
 	 * @since  1.9
 	 * @access public
 	 * @author Grégory Viguier
 	 *
 	 * @param  bool $human_format True to display the image human format size (1Mb).
 	 * @param  int  $decimals     Precision of number of decimal places.
-	 * @param  bool $use_webp     Use the WebP size if available.
+	 * @param  bool $use_nextgen     Use the Nextgen size if available.
 	 * @return string|int
 	 */
-	public function get_optimized_size( $human_format = true, $decimals = 2, $use_webp = true ) {
+	public function get_optimized_size( $human_format = true, $decimals = 2, $use_nextgen = true ) {
 		return $human_format ? imagify_size_format( 0, $decimals ) : 0;
 	}