simplify logic

Author: selul

inc/dam.php

@@ -678,7 +678,7 @@ public function alter_img_tag_w_h( $dimensions, $image_src, $image_meta, $attach
 		$width         = $incoming_size[0];
 		$height        = $incoming_size[1];
 
-		$sizes = $this->get_all_image_sizes();
+		$sizes = Optml_App_Replacer::image_sizes();
 
 		// If this is an image size. Return its dimensions.
 		foreach ( $sizes as $size => $args ) {

inc/media_offload.php

@@ -2253,7 +2253,7 @@ public function alter_attachment_image_src( $image, $attachment_id, $size, $icon
 			[
 				'width'         => $sizes['width'],
 				'height'        => $sizes['height'],
-				'resize'        => $sizes['resize'],
+				'resize'        => $sizes['resize'] ?? [],
 				'attachment_id' => $attachment_id,
 			]
 		);
@@ -2280,19 +2280,20 @@ public function alter_attachment_for_js( $response, $attachment, $meta ) {
 			return $response;
 		}
 
-		$sizes = $this->get_all_image_sizes();
+		$meta = [];
+		if ( isset( $response['width'] ) ) {
+			$meta['width'] = $response['width'];
+		}
+		if ( isset( $response['height'] ) ) {
+			$meta['height'] = $response['height'];
+		}
+		$sizes = Optml_App_Replacer::image_sizes();
 
 		foreach ( $sizes as $size => $args ) {
 			if ( isset( $response['sizes'][ $size ] ) ) {
 				continue;
 			}
-
-			$args = [
-				'height' => $args['height'],
-				'width'  => $args['width'],
-				'crop'   => true,
-			];
-
+			$args = $this->size_to_dimension( $size, $meta );
 			$response['sizes'][ $size ] = array_merge(
 				$args,
 				[
@@ -2301,14 +2302,7 @@ public function alter_attachment_for_js( $response, $attachment, $meta ) {
 				]
 			);
 		}
-
-		$url_args = [
-			'height' => $response['height'],
-			'width'  => $response['width'],
-			'crop'   => false,
-		];
-
-		$response['url'] = $this->get_new_offloaded_attachment_url( $response['url'], $attachment->ID, $url_args );
+		$response['url'] = $this->get_new_offloaded_attachment_url( $response['url'], $attachment->ID, $meta );
 
 		return $response;
 	}

inc/traits/dam_offload_utils.php

@@ -157,7 +157,7 @@ private function is_attachment_edit_page( $attachment_id ) {
 	 * @return mixed
 	 */
 	private function get_altered_metadata_for_remote_images( $metadata, $id ) {
-		$sizes = $this->get_all_image_sizes();
+
 
 		$post = get_post( $id );
 
@@ -174,24 +174,14 @@ private function get_altered_metadata_for_remote_images( $metadata, $id ) {
 		if ( ! isset( $metadata['height'] ) || ! isset( $metadata['width'] ) ) {
 			return $metadata;
 		}
-
+		$sizes = Optml_App_Replacer::image_sizes();
 		foreach ( $sizes as $size => $args ) {
 			// check if the image is portrait or landscape using attachment metadata.
-			$is_portrait = $metadata['height'] > $metadata['width'];
-
-			// proportionally set the width/height based on this if image is uncropped.
-			if ( ! (bool) $args['crop'] ) {
-				if ( $is_portrait ) {
-					$args['width'] = (int) ( $args['height'] * round( $metadata['width'] / $metadata['height'] ) );
-				} else {
-					$args['height'] = (int) ( $args['width'] * round( $metadata['height'] / $metadata['width'] ) );
-				}
-			}
-
+			$dimensions = $this->size_to_dimension( $size, $metadata );
 			$sizes_meta[ $size ] = [
 				'file'      => $metadata['file'],
-				'width'     => $args['width'],
-				'height'    => $args['height'],
+				'width'     => $dimensions['width'],
+				'height'    => $dimensions['height'],
 				'mime-type' => $post->post_mime_type,
 			];
 		}

tests/test-media.php

@@ -543,8 +543,7 @@ public function test_alter_attachment_image_src() {
 				'data' => Optml_Media_Offload::instance()->alter_attachment_image_src( [], self::$sample_attachement, [10, 20], false ),
 				'contains' => [
 					'process:' . self::$sample_attachement . '/id:',
-					'w:10/h:20',
-					'rt:fill'
+					'w:10/h:7'
 				]
 			],
 			'scaled-full' => [
@@ -572,8 +571,7 @@ public function test_alter_attachment_image_src() {
 				'data' => Optml_Media_Offload::instance()->alter_attachment_image_src( [], self::$sample_attachment_scaled, [10, 20], false ),
 				'contains' => [
 					'process:' . self::$sample_attachment_scaled . '/id:',
-					'w:10/h:20',
-					'rt:fill'
+					'w:10/h:10'
 				],
 				'not_contain' => [
 					'-scaled.jpg'