[Media] Migrate WPCom media upload to /wp/v2 endpoints
#3109
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,199 @@ | ||
| { | ||
| "id": 9999, | ||
| "date": "2024-10-21T17:49:43", | ||
| "date_gmt": "2024-10-21T16:49:43", | ||
| "guid": { | ||
| "rendered": "https://place.com/wp-content/uploads/2024/10/img_0111.jpeg" | ||
| }, | ||
| "modified": "2024-10-21T17:49:45", | ||
| "modified_gmt": "2024-10-21T16:49:45", | ||
| "slug": "img_0111", | ||
| "status": "inherit", | ||
| "type": "attachment", | ||
| "link": "https://place.com/?attachment_id=576", | ||
| "title": { | ||
| "rendered": "img_0111" | ||
| }, | ||
| "author": 190912935, | ||
| "featured_media": 0, | ||
| "comment_status": "open", | ||
| "ping_status": "closed", | ||
| "template": "", | ||
| "meta": { | ||
| "_acf_changed": false, | ||
| "advanced_seo_description": "", | ||
| "jetpack_seo_html_title": "", | ||
| "jetpack_seo_noindex": false, | ||
| "jetpack_post_was_ever_published": false | ||
| }, | ||
| "class_list": [ | ||
| "post-576", | ||
| "attachment", | ||
| "type-attachment", | ||
| "status-inherit", | ||
| "hentry" | ||
| ], | ||
| "acf": [], | ||
| "jetpack_sharing_enabled": true, | ||
| "jetpack_likes_enabled": true, | ||
| "jetpack_shortlink": "https://wp.me/afje44-9i", | ||
| "description": { | ||
| "rendered": "<p class=\"attachment\"><a href='https://place.com/wp-content/uploads/2024/10/img_0111.jpeg'><img loading=\"lazy\" decoding=\"async\" width=\"300\" height=\"225\" src=\"https://place.com/wp-content/uploads/2024/10/img_0111-300x225.jpeg\" class=\"attachment-medium size-medium\" alt=\"\" srcset=\"https://place.com/wp-content/uploads/2024/10/img_0111-300x225.jpeg 300w, https://place.com/wp-content/uploads/2024/10/img_0111-1024x768.jpeg 1024w, https://place.com/wp-content/uploads/2024/10/img_0111-768x576.jpeg 768w, https://place.com/wp-content/uploads/2024/10/img_0111-1536x1152.jpeg 1536w, https://place.com/wp-content/uploads/2024/10/img_0111-2048x1536.jpeg 2048w, https://place.com/wp-content/uploads/2024/10/img_0111-1320x990.jpeg 1320w, https://place.com/wp-content/uploads/2024/10/img_0111-600x450.jpeg?crop=1 600w\" sizes=\"auto, (max-width: 300px) 100vw, 300px\" data-attachment-id=\"576\" data-permalink=\"https://place.com/?attachment_id=576\" data-orig-file=\"https://place.com/wp-content/uploads/2024/10/img_0111.jpeg\" data-orig-size=\"3000,2250\" data-comments-opened=\"1\" data-image-meta=\"{"aperture":"2.4","credit":"","camera":"iPhone X","caption":"","created_timestamp":"1522412059","copyright":"","focal_length":"6","iso":"16","shutter_speed":"0.0047846889952153","title":"","orientation":"1"}\" data-image-title=\"img_0111\" data-image-description=\"\" data-image-caption=\"\" data-medium-file=\"https://place.com/wp-content/uploads/2024/10/img_0111-300x225.jpeg\" data-large-file=\"https://place.com/wp-content/uploads/2024/10/img_0111-1024x768.jpeg\" /></a></p>\n" | ||
| }, | ||
| "caption": { | ||
| "rendered": "" | ||
| }, | ||
| "alt_text": "", | ||
| "media_type": "image", | ||
| "mime_type": "image/jpeg", | ||
| "media_details": { | ||
| "width": 3000, | ||
| "height": 2250, | ||
| "file": "2024/10/img_0111.jpeg", | ||
| "filesize": 2926027, | ||
| "sizes": { | ||
| "medium": { | ||
| "file": "img_0111-300x225.jpeg", | ||
| "width": 300, | ||
| "height": 225, | ||
| "virtual": true, | ||
| "mime_type": "image/jpeg", | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111-300x225.jpeg" | ||
| }, | ||
| "large": { | ||
| "file": "img_0111-1024x768.jpeg", | ||
| "width": 1024, | ||
| "height": 768, | ||
| "virtual": true, | ||
| "mime_type": "image/jpeg", | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111-1024x768.jpeg" | ||
| }, | ||
| "thumbnail": { | ||
| "file": "img_0111-150x150.jpeg", | ||
| "width": 150, | ||
| "height": 150, | ||
| "virtual": true, | ||
| "mime_type": "image/jpeg", | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111-150x150.jpeg?crop=1" | ||
| }, | ||
| "medium_large": { | ||
| "file": "img_0111-768x576.jpeg", | ||
| "width": 768, | ||
| "height": 576, | ||
| "virtual": true, | ||
| "mime_type": "image/jpeg", | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111-768x576.jpeg" | ||
| }, | ||
| "1536x1536": { | ||
| "file": "img_0111-1536x1152.jpeg", | ||
| "width": 1536, | ||
| "height": 1152, | ||
| "virtual": true, | ||
| "mime_type": "image/jpeg", | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111-1536x1152.jpeg" | ||
| }, | ||
| "2048x2048": { | ||
| "file": "img_0111-2048x1536.jpeg", | ||
| "width": 2048, | ||
| "height": 1536, | ||
| "virtual": true, | ||
| "mime_type": "image/jpeg", | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111-2048x1536.jpeg" | ||
| }, | ||
| "mailpoet_newsletter_max": { | ||
| "file": "img_0111-1320x990.jpeg", | ||
| "width": 1320, | ||
| "height": 990, | ||
| "virtual": true, | ||
| "mime_type": "image/jpeg", | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111-1320x990.jpeg" | ||
| }, | ||
| "woocommerce_thumbnail": { | ||
| "file": "img_0111-450x450.jpeg", | ||
| "width": 450, | ||
| "height": 450, | ||
| "virtual": true, | ||
| "uncropped": false, | ||
| "mime_type": "image/jpeg", | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111-450x450.jpeg?crop=1" | ||
| }, | ||
| "woocommerce_single": { | ||
| "file": "img_0111-600x450.jpeg", | ||
| "width": 600, | ||
| "height": 450, | ||
| "virtual": true, | ||
| "mime_type": "image/jpeg", | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111-600x450.jpeg?crop=1" | ||
| }, | ||
| "woocommerce_gallery_thumbnail": { | ||
| "file": "img_0111-100x100.jpeg", | ||
| "width": 100, | ||
| "height": 100, | ||
| "virtual": true, | ||
| "mime_type": "image/jpeg", | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111-100x100.jpeg?crop=1" | ||
| }, | ||
| "full": { | ||
| "file": "img_0111.jpeg", | ||
| "width": 3000, | ||
| "height": 2250, | ||
| "mime_type": "image/jpeg", | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111.jpeg" | ||
| } | ||
| }, | ||
| "image_meta": { | ||
| "aperture": "2.4", | ||
| "credit": "", | ||
| "camera": "iPhone X", | ||
| "caption": "", | ||
| "created_timestamp": "1522412059", | ||
| "copyright": "", | ||
| "focal_length": "6", | ||
| "iso": "16", | ||
| "shutter_speed": "0.0047846889952153", | ||
| "title": "", | ||
| "orientation": "1", | ||
| "keywords": [] | ||
| } | ||
| }, | ||
| "post": 74, | ||
| "source_url": "https://place.com/wp-content/uploads/2024/10/img_0111.jpeg", | ||
| "_links": { | ||
| "self": [ | ||
| { | ||
| "href": "https://place.com/wp-json/wp/v2/media/576", | ||
| "targetHints": { | ||
| "allow": [ | ||
| "GET", | ||
| "POST", | ||
| "PUT", | ||
| "PATCH", | ||
| "DELETE" | ||
| ] | ||
| } | ||
| } | ||
| ], | ||
| "collection": [ | ||
| { | ||
| "href": "https://place.com/wp-json/wp/v2/media" | ||
| } | ||
| ], | ||
| "about": [ | ||
| { | ||
| "href": "https://place.com/wp-json/wp/v2/types/attachment" | ||
| } | ||
| ], | ||
| "author": [ | ||
| { | ||
| "embeddable": true, | ||
| "href": "https://place.com/wp-json/wp/v2/users/190912935" | ||
| } | ||
| ], | ||
| "replies": [ | ||
| { | ||
| "embeddable": true, | ||
| "href": "https://place.com/wp-json/wp/v2/comments?post=576" | ||
| } | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ package org.wordpress.android.fluxc.network.rest.wpapi.media | |
|
|
||
| import com.google.gson.Gson | ||
| import com.google.gson.JsonSyntaxException | ||
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.cancel | ||
| import kotlinx.coroutines.channels.ProducerScope | ||
|
|
@@ -107,25 +106,15 @@ abstract class BaseWPV2MediaRestClient constructor( | |
| fun ProducerScope<ProgressPayload>.handleFailure(media: MediaModel, error: MediaError) { | ||
| media.setUploadState(FAILED) | ||
| val payload = ProgressPayload(media, 1f, false, error) | ||
| trySendBlocking(payload) | ||
| close() | ||
| } | ||
|
|
||
| return callbackFlow { | ||
| val url = WPAPI.media.getFullUrl(site) | ||
| val body = WPRestUploadRequestBody(media) { media, progress -> | ||
|
Comment on lines
-125
to
-127
There was a problem hiding this comment. I removed these parts about catching the CancellationException, I was the one who added these, but they are not useful, as the exception is automatically ignored by the Coroutine's exception handler. |
||
| val payload = ProgressPayload(media, progress, false, null) | ||
| trySend(payload) | ||
| } | ||
|
|
||
| val request = Request.Builder() | ||
|
|
@@ -138,29 +127,22 @@ abstract class BaseWPV2MediaRestClient constructor( | |
|
|
||
| call.enqueue(object : Callback { | ||
| override fun onFailure(call: Call, e: IOException) { | ||
| val message = "media upload failed: $e" | ||
| AppLog.w(MEDIA, message) | ||
| val error = MediaError.fromIOException(e) | ||
| error.logMessage = message | ||
| handleFailure(media, error) | ||
| } | ||
|
|
||
| override fun onResponse(call: Call, response: Response) { | ||
| if (response.isSuccessful) { | ||
| try { | ||
| val res = gson.fromJson(response.body!!.string(), MediaWPRESTResponse::class.java) | ||
| val uploadedMedia = res.toMediaModel(site.id) | ||
| uploadedMedia.id = media.id | ||
| val payload = ProgressPayload(uploadedMedia, 1f, true, false) | ||
| trySendBlocking(payload) | ||
| close() | ||
| } catch (e: JsonSyntaxException) { | ||
| AppLog.e(MEDIA, e) | ||
| val error = MediaError(MediaErrorType.PARSE_ERROR) | ||
|
|
@@ -234,7 +216,7 @@ abstract class BaseWPV2MediaRestClient constructor( | |
| params["offset"] = offset.toString() | ||
| } | ||
| if (mimeType != null) { | ||
| params["media_type"] = mimeType.value | ||
|
Comment on lines
-237
to
+219
There was a problem hiding this comment. Working on this PR identified a bug with our previous implementation, when I worked on this in the first time, I based my implementation on the WPCom one and then used the
I believe the same issue is happening on iOS as well (here), I'll create an issue for them to fix it. |
||
| } | ||
| val response = executeGetGsonRequest( | ||
| site, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also removed all statements of
isClosedForSend, it's marked as delicate API, and it's not needed, as now we usetrySendinstead of the oldofferAPI.