Skip to content

Hotfix downsync #141

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 2 commits into from
Jul 29, 2020
Merged

Hotfix downsync #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4e38a1
Cleanup syncing and downloading keys if processes fails
Jul 29, 2020
7e3e291
No need for the suffix if we are downloading the asset
Jul 29, 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
4 changes: 3 additions & 1 deletion cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ public function prepare_upload( $post, $push_sync = false ) {
if ( true === $push_sync ) {
$download = $this->sync->managers['download']->down_sync( $post->ID );
if ( is_wp_error( $download ) ) {
delete_post_meta( $post->ID, Sync::META_KEYS['downloading'] );
update_post_meta( $post->ID, Sync::META_KEYS['sync_error'], $download->get_error_message() );

return new \WP_Error( 'attachment_download_error', $download->get_error_message() );
Expand Down Expand Up @@ -541,7 +542,7 @@ public function prepare_upload( $post, $push_sync = false ) {
$suffix_data = wp_parse_args( $suffix_meta, $suffix_defaults );

// Prepare a uniqueness check and get a suffix if needed.
if ( true === $push_sync ) {
if ( true === $push_sync && true !== $downsync ) {
if ( $public_id !== $suffix_data['public_id'] || empty( $suffix_data['suffix'] ) ) {
$suffix_data['suffix'] = $this->sync->add_suffix_maybe( $public_id, $post->ID );
if ( ! empty( $suffix_data['suffix'] ) ) {
Expand Down Expand Up @@ -681,6 +682,7 @@ public function push_attachments( $attachments ) {
$error = $result->get_error_message();
$stats['fail'][] = $error;
$this->media->update_post_meta( $attachment->ID, Sync::META_KEYS['sync_error'], $error );
delete_post_meta( $attachment->ID, Sync::META_KEYS['syncing'] );
continue;
}

Expand Down
1 change: 1 addition & 0 deletions ...dinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-queue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ public function mark( $id, $type = 'done' ) {
$queue[ $type ][] = '<div>' . basename( $file ) . ': ' . $state->get_error_message() . '</div>';
// Add a flag that this file had an error as to not try process it again.
update_post_meta( $id, Sync::META_KEYS['sync_error'], $state->get_error_message() );
delete_post_meta( $id, Sync::META_KEYS['syncing'], $state->get_error_message() );
}
} else {
if ( ! in_array( $id, $queue[ $type ], true ) ) {
Expand Down