Merge pull request #351 from cloudinary/fix/sync-cli-issues

revise file signature and validator.

Author: pereirinha

php/class-cli.php

@@ -50,13 +50,25 @@ class CLI {
 	 * @param Plugin $plugin The plugin instance.
 	 */
 	public function __construct( $plugin ) {
-		\WP_CLI::log( '' );
-		\WP_CLI::log( '╔═╗┬  ┌─┐┬ ┬┌┬┐┬┌┐┌┌─┐┬─┐┬ ┬  ╔═╗╦  ╦' );
-		\WP_CLI::log( '║  │  │ ││ │ ││││││├─┤├┬┘└┬┘  ║  ║  ║' );
-		\WP_CLI::log( '╚═╝┴─┘└─┘└─┘─┴┘┴┘└┘┴ ┴┴└─ ┴   ╚═╝╩═╝╩' );
 		$this->plugin = $plugin;
 	}
 
+	/**
+	 * Output the Intro.
+	 *
+	 * @since   2.5.1
+	 */
+	public function do_intro() {
+		static $intro;
+		if ( ! $intro ) {
+			\WP_CLI::log( '' );
+			\WP_CLI::log( '╔═╗┬  ┌─┐┬ ┬┌┬┐┬┌┐┌┌─┐┬─┐┬ ┬  ╔═╗╦  ╦' );
+			\WP_CLI::log( '║  │  │ ││ │ ││││││├─┤├┬┘└┬┘  ║  ║  ║' );
+			\WP_CLI::log( '╚═╝┴─┘└─┘└─┘─┴┘┴┘└┘┴ ┴┴└─ ┴   ╚═╝╩═╝╩' );
+			$intro = true;
+		}
+	}
+
 	/**
 	 * Syncs assets with Cloudinary.
 	 * ## EXAMPLES
@@ -113,7 +125,7 @@ public function analyze() {
 
 		// Initial query.
 		$query_args = $this->base_query_args;
-		$query = new \WP_Query( $query_args );
+		$query      = new \WP_Query( $query_args );
 
 		// Kill all _cld_ related meta.
 		delete_post_meta_by_key( '_cld_unsynced' );
@@ -132,6 +144,8 @@ public function analyze() {
 	 * @param string    $process The process to do.
 	 */
 	protected function do_process( &$query, $process ) {
+		$this->do_intro();
+
 		// Bail early.
 		if ( ! method_exists( $this, "process_{$process}" ) ) {
 			\WP_CLI::log( \WP_CLI::colorize( "%Invalid Process: {$process}.%n" ) );
@@ -175,8 +189,9 @@ protected function process_sync( $posts, $total ) {
 		}
 		foreach ( $posts as $index => $asset ) {
 			$done ++; // Set $done early to not show 0 of x.
-			$file = get_attached_file( $asset );
-			$bar->tick( 0, 'Syncing: ' . basename( $file ) . ' (' . ( $done ) . ' of ' . $total . ')' );
+			$file     = get_attached_file( $asset );
+			$filename = self::pad_name( basename( $file ), 20, ' ', '*' );
+			$bar->tick( 0, 'Syncing (' . ( $done ) . ' of ' . $total . ') : ' . $filename );
 			if ( ! $this->plugin->get_component( 'sync' )->is_synced( $asset ) ) {
 				$this->plugin->get_component( 'sync' )->managers['push']->process_assets( $asset, $bar );
 			}
@@ -241,4 +256,34 @@ protected function process_analyze( $posts, $total ) {
 			update_option( '_cld_cli_analyzed', true, false );
 		}
 	}
+
+	/**
+	 * Pad a file name to fit within max chars.
+	 *
+	 * @param string $name        The name to pad.
+	 * @param int    $max_length  The max length of the  filename.
+	 * @param string $pad_char    The pad char to use when name is less of the max.
+	 * @param string $concat_char The char to use when shortening names to fit.
+	 *
+	 * @return string
+	 */
+	protected static function pad_name( $name, $max_length, $pad_char = '.', $concat_char = '*' ) {
+		$name_length = strlen( $name );
+		$prefix      = null;
+		if ( $name_length > $max_length ) {
+			$diff          = $name_length - $max_length;
+			$concat_length = $diff > 3 ? 3 : $diff;
+			$usable_length = $max_length - $concat_length;
+			$front         = substr( $name, 0, floor( $usable_length / 2 ) );
+			$back          = substr( $name, strlen( $name ) - ceil( $usable_length / 2 ) );
+			$name          = $front . implode( array_fill( 0, $concat_length, $concat_char ) ) . $back;
+		}
+		$used_length = $max_length - strlen( $name );
+		if ( 0 < $used_length ) {
+			$prefix = implode( array_fill( 0, $used_length, $pad_char ) );
+		}
+		$out = $prefix . $name;
+
+		return $out;
+	}
 }

php/class-sync.php

@@ -383,9 +383,12 @@ public function setup_sync_base_struct() {
 				'note'     => __( 'Downloading from Cloudinary', 'cloudinary' ),
 			),
 			'file'        => array(
-				'generate' => 'get_attached_file',
+				'generate' => array( $this, 'generate_file_signature' ),
 				'priority' => 5.1,
 				'sync'     => array( $this->managers['upload'], 'upload_asset' ),
+				'validate' => function ( $attachment_id ) {
+					return ! $this->managers['media']->has_public_id( $attachment_id );
+				},
 				'state'    => 'uploading',
 				'note'     => __( 'Uploading to Cloudinary', 'cloudinary' ),
 				'required' => true, // Required to complete URL render flag.
@@ -933,6 +936,19 @@ public function settings() {
 		return $args;
 	}
 
+	/**
+	 * Generate the real file attachment path for the file sync type signature.
+	 *
+	 * @param int $attachment_id The attachment ID.
+	 *
+	 * @return string
+	 */
+	public function generate_file_signature( $attachment_id ) {
+		$path = get_attached_file( $attachment_id );
+
+		return basename( $path );
+	}
+
 	/**
 	 * Register the setting under media.
 	 */

php/sync/class-upload-sync.php

@@ -152,6 +152,7 @@ public function handle_bulk_actions( $location, $action, $post_ids ) {
 			case 'cloudinary-push':
 				foreach ( $post_ids as $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;