Merge pull request #915 from Codeinwp/fix/imp-performance

refactor: improve media offload URL retrieval and enhance dimension c…

Author: selul

inc/media_offload.php

@@ -2122,9 +2122,12 @@ public function alter_attachment_image_src( $image, $attachment_id, $size, $icon
 		if ( ! $this->is_new_offloaded_attachment( $attachment_id ) ) {
 			return $image;
 		}
-
-		$url       = get_post( $attachment_id );
-		$url       = $url->guid;
+		if ( isset( $image[0] ) ) {
+			$url = $image[0];
+		} else {
+			$url = get_post( $attachment_id );
+			$url = $url->guid;
+		}
 		$metadata  = wp_get_attachment_metadata( $attachment_id );
 
 		// Use the original size if the requested size is full.
@@ -2136,7 +2139,8 @@ public function alter_attachment_image_src( $image, $attachment_id, $size, $icon
 					'width'         => $metadata['width'],
 					'height'        => $metadata['height'],
 					'attachment_id' => $attachment_id,
-				]
+				],
+				$metadata
 			);
 
 			return [
@@ -2147,7 +2151,7 @@ public function alter_attachment_image_src( $image, $attachment_id, $size, $icon
 			];
 		}
 
-		if ( wp_attachment_is( 'video', $attachment_id ) && doing_action( 'wp_insert_post_data' ) ) {
+		if ( doing_action( 'wp_insert_post_data' ) && wp_attachment_is( 'video', $attachment_id ) ) {
 			return $image;
 		}
 		$sizes     = $this->size_to_dimension( $size, $metadata );
@@ -2159,7 +2163,8 @@ public function alter_attachment_image_src( $image, $attachment_id, $size, $icon
 				'height'        => $sizes['height'],
 				'resize'        => $sizes['resize'] ?? [],
 				'attachment_id' => $attachment_id,
-			]
+			],
+			$metadata
 		);
 
 		return [
@@ -2230,24 +2235,27 @@ public function alter_attachment_metadata( $metadata, $id ) {
 	/**
 	 * Get offloaded image attachment URL for new offloads.
 	 *
-	 * @param string $url The initial attachment URL.
-	 * @param int    $attachment_id The attachment ID.
-	 * @param array  $args The additional arguments.
-	 *                       - width: The width of the image.
-	 *                       - height: The height of the image.
-	 *                       - crop: Whether to crop the image.
-	 *
+	 * @param string     $url The initial attachment URL.
+	 * @param int        $attachment_id The attachment ID.
+	 * @param array      $args The additional arguments.
+	 *                           - width: The width of the image.
+	 *                           - height: The height of the image.
+	 *                           - crop: Whether to crop the image.
+	 * @param array|null $attachment_metadata The attachment metadata.
 	 * @return string
 	 */
-	private function get_new_offloaded_attachment_url( $url, $attachment_id, $args = [] ) {
+	private function get_new_offloaded_attachment_url( $url, $attachment_id, $args = [], $attachment_metadata = null ) {
 		$process_flag = self::KEYS['not_processed_flag'] . $attachment_id;
 
 		// Image might have already passed through this filter.
 		if ( strpos( $url, $process_flag ) !== false ) {
 			return $url;
 		}
-
-		$meta = wp_get_attachment_metadata( $attachment_id );
+		if ( $attachment_metadata === null ) {
+			$meta = wp_get_attachment_metadata( $attachment_id );
+		} else {
+			$meta = $attachment_metadata;
+		}
 		if ( ! isset( $meta['file'] ) ) {
 			return $url;
 		}

inc/traits/normalizer.php

@@ -11,6 +11,13 @@
  */
 trait Optml_Normalizer {
 
+	/**
+	 * Static cache for dimension calculations
+	 *
+	 * @var array
+	 */
+	private static $dimension_cache = [];
+
 	/**
 	 * Normalize value to boolean.
 	 *
@@ -205,6 +212,10 @@ public function size_to_dimension( $size, $image_meta ) {
 				if ( ! $width || ! $height ) {
 					break;
 				}
+				$cache_key = 'a' . $width . '_' . $height . '_' . $sizes['width'] . '_' . $sizes['height'];
+				if ( isset( self::$dimension_cache[ $cache_key ] ) ) {
+					return self::$dimension_cache[ $cache_key ];
+				}
 				$image_resized = image_resize_dimensions( $sizes['width'], $sizes['height'], $width, $height );
 				if ( $image_resized ) {
 					$width  = $image_resized[6];
@@ -215,8 +226,13 @@ public function size_to_dimension( $size, $image_meta ) {
 				}
 				list( $sizes['width'], $sizes['height'] ) = image_constrain_size_for_editor( $width, $height, $size );
 
+				self::$dimension_cache[ $cache_key ] = $sizes;
 				break;
 			case 'full' !== $size && isset( $image_args[ $size ] ):
+				$cache_key = 'b' . $size . '_' . $sizes['width'] . '_' . $sizes['height'];
+				if ( isset( self::$dimension_cache[ $cache_key ] ) ) {
+					return self::$dimension_cache[ $cache_key ];
+				}
 				$image_resized = image_resize_dimensions( $sizes['width'], $sizes['height'], $image_args[ $size ]['width'], $image_args[ $size ]['height'], $image_args[ $size ]['crop'] );
 
 				if ( $image_resized ) { // This could be false when the requested image size is larger than the full-size image.
@@ -230,7 +246,7 @@ public function size_to_dimension( $size, $image_meta ) {
 				list( $sizes['width'], $sizes['height'] ) = image_constrain_size_for_editor( $sizes['width'], $sizes['height'], $size, 'display' );
 
 				$sizes['resize'] = $this->to_optml_crop( $image_args[ $size ]['crop'] );
-
+				self::$dimension_cache[ $cache_key ] = $sizes;
 				break;
 		}
 		return $sizes;