Merge pull request #485 from cloudinary/fix/suffix-fix

remove suffix version check. clean suffix

Author: pereirinha

php/class-media.php

@@ -1106,8 +1106,13 @@ public function get_public_id( $attachment_id, $suffixed = false ) {
 			if ( $this->is_folder_synced( $attachment_id ) ) {
 				$public_id = $this->get_cloudinary_folder() . pathinfo( $public_id, PATHINFO_BASENAME );
 			}
-			if ( true === $suffixed ) {
-				$public_id .= $this->get_post_meta( $attachment_id, Sync::META_KEYS['suffix'], true );
+			if ( true === $suffixed && ! empty( $this->get_post_meta( $attachment_id, Sync::META_KEYS['suffix'], true ) ) ) {
+				$suffix = $this->get_post_meta( $attachment_id, Sync::META_KEYS['suffix'], true );
+				if ( false === strrpos( $public_id, $suffix ) ) {
+					$public_id .= $suffix;
+					$this->update_post_meta( $attachment_id, Sync::META_KEYS['public_id'], $public_id );
+				}
+				$this->delete_post_meta( $attachment_id, Sync::META_KEYS['suffix'] );
 			}
 		} else {
 			$public_id = $this->sync->generate_public_id( $attachment_id );

php/class-sync.php

@@ -203,7 +203,7 @@ public function log_sync_result( $attachment_id, $type, $result ) {
 		}
 		if ( isset( $log[ $type ] ) ) {
 
-			$log[ $type ][ time() ] = $result;
+			$log[ $type ][ '_' . time() ] = $result;
 			if ( 5 < count( $log[ $type ] ) ) {
 				array_shift( $log[ $type ] );
 			}

php/sync/class-upload-sync.php

@@ -163,17 +163,19 @@ public function handle_bulk_actions( $location, $action, $post_ids ) {
 
 					// It's required to perform a new sync that Cloudinary and WordPress storage is set.
 					if (
-						'dual_full' !== $this->plugin->settings->find_setting( 'offload' )->get_value() &&
-						$this->plugin->components['sync']->is_synced( $post_id )
+						$this->plugin->components['sync']->is_synced( $post_id ) &&
+						'dual_full' !== $this->plugin->settings->find_setting( 'offload' )->get_value()
 					) {
 						continue;
 					}
 
 					// Clean up for previous syncs and start over.
-					$this->sync->delete_cloudinary_meta( $post_id );
-					$this->sync->set_signature_item( $post_id, 'file', '' );
-					$this->media->delete_post_meta( $post_id, Sync::META_KEYS['public_id'] );
-					$this->sync->add_to_sync( $post_id );
+					if ( ! $this->media->is_cloudinary_url( get_post_meta( $post_id, '_wp_attached_file', true ) ) ) {
+						$this->sync->delete_cloudinary_meta( $post_id );
+						$this->sync->set_signature_item( $post_id, 'file', '' );
+						$this->media->delete_post_meta( $post_id, Sync::META_KEYS['public_id'] );
+						$this->sync->add_to_sync( $post_id );
+					}
 				}
 				break;
 		}
@@ -218,11 +220,12 @@ public function setup() {
 	/**
 	 * Upload an asset to Cloudinary.
 	 *
-	 * @param int $attachment_id The attachment ID.
+	 * @param int    $attachment_id The attachment ID.
+	 * @param string $suffix        An optional suffix.
 	 *
 	 * @return array|\WP_Error
 	 */
-	public function upload_asset( $attachment_id ) {
+	public function upload_asset( $attachment_id, $suffix = null ) {
 
 		add_filter( 'cloudinary_doing_upload', '__return_true' );
 
@@ -241,17 +244,10 @@ function ( $is_synced, $post_id ) use ( $attachment_id ) {
 
 		$type       = $this->sync->get_sync_type( $attachment_id );
 		$options    = $this->media->get_upload_options( $attachment_id );
-		$public_id  = $options['public_id'];
 		$try_remote = 'cloud_name' !== $type;
 
-		// Add the suffix before uploading.
-		if ( $this->media->get_public_id( $attachment_id ) === $public_id ) {
-			// Only apply the saved suffix if the public_id is the same. This is to allow filtered ID's a change to have a suffix removed.
-			$options['public_id'] .= $this->media->get_post_meta( $attachment_id, Sync::META_KEYS['suffix'], true );
-		} else {
-			// If the public_id has been changed, remove the saved suffix.
-			$this->media->delete_post_meta( $attachment_id, Sync::META_KEYS['suffix'] );
-		}
+		// Add suffix.
+		$options['public_id'] .= $suffix;
 
 		// Run the upload Call.
 		$result = $this->connect->api->upload( $attachment_id, $options, array(), $try_remote );
@@ -262,16 +258,10 @@ function ( $is_synced, $post_id ) use ( $attachment_id ) {
 
 			// Check that this wasn't an existing.
 			if ( ! empty( $result['existing'] ) ) {
-				// Check to see if this is the same image.
-				$version = $this->media->get_cloudinary_version( $attachment_id );
-				if ( $version !== $result['version'] ) {
-					// New image with the same name.
-					// Add a suffix and try again.
-					$suffix = '_' . $attachment_id . substr( strrev( uniqid() ), 0, 5 );
-					$this->media->update_post_meta( $attachment_id, Sync::META_KEYS['suffix'], $suffix );
-
-					return $this->upload_asset( $attachment_id );
-				}
+				// Add a suffix and try again.
+				$suffix = '_' . $attachment_id . substr( strrev( uniqid() ), 0, 5 );
+
+				return $this->upload_asset( $attachment_id, $suffix );
 			}
 
 			// Set folder Synced.