Merge pull request #412 from cloudinary/fix/upgrade-assets

Author: pereirinha

php/media/class-upgrade.php

@@ -64,6 +64,7 @@ public function convert_cloudinary_version( $attachment_id ) {
 			$asset_version         = 1;
 			$asset_transformations = array();
 			$id_parts              = array();
+			$public_id             = $this->get_fetch_public_id( $path, $attachment_id );
 			foreach ( $parts as $val ) {
 				if ( empty( $val ) ) {
 					continue;
@@ -73,7 +74,7 @@ public function convert_cloudinary_version( $attachment_id ) {
 					$cloud_name = md5( $val );
 					continue;
 				}
-				if ( in_array( $val, array( 'images', 'image', 'video', 'upload' ), true ) ) {
+				if ( in_array( $val, array( 'images', 'image', 'video', 'upload', 'fetch' ), true ) ) {
 					continue;
 				}
 				$transformation_maybe = $media->get_transformations_from_string( $val );
@@ -93,11 +94,10 @@ public function convert_cloudinary_version( $attachment_id ) {
 				}
 			}
 			// Build public_id.
-			$parts     = array_filter( $id_parts );
-			$public_id = implode( '/', $parts );
-			// Remove extension.
-			$path      = pathinfo( $public_id );
-			$public_id = str_replace( $path['basename'], $path['filename'], $public_id );
+			$parts = array_filter( $id_parts );
+			if ( empty( $public_id ) ) {
+				$public_id = implode( '/', $parts );
+			}
 			update_post_meta( $attachment_id, Sync::META_KEYS['public_id'], $public_id );
 			$this->media->update_post_meta( $attachment_id, Sync::META_KEYS['version'], $asset_version );
 			if ( ! empty( $asset_transformations ) ) {
@@ -140,6 +140,25 @@ public function convert_cloudinary_version( $attachment_id ) {
 		return $public_id;
 	}
 
+	/**
+	 * Maybe the upgraded attachment is a fetch image.
+	 *
+	 * @param string $path          The attachment path.
+	 * @param int    $attachment_id The attachment ID.
+	 *
+	 * @return string
+	 */
+	public function get_fetch_public_id( $path, $attachment_id ) {
+		$parts = explode( '/image/fetch/', $path );
+
+		if ( ! empty( $parts[1] ) ) {
+			$this->media->update_post_meta( $attachment_id, Sync::META_KEYS['delivery'], 'fetch' );
+			return $parts[1];
+		}
+
+		return '';
+	}
+
 	/**
 	 * Setup hooks for the filters.
 	 */