Gutenberg - async media upload Post background processing #9132
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 |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ | |
| import org.wordpress.android.util.AppLog; | ||
| import org.wordpress.android.util.PermissionUtils; | ||
| import org.wordpress.android.util.ProfilingUtils; | ||
| import org.wordpress.android.util.StringUtils; | ||
| import org.wordpress.android.util.ToastUtils; | ||
| import org.wordpress.android.util.AppLog.T; | ||
| import org.wordpress.android.util.helpers.MediaFile; | ||
|
|
@@ -39,6 +40,8 @@ | |
| import java.util.HashSet; | ||
| import java.util.Set; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| public class GutenbergEditorFragment extends EditorFragmentAbstract implements | ||
| View.OnTouchListener, | ||
|
|
@@ -364,6 +367,55 @@ public static boolean contentContainsGutenbergBlocks(String postContent) { | |
| return (postContent != null && postContent.contains(GUTENBERG_BLOCK_START)); | ||
| } | ||
|
|
||
| public static String replaceMediaFileWithUrl(Context context, @NonNull String postContent, | ||
|
There was a problem hiding this comment. As this is a static method, maybe it's a good candidate for some Util or Helper? There was a problem hiding this comment. That's a good idea, I was following the same pattern as we had for Aztec: in Aztec the class that can handle / is responsible for editing a Post is AztecEditorFragment, and we needed a static method as this manipulation of the Post's content happens asynchronously (that is, when the AztecEditorFragment is not instanced). There was a problem hiding this comment. addressed this change in 7472379 |
||
| String localMediaId, MediaFile mediaFile) { | ||
| if (mediaFile != null) { | ||
| String remoteUrl = StringUtils.notNullStr(Utils.escapeQuotes(mediaFile.getFileURL())); | ||
| // TODO: replace the URL | ||
| if (!mediaFile.isVideo()) { | ||
| // replace gutenberg block id holder with serverMediaId, and url_holder with remoteUrl | ||
| String oldImgBlockHeader = String.format("<!-- wp:image {\"id\":%s} -->", localMediaId); | ||
|
There was a problem hiding this comment. Probably we can put this |
||
| String newImgBlockHeader = String.format("<!-- wp:image {\"id\":%s} -->", mediaFile.getMediaId()); | ||
| postContent = postContent.replace(oldImgBlockHeader, newImgBlockHeader); | ||
|
|
||
| // replace class wp-image-id with serverMediaId, and url_holder with remoteUrl | ||
| String oldImgClass = String.format("class=\"wp-image-%s\"", localMediaId); | ||
| String newImgClass = String.format("class=\"wp-image-%s\"", mediaFile.getMediaId()); | ||
| postContent = postContent.replace(oldImgClass, newImgClass); | ||
|
|
||
| // let's first find this occurrence and keep note of the position, as we need to replace the | ||
| // immediate `src` value before | ||
| int iStartOfWpImageClassAttribute = postContent.indexOf(newImgClass); | ||
| if (iStartOfWpImageClassAttribute != -1) { | ||
| // now search negatively, for the src attribute appearing right before | ||
| int iStartOfImgTag = postContent.lastIndexOf("<img", iStartOfWpImageClassAttribute); | ||
| if (iStartOfImgTag != -1) { | ||
| Pattern p = Pattern.compile("<img[^>]*src=[\\\"']([^\\\"^']*)"); | ||
| Matcher m = p.matcher(postContent.substring(iStartOfImgTag)); | ||
| if (m.find()) { | ||
| String src = m.group(); | ||
| int startIndex = src.indexOf("src=") + 5; | ||
|
There was a problem hiding this comment. Can we put magic number 5 in some variable so that we can remember what's the idea behind it ? There was a problem hiding this comment. 👍 addressed in 6c5ec0a There was a problem hiding this comment. er, re-wrote it in 924725e to a class constant so it's easier to read |
||
| String srcTag = src.substring(startIndex, src.length()); | ||
| // now replace the url | ||
| postContent = postContent.replace(srcTag, remoteUrl); | ||
| } | ||
| } | ||
| } | ||
| } else { | ||
| // TODO replace in GB Video block? | ||
| } | ||
| } | ||
| return postContent; | ||
| } | ||
|
|
||
| public static boolean isMediaInPostBody(Context context, @NonNull String postContent, | ||
| String localMediaId) { | ||
| // check if media is in Gutenberg Post | ||
| String imgBlockHeaderToSearchFor = String.format("<!-- wp:image {\"id\":%s} -->", localMediaId); | ||
| return postContent.indexOf(imgBlockHeaderToSearchFor) != -1; | ||
| } | ||
|
|
||
|
|
||
| /* | ||
| * TODO: REMOVE THIS ONCE AZTEC COMPLETELY REPLACES THE VISUAL EDITOR IN WPANDROID APP | ||
| */ | ||
|
|
||
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.
This // TODO mark left here on purpose