Skip to content

Revert 133 feature/unique filesnames #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 31, 2020
Merged

Revert 133 feature/unique filesnames #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6543423
Merge pull request #140 from cloudinary/UAT
pereirinha Jul 29, 2020
0600246
Revert "Feature/unique-filenames"
pereirinha Jul 31, 2020
847f0c2
Merge branch 'UAT' into revert-133-feature/unique-filesnames
pereirinha Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,11 +655,7 @@ public function get_public_id( $attachment_id ) {
public function get_cloudinary_id( $attachment_id ) {

// A cloudinary_id is a public_id with a file extension.
$public_id = $this->get_public_id( $attachment_id );
$suffix_data = $this->get_post_meta( $attachment_id, Sync::META_KEYS['suffix'], true );
if ( is_array( $suffix_data ) && ! empty( $suffix_data['suffix'] ) && $suffix_data['public_id'] === $public_id ) {
$public_id = $public_id . $suffix_data['suffix'];
}
$public_id = $this->get_public_id( $attachment_id );
$file = get_attached_file( $attachment_id );
$info = pathinfo( $file );
$cloudinary_id = $public_id . '.' . $info['extension'];
Expand Down
73 changes: 0 additions & 73 deletions cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class Sync implements Setup, Assets {
'sync_error' => '_sync_error',
'cloudinary' => '_cloudinary_v2',
'folder_sync' => '_folder_sync',
'suffix' => '_suffix',
'syncing' => '_cloudinary_syncing',
'downloading' => '_cloudinary_downloading',
);
Expand Down Expand Up @@ -173,85 +172,13 @@ public function get_signature( $post_id ) {
return $return;
}

/**
* Generate a new Public ID for an asset.
*
* @param int $attachment_id The attachment ID for the new public ID.
*
* @return string|null
*/
public function generate_public_id( $attachment_id ) {
$settings = $this->plugin->config['settings'];
$cld_folder = trailingslashit( $settings['sync_media']['cloudinary_folder'] );
$file = get_attached_file( $attachment_id );
$file_info = pathinfo( $file );
$public_id = $cld_folder . $file_info['filename'];

return $public_id;
}

/**
* Maybe add a suffix to the public ID if it's not unique.
*
* @param string $public_id The public ID to maybe add a suffix.
* @param int $attachment_id The attachment ID.
* @param string|null $suffix The suffix to maybe add.
*
* @return string The public ID.
*/
public function add_suffix_maybe( $public_id, $attachment_id, $suffix = null ) {

// Test if asset exists by calling just the head on the asset url, to prevent API rate limits.
$url = $this->plugin->components['connect']->api->cloudinary_url( $public_id . $suffix );
$req = wp_remote_head( $url, array( 'body' => array( 'rdm' => wp_rand( 100, 999 ) ) ) );
$asset_error = strtolower( wp_remote_retrieve_header( $req, 'x-cld-error' ) );
$code = wp_remote_retrieve_response_code( $req );

// If the request is not a 404 & does not have a cld-error header stating resource not found, it exists and should be checked that it's not a resync or generate a prefixed ID.
if ( 404 !== $code && false === strpos( $asset_error, 'resource not found' ) ) {

// Get the attachment type.
if ( wp_attachment_is( 'image', $attachment_id ) ) {
$type = 'image';
} elseif ( wp_attachment_is( 'video', $attachment_id ) ) {
$type = 'video';
} elseif ( wp_attachment_is( 'audio', $attachment_id ) ) {
$type = 'audio';
} else {
// not supported.
return null;
}
$cld_asset = $this->plugin->components['connect']->api->get_asset_details( $public_id, $type );
if ( ! is_wp_error( $cld_asset ) && ! empty( $cld_asset['public_id'] ) ) {
$context_id = null;

// Exists, check to see if this asset originally belongs to this ID.
if ( ! empty( $cld_asset['context'] ) && ! empty( $cld_asset['context']['custom'] ) && ! empty( $cld_asset['context']['custom']['wp_id'] ) ) {
$context_id = (int) $cld_asset['context']['custom']['wp_id'];
}

// Generate new ID only if context ID is not related.
if ( $context_id !== $attachment_id ) {
// Generate a new ID with a uniqueID prefix.
$suffix = '-' . uniqid();

// Return new potential suffixed ID.
return $this->add_suffix_maybe( $public_id, $attachment_id, $suffix );
}
}
}

return $suffix;
}

/**
* Additional component setup.
*/
public function setup() {
if ( $this->plugin->config['connect'] ) {
$this->managers['upload']->setup();
$this->managers['delete']->setup();
$this->managers['push']->setup();
}
}
}
14 changes: 0 additions & 14 deletions cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/connect/class-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,20 +269,6 @@ public function cloudinary_url( $public_id, $args = array(), $size = array(), $c
return implode( '/', $url_parts );
}

/**
* Get the details of an asset by public ID.
*
* @param string $public_id The public_id to check.
* @param string $type The asset type.
*
* @return array|\WP_Error
*/
public function get_asset_details( $public_id, $type ) {
$url = $this->url( 'resources', $type . '/upload/' . $public_id, true );

return $this->call( $url, array( 'body' => $args ), 'get' );
}

/**
* Upload a large asset in chunks.
*
Expand Down
Loading