Merge pull request #112 from cloudinary/fix/ltrim-forward-slash

ltrim forward slashes on public ID

Author: pereirinha

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php

@@ -487,7 +487,7 @@ public function prepare_upload( $post, $down_sync = false ) {
 			}
 
 			// Restructure the path to the filename to allow correct placement in Cloudinary.
-			$public_id                      = $public_id_folder . $options['public_id'];
+			$public_id                      = ltrim( $public_id_folder . $options['public_id'], '/' );
 			$return                         = array(
 				'file'        => $file,
 				'folder'      => $cld_folder,

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-sync.php

@@ -72,7 +72,7 @@ private function register_hooks() {
 		// Hook for on demand upload push.
 		add_action( 'shutdown', array( $this, 'init_background_upload' ) );
 		// Hook into auto upload sync.
-		add_filter( 'cloudinary_on_demand_sync_enabled', array( $this, 'auto_sync_enabled' ) );
+		add_filter( 'cloudinary_on_demand_sync_enabled', array( $this, 'auto_sync_enabled' ), 10, 2 );
 		// Handle bulk and inline actions.
 		add_filter( 'handle_bulk_actions-upload', array( $this, 'handle_bulk_actions' ), 10, 3 );
 		// Add inline action.
@@ -160,14 +160,20 @@ public function handle_bulk_actions( $location, $action, $post_ids ) {
 	 * Check if auto-sync is enabled.
 	 *
 	 * @param bool $enabled Flag to determine if autosync is enabled.
+	 * @param int  $post_id The post id currently processing.
 	 *
 	 * @return bool
 	 */
-	public function auto_sync_enabled( $enabled ) {
+	public function auto_sync_enabled( $enabled, $post_id ) {
 		if ( isset( $this->plugin->config['settings']['sync_media']['auto_sync'] ) && 'on' === $this->plugin->config['settings']['sync_media']['auto_sync'] ) {
 			$enabled = true;
 		}
 
+		// Check if it was synced before to allow re-sync for changes.
+		if ( ! empty( $this->plugin->components['sync']->get_signature( $post_id ) ) ) {
+			$enabled = true;
+		}
+
 		return $enabled;
 	}
 
@@ -211,7 +217,7 @@ public function prep_on_demand_upload( $cloudinary_id, $attachment_id ) {
 		$attachment_id = intval( $attachment_id );
 		if ( $attachment_id && false === $cloudinary_id ) {
 			// Check that this has not already been prepared for upload.
-			if ( ! $this->is_pending( $attachment_id ) && apply_filters( 'cloudinary_on_demand_sync_enabled', $this->enabled ) ) {
+			if ( ! $this->is_pending( $attachment_id ) && apply_filters( 'cloudinary_on_demand_sync_enabled', $this->enabled, $attachment_id ) ) {
 				$max_size = ( wp_attachment_is_image( $attachment_id ) ? 'max_image_size' : 'max_video_size' );
 				$file     = get_attached_file( $attachment_id );
 				// Get the file size to make sure it can exist in cloudinary.