Skip to content

set header to file if cloud_name sync type. #215

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
Sep 28, 2020
Merged

set header to file if cloud_name sync type. #215

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
85d6392
set header to file if cloud_name sync type.
DavidCramer Sep 23, 2020
731a030
add try_remote param
DavidCramer Sep 28, 2020
494bf77
merge develop
DavidCramer Sep 28, 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: 4 additions & 2 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 @@ -228,6 +228,7 @@ function ( $item ) use ( $transformation_index ) {
* @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.
*
* @return string
*/
Expand Down Expand Up @@ -398,10 +399,11 @@ public function upload_large( $attachment_id, $args ) {
* @param int $attachment_id Attachment ID to upload.
* @param array $args Array of upload options.
* @param array $headers Additional headers to use in upload.
* @param bool $try_remote Flag to try_remote upload.
*
* @return array|\WP_Error
*/
public function upload( $attachment_id, $args, $headers = array() ) {
public function upload( $attachment_id, $args, $headers = array(), $try_remote = true ) {

$resource = ! empty( $args['resource_type'] ) ? $args['resource_type'] : 'image';
$resource = $this->convert_resource_type( $resource );
Expand All @@ -415,7 +417,7 @@ public function upload( $attachment_id, $args, $headers = array() ) {
$disable_https_fetch = false;
}
// Check if we can try http file upload.
if ( empty( $headers ) && empty( $disable_https_fetch ) ) {
if ( empty( $headers ) && empty( $disable_https_fetch ) && true === $try_remote ) {
$args['file'] = $file_url;
} else {
// We should have the file in args at this point, but if the transient was set, it will be defaulting here.
Expand Down
9 changes: 5 additions & 4 deletions cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,10 @@ public function setup() {
*/
public function upload_asset( $attachment_id ) {

$type = $this->sync->get_sync_type( $attachment_id );
$options = $this->media->get_upload_options( $attachment_id );
$public_id = $options['public_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 ? false : true;

// Add the suffix before uploading.
if ( $this->media->get_public_id( $attachment_id ) === $public_id ) {
Expand All @@ -215,7 +216,7 @@ public function upload_asset( $attachment_id ) {
}

// Run the upload Call.
$result = $this->connect->api->upload( $attachment_id, $options );
$result = $this->connect->api->upload( $attachment_id, $options, array(), $try_remote );

if ( ! is_wp_error( $result ) ) {

Expand Down