Bulk Page UI redesign

src/class-tiny-bulk-optimization.php

@@ -24,14 +24,12 @@ class Tiny_Bulk_Optimization {
 	const PAGING_SIZE = 25000;
 
 	public static function get_optimization_statistics( $settings, $result = null ) {
-		$stats                                = array();
-		$stats['uploaded-images']             = 0;
-		$stats['optimized-image-sizes']       = 0;
-		$stats['available-unoptimized-sizes'] = 0;
-		$stats['optimized-library-size']      = 0;
-		$stats['unoptimized-library-size']    = 0;
-		$stats['estimated_credit_use']        = 0;
-		$stats['available-for-optimization']  = array();
+		$stats                               = array();
+		$stats['uploaded-images']            = 0;
+		$stats['optimized-library-size']     = 0;
+		$stats['unoptimized-library-size']   = 0;
+		$stats['estimated_credit_use']       = 0;
+		$stats['available-for-optimization'] = array();
 
 		if ( is_null( $result ) ) {
 			$last_image_id = null;
@@ -104,6 +102,8 @@ private static function populate_optimization_statistics( $settings, $result, $s
 		$active_sizes        = $settings->get_sizes();
 		$active_tinify_sizes = $settings->get_active_tinify_sizes();
 		$conversion_enabled  = $settings->get_conversion_enabled();
+		$uploads             = wp_upload_dir();
+		$uploads_url         = $uploads['baseurl'];
 
 		$result_count = count( $result );
 		for ( $i = 0; $i < $result_count; $i++ ) {
@@ -125,11 +125,9 @@ private static function populate_optimization_statistics( $settings, $result, $s
 			$image_stats = $tiny_image->get_statistics( $active_sizes, $active_tinify_sizes );
 
 			++$stats['uploaded-images'];
-			$stats['estimated_credit_use']        += $image_stats['available_uncompressed_sizes'];
-			$stats['available-unoptimized-sizes'] += $image_stats['available_unoptimized_sizes'];
-			$stats['optimized-image-sizes']       += $image_stats['image_sizes_optimized'];
-			$stats['optimized-library-size']      += $image_stats['compressed_total_size'];
-			$stats['unoptimized-library-size']    += $image_stats['initial_total_size'];
+			$stats['estimated_credit_use']     += $image_stats['available_uncompressed_sizes'];
+			$stats['optimized-library-size']   += $image_stats['compressed_total_size'];
+			$stats['unoptimized-library-size'] += $image_stats['initial_total_size'];
 
 			if ( $conversion_enabled ) {
 				$stats['estimated_credit_use'] += $image_stats['available_unconverted_sizes'];
@@ -144,10 +142,44 @@ private static function populate_optimization_statistics( $settings, $result, $s
 				$stats['available-for-optimization'][] = array(
 					'ID'         => $result[ $i ]['ID'],
 					'post_title' => $result[ $i ]['post_title'],
+					'file'       => self::get_file_name( $wp_metadata ),
+					'sizes'      => $image_stats['available_unoptimized_sizes'],
+					'bytes'      => $image_stats['compressed_total_size'],
+					'thumbnail'  => self::get_thumbnail_url( $wp_metadata, $uploads_url ),
 				);
 			}
 		}// End for().
 
 		return $stats;
 	}
+
+	/**
+	 * The name of the file that was uploaded, also when WordPress scaled it down.
+	 */
+	private static function get_file_name( $wp_metadata ) {
+		if ( isset( $wp_metadata['original_image'] ) ) {
+			return wp_basename( $wp_metadata['original_image'] );
+		}
+		if ( isset( $wp_metadata['file'] ) ) {
+			return wp_basename( $wp_metadata['file'] );
+		}
+		return '';
+	}
+
+	/**
+	 * The URL of the image's thumbnail, built from its metadata so the page
+	 * does not need a query for each image. Falls back to the image itself.
+	 */
+	private static function get_thumbnail_url( $wp_metadata, $uploads_url ) {
+		if ( ! isset( $wp_metadata['file'] ) ) {
+			return '';
+		}
+		$file = $wp_metadata['file'];
+		if ( isset( $wp_metadata['sizes']['thumbnail']['file'] ) ) {
+			$directory = dirname( $file );
+			$file      = ( '.' === $directory ? '' : $directory . '/' ) .
+				$wp_metadata['sizes']['thumbnail']['file'];
+		}
+		return $uploads_url . '/' . $file;
+	}
 }

src/class-tiny-compress.php

@@ -40,15 +40,6 @@ public static function create( $api_key, $after_compress_callback = null ) {
 		return new $class( $api_key, $after_compress_callback );
 	}
 
-	/* Based on pricing April 2016. */
-	public static function estimate_cost( $compressions, $compressions_used ) {
-		return round(
-			self::compression_cost( $compressions + $compressions_used ) -
-				self::compression_cost( $compressions_used ),
-			2
-		);
-	}
-
 	protected function __construct( $after_compress_callback ) {
 		$this->after_compress_callback = $after_compress_callback;
 	}
@@ -202,22 +193,4 @@ private static function needs_resize( $file, $resize_options ) {
 
 		return $should_resize_width || $should_resize_height;
 	}
-
-	private static function compression_cost( $total ) {
-		$cost = 0;
-
-		if ( $total > 10000 ) {
-			$compressions = $total - 10000;
-			$cost        += $compressions * 0.002;
-			$total       -= $compressions;
-		}
-
-		if ( $total > Tiny_Config::MONTHLY_FREE_COMPRESSIONS ) {
-			$compressions = $total - Tiny_Config::MONTHLY_FREE_COMPRESSIONS;
-			$cost        += $compressions * 0.009;
-			$total       -= $compressions;
-		}
-
-		return $cost;
-	}
 }