restucture api to use original file and cleanup url format

Author: DavidCramer

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

@@ -286,7 +286,7 @@ public function get_signature( $attachment_id, $cached = true ) {
 	public function generate_public_id( $attachment_id ) {
 
 		$cld_folder = $this->managers['media']->get_cloudinary_folder();
-		$file       = get_attached_file( $attachment_id );
+		$file       = wp_get_original_image_path( $attachment_id );
 		$file_info  = pathinfo( $file );
 		$public_id  = $cld_folder . $file_info['filename'];
 

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/connect/class-api.php

@@ -140,7 +140,7 @@ class Api {
 	 * @param string The plugin version.
 	 */
 	public function __construct( $connect, $version ) {
-		$this->credentials = $connect->get_credentials();
+		$this->credentials    = $connect->get_credentials();
 		$this->plugin_version = $version;
 		// Use CNAME.
 		if ( ! empty( $this->credentials['cname'] ) ) {
@@ -171,8 +171,12 @@ public function url( $resource, $function = null, $endpoint = false ) {
 			$parts[] = $this->credentials['cloud_name'];
 		}
 
-		$parts[] = $resource;
-		$parts[] = $function;
+		if ( false === $endpoint && 'image' === $resource ) {
+			$parts[] = 'images';
+		} else {
+			$parts[] = $resource;
+			$parts[] = $function;
+		}
 
 		$parts = array_filter( $parts );
 		$url   = implode( '/', $parts );
@@ -222,13 +226,12 @@ function ( $item ) use ( $transformation_index ) {
 	 * Generate a Cloudinary URL.
 	 *
 	 * @param string|null $public_id The Public ID to get a url for.
-	 * @param array  $args      Additional args.
-	 * @param array  $size      The WP Size array.
-	 * @param bool   $clean     Flag to produce a non variable size url.
+	 * @param array       $args      Additional args.
+	 * @param array       $size      The WP Size array.
 	 *
 	 * @return string
 	 */
-	public function cloudinary_url( $public_id = null, $args = array(), $size = array(), $clean = false ) {
+	public function cloudinary_url( $public_id = null, $args = array(), $size = array() ) {
 
 		if ( null === $public_id ) {
 			return 'https://' . $this->url( null, null );
@@ -405,7 +408,7 @@ public function upload( $attachment_id, $args, $headers = array() ) {
 		$url                 = $this->url( $resource, 'upload', true );
 		$args                = $this->clean_args( $args );
 		$disable_https_fetch = get_transient( '_cld_disable_http_upload' );
-		$file_url            = wp_get_attachment_url( $attachment_id );
+		$file_url            = wp_get_original_image_url( $attachment_id );
 		$media               = get_plugin_instance()->get_component( 'media' );
 		if ( $media && $media->is_cloudinary_url( $file_url ) ) {
 			// If this is a Cloudinary URL, then we can use it to fetch from that location.
@@ -417,7 +420,7 @@ public function upload( $attachment_id, $args, $headers = array() ) {
 		} else {
 			// We should have the file in args at this point, but if the transient was set, it will be defaulting here.
 			if ( empty( $args['file'] ) ) {
-				$args['file'] = get_attached_file( $attachment_id );
+				$args['file'] = wp_get_original_image_path( $attachment_id );
 			}
 			// Headers indicate chunked upload.
 			if ( empty( $headers ) ) {
@@ -453,7 +456,7 @@ public function upload( $attachment_id, $args, $headers = array() ) {
 		// Hook in flag to allow for non accessible URLS.
 		if ( is_wp_error( $result ) ) {
 			$error = $result->get_error_message();
-			$code = $result->get_error_code();
+			$code  = $result->get_error_code();
 			/**
 			 * If there's an error and the file is a URL in the error message,
 			 * it's likely due to CURL or the location does not support URL file attachments.