Improve performance of Image and Gallery block processors to avoid long delay when saving a post #22896
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
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,7 +1,7 @@ | ||
| import Foundation | ||
| import SwiftSoup | ||
|
There was a problem hiding this comment. Aztec was imported in this file to use |
||
|
|
||
| class GutenbergGalleryUploadProcessor: GutenbergProcessor { | ||
|
|
||
| let mediaUploadID: Int32 | ||
| let remoteURLString: String | ||
|
|
@@ -28,76 +28,67 @@ class GutenbergGalleryUploadProcessor: Processor { | |
| static let dataLink = "data-link" | ||
| } | ||
|
|
||
| func processImgPostMediaUpload(_ element: Element) { | ||
| let imgTags = try? element.select(ImageKeys.name) | ||
| imgTags?.forEach {imgTag in | ||
|
There was a problem hiding this comment. Optional nit: Could be in an There was a problem hiding this comment. I applied this suggestion in d60c1d1. |
||
| guard let imgClass = try? imgTag.attr(ImageKeys.classAttributes) else { | ||
| return | ||
| } | ||
|
|
||
| let classAttributes = imgClass.components(separatedBy: " ") | ||
|
|
||
| guard let imageIDAttribute = classAttributes.filter({ (value) -> Bool in | ||
| value.hasPrefix(GutenbergImgUploadProcessor.imgClassIDPrefixAttribute) | ||
| }).first else { | ||
| return | ||
| } | ||
|
|
||
| let imageIDString = String(imageIDAttribute.dropFirst(ImageKeys.classIDPrefix.count)) | ||
| let imgUploadID = Int32(imageIDString) | ||
|
|
||
| guard imgUploadID == self.mediaUploadID else { | ||
| return | ||
| } | ||
|
|
||
| let newImgClassAttributes = imgClass.replacingOccurrences(of: imageIDAttribute, with: ImageKeys.classIDPrefix + String(self.serverMediaID)) | ||
|
|
||
| _ = try? imgTag.attr("src", self.remoteURLString) | ||
| _ = try? imgTag.attr("class", newImgClassAttributes) | ||
| _ = try? imgTag.attr(ImageKeys.dataID, "\(self.serverMediaID)") | ||
|
There was a problem hiding this comment. Optional nit and more of a personal pref, but it may be more common to convert the Int -> String via There was a problem hiding this comment. I applied this suggestion in 7694cb2. |
||
| _ = try? imgTag.attr(ImageKeys.dataFullURL, self.remoteURLString) | ||
|
|
||
| let dataLinkAttribute = try? imgTag.attr(ImageKeys.dataLink) | ||
| if dataLinkAttribute != nil { | ||
|
There was a problem hiding this comment. Same comment about adding an There was a problem hiding this comment. I applied this suggestion in d60c1d1. |
||
| _ = try? imgTag.attr(ImageKeys.dataLink, self.mediaLink) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private struct LinkKeys { | ||
| static let name = "a" | ||
| } | ||
|
|
||
| func processLinkPostMediaUpload(_ block: GutenbergParsedBlock) { | ||
| let aTags = try? block.elements.select(LinkKeys.name) | ||
|
There was a problem hiding this comment. Same comment about adding an There was a problem hiding this comment. I applied this suggestion in d60c1d1. |
||
| aTags?.forEach { aTag in | ||
| guard let linkOriginalContent = try? aTag.html() else { | ||
| return | ||
| } | ||
|
|
||
| processImgPostMediaUpload(aTag) | ||
| let linkUpdatedContent = try? aTag.html() | ||
|
|
||
| guard linkUpdatedContent != linkOriginalContent else { | ||
| return | ||
| } | ||
|
|
||
| if let linkToURL = self.linkToURL { | ||
| _ = try? aTag.attr("href", linkToURL) | ||
| } else { | ||
| _ = try? aTag.attr("href", self.remoteURLString) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private struct GalleryBlockKeys { | ||
| static let name = "wp:gallery" | ||
|
|
@@ -117,42 +108,35 @@ class GutenbergGalleryUploadProcessor: Processor { | |
| return ids | ||
| } | ||
|
|
||
| func processGalleryBlocks(_ blocks: [GutenbergParsedBlock]) { | ||
| let galleryBlocks = blocks.filter { $0.name == GalleryBlockKeys.name } | ||
| galleryBlocks.forEach { block in | ||
| guard let idsAny = block.attributes[GalleryBlockKeys.ids] as? [Any] else { | ||
| return | ||
| } | ||
| var ids = self.convertToIntArray(idsAny) | ||
| guard ids.contains(self.mediaUploadID) else { | ||
| return | ||
| } | ||
| if let index = ids.firstIndex(of: self.mediaUploadID ) { | ||
| ids[index] = Int32(self.serverMediaID) | ||
| } | ||
| block.attributes[GalleryBlockKeys.ids] = ids | ||
|
|
||
| if let linkTo = block.attributes[GalleryBlockKeys.linkTo] as? String, linkTo != "none" { | ||
| if linkTo == "file" { | ||
| self.linkToURL = self.remoteURLString | ||
| } else if linkTo == "post" { | ||
| self.linkToURL = self.mediaLink | ||
| } | ||
| processLinkPostMediaUpload(block) | ||
| } else { | ||
| block.elements.forEach { processImgPostMediaUpload($0) } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func process(_ blocks: [GutenbergParsedBlock]) { | ||
| processGalleryBlocks(blocks) | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
Please be cautious about making changes to
PostCoordinatorbecause the large potion of it is or will be rewritten.prepareToSaveis unchanged, so it's a safe change.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.
Thanks @kean for the call out 🙇 ! This PR mainly focuses on the logic related to processing blocks before saving a post, which requires touching up some bits of the
PostCoordinator. I'm planning to modify only necessary here, so hopefully there won't be much conflict with ongoing changes. In any case, I'll be happy to contribute to the new version by applying the same updates.