From 451b82504ba4b50a678172d63f4532c77922e726 Mon Sep 17 00:00:00 2001
From: eToledo <etoledom@icloud.com>
Date: Tue, 1 Dec 2020 13:28:04 +0100
Subject: [PATCH 1/6] Adding Audio Block upload processor

---
 .../Classes/Services/PostCoordinator.swift    |  3 ++
 .../GutenbergAudioUploadProcessor.swift       | 54 +++++++++++++++++++
 WordPress/WordPress.xcodeproj/project.pbxproj |  4 ++
 3 files changed, 61 insertions(+)
 create mode 100644 WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift

diff --git a/WordPress/Classes/Services/PostCoordinator.swift b/WordPress/Classes/Services/PostCoordinator.swift
index 4ae92b9104cb..693531800a10 100644
--- a/WordPress/Classes/Services/PostCoordinator.swift
+++ b/WordPress/Classes/Services/PostCoordinator.swift
@@ -330,6 +330,9 @@ class PostCoordinator: NSObject {
 
             let videoPostUploadProcessor = VideoUploadProcessor(mediaUploadID: mediaUploadID, remoteURLString: remoteURLStr, videoPressID: media.videopressGUID)
             aztecProcessors.append(videoPostUploadProcessor)
+        } else if media.mediaType == .audio {
+            let gutenbergAudioProcessor = GutenbergAudioUploadProcessor(mediaUploadID: gutenbergMediaUploadID, serverMediaID: mediaID, remoteURLString: remoteURLStr)
+            gutenbergProcessors.append(gutenbergAudioProcessor)
         } else if let remoteURL = URL(string: remoteURLStr) {
             let documentTitle = remoteURL.lastPathComponent
             let documentUploadProcessor = DocumentUploadProcessor(mediaUploadID: mediaUploadID, remoteURLString: remoteURLStr, title: documentTitle)
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
new file mode 100644
index 000000000000..1c48b5d838e7
--- /dev/null
+++ b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
@@ -0,0 +1,54 @@
+import Foundation
+import Aztec
+
+class GutenbergAudioUploadProcessor: Processor {
+    private struct AudioBlockKeys {
+        static var name = "wp:audio"
+        static var id = "id"
+        static var src = "src"
+    }
+
+    let mediaUploadID: Int32
+    let remoteURLString: String
+    let serverMediaID: Int
+
+    init(mediaUploadID: Int32, serverMediaID: Int, remoteURLString: String) {
+        self.mediaUploadID = mediaUploadID
+        self.serverMediaID = serverMediaID
+        self.remoteURLString = remoteURLString
+    }
+
+    lazy var fileHtmlProcessor = HTMLProcessor(for: "audio", replacer: { (audio) in
+        var attributes = audio.attributes
+
+        attributes.set(.string(self.remoteURLString), forKey: AudioBlockKeys.src)
+
+        var html = "<audio "
+        let attributeSerializer = ShortcodeAttributeSerializer()
+        html += attributeSerializer.serialize(attributes)
+        html += "></audio>"
+        return html
+    })
+
+    lazy var fileBlockProcessor = GutenbergBlockProcessor(for: AudioBlockKeys.name, replacer: { fileBlock in
+        guard let mediaID = fileBlock.attributes[AudioBlockKeys.id] as? Int,
+            mediaID == self.mediaUploadID else {
+                return nil
+        }
+        var block = "<!-- \(AudioBlockKeys.name) "
+        var attributes = fileBlock.attributes
+        attributes[AudioBlockKeys.id] = self.serverMediaID
+        if let jsonData = try? JSONSerialization.data(withJSONObject: attributes, options: .sortedKeys),
+            let jsonString = String(data: jsonData, encoding: .utf8) {
+            block += jsonString
+        }
+        block += " -->"
+        block += self.fileHtmlProcessor.process(fileBlock.content)
+        block += "<!-- /\(AudioBlockKeys.name) -->"
+        return block
+    })
+
+    func process(_ text: String) -> String {
+        return fileBlockProcessor.process(text)
+    }
+}
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
index 39b942f0b446..5c979bbeebbe 100644
--- a/WordPress/WordPress.xcodeproj/project.pbxproj
+++ b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -315,6 +315,7 @@
 		1E4F2E712458AF8500EB73E7 /* GutenbergWebNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E4F2E702458AF8500EB73E7 /* GutenbergWebNavigationViewController.swift */; };
 		1E5D00102493CE240004B708 /* GutenGhostView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E5D000F2493CE240004B708 /* GutenGhostView.swift */; };
 		1E5D00142493E8C90004B708 /* GutenGhostView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1E5D00132493E8C90004B708 /* GutenGhostView.xib */; };
+		1E672D95257663CE00421F13 /* GutenbergAudioUploadProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E672D94257663CE00421F13 /* GutenbergAudioUploadProcessor.swift */; };
 		1E9D544D23C4C56300F6A9E0 /* GutenbergRollout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E9D544C23C4C56300F6A9E0 /* GutenbergRollout.swift */; };
 		24ADA24C24F9A4CB001B5DAE /* RemoteFeatureFlagStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24ADA24B24F9A4CB001B5DAE /* RemoteFeatureFlagStore.swift */; };
 		24B1AE3124FEC79900B9F334 /* RemoteFeatureFlagTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24B1AE3024FEC79900B9F334 /* RemoteFeatureFlagTests.swift */; };
@@ -2783,6 +2784,7 @@
 		1E4F2E702458AF8500EB73E7 /* GutenbergWebNavigationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GutenbergWebNavigationViewController.swift; sourceTree = "<group>"; };
 		1E5D000F2493CE240004B708 /* GutenGhostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GutenGhostView.swift; sourceTree = "<group>"; };
 		1E5D00132493E8C90004B708 /* GutenGhostView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GutenGhostView.xib; sourceTree = "<group>"; };
+		1E672D94257663CE00421F13 /* GutenbergAudioUploadProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GutenbergAudioUploadProcessor.swift; sourceTree = "<group>"; };
 		1E9D544C23C4C56300F6A9E0 /* GutenbergRollout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GutenbergRollout.swift; sourceTree = "<group>"; };
 		2262D835FA89938EBF63EADF /* Pods-WordPressShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressShareExtension.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-WordPressShareExtension/Pods-WordPressShareExtension.debug.xcconfig"; sourceTree = "<group>"; };
 		24ADA24B24F9A4CB001B5DAE /* RemoteFeatureFlagStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteFeatureFlagStore.swift; sourceTree = "<group>"; };
@@ -10960,6 +10962,7 @@
 			children = (
 				FF2EC3BF2209A144006176E1 /* GutenbergImgUploadProcessor.swift */,
 				1E0462152566938300EB98EF /* GutenbergFileUploadProcessor.swift */,
+				1E672D94257663CE00421F13 /* GutenbergAudioUploadProcessor.swift */,
 				FF1B11E4238FDFE70038B93E /* GutenbergGalleryUploadProcessor.swift */,
 				91138454228373EB00FB02B7 /* GutenbergVideoUploadProcessor.swift */,
 				4629E4202440C5B20002E15C /* GutenbergCoverUploadProcessor.swift */,
@@ -12876,6 +12879,7 @@
 				17BD4A192101D31B00975AC3 /* NavigationActionHelpers.swift in Sources */,
 				B55FFCFA1F034F1A0070812C /* String+Ranges.swift in Sources */,
 				7E846FF320FD37BD00881F5A /* ActivityCommentRange.swift in Sources */,
+				1E672D95257663CE00421F13 /* GutenbergAudioUploadProcessor.swift in Sources */,
 				9AA0ADB1235F11700027AB5D /* AsyncOperation.swift in Sources */,
 				FF8791BB1FBAF4B500AD86E6 /* MediaService+Swift.swift in Sources */,
 				D8212CB920AA77AD008E8AE8 /* ReaderActionHelpers.swift in Sources */,

From 6d40d61352adc1a14d1d174d62fadb9f522f640b Mon Sep 17 00:00:00 2001
From: eToledo <etoledom@icloud.com>
Date: Tue, 1 Dec 2020 15:53:35 +0100
Subject: [PATCH 2/6] Gutenberg: Use blog-allowed file types only for any file
 family type

---
 .../Utils/GutenbergFilesAppMediaSource.swift  | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift b/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift
index b8a991bc072e..0a104215cb94 100644
--- a/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift
+++ b/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift
@@ -12,8 +12,7 @@ class GutenbergFilesAppMediaSource: NSObject {
     }
 
     func presentPicker(origin: UIViewController, filters: [Gutenberg.MediaType], allowedTypesOnBlog: [String], multipleSelection: Bool, callback: @escaping MediaPickerDidPickMediaCallback) {
-
-        let uttypeFilters = filters.contains(.any) ? allowedTypesOnBlog : filters.compactMap { $0.typeIdentifier }
+        let uttypeFilters = filters.contains(.any) ? allowedTypesOnBlog : allTypesFrom(allowedTypesOnBlog, conformingTo: filters)
 
         mediaPickerCallback = callback
         let docPicker = UIDocumentPickerViewController(documentTypes: uttypeFilters, in: .import)
@@ -22,6 +21,10 @@ class GutenbergFilesAppMediaSource: NSObject {
 
         origin.present(docPicker, animated: true)
     }
+
+    private func allTypesFrom(_ allTypes: [String], conformingTo filters: [Gutenberg.MediaType]) -> [String] {
+        return filters.map { $0.filterTypesConformingTo(allTypes: allTypes) }.reduce([], +)
+    }
 }
 
 extension GutenbergFilesAppMediaSource: UIDocumentPickerDelegate {
@@ -59,14 +62,25 @@ extension GutenbergFilesAppMediaSource: UIDocumentPickerDelegate {
 }
 
 extension Gutenberg.MediaType {
-    var typeIdentifier: String? {
+    func filterTypesConformingTo(allTypes: [String]) -> [String] {
+        guard let uttype = typeIdentifier else {
+            return []
+        }
+        return getTypesFrom(allTypes, conformingTo: uttype)
+    }
+
+    private func getTypesFrom(_ allTypes: [String], conformingTo uttype: CFString) -> [String] {
+        return allTypes.filter{ UTTypeConformsTo($0 as CFString, uttype) }
+    }
+
+    private var typeIdentifier: CFString? {
         switch self {
         case .image:
-            return String(kUTTypeImage)
+            return kUTTypeImage
         case .video:
-            return String(kUTTypeMovie)
+            return kUTTypeMovie
         case .audio:
-            return String(kUTTypeAudio)
+            return kUTTypeAudio
         case .other, .any: // needs to be specified by the blog's allowed types.
             return nil
         }

From e5af804708ba97aa81b707a4c88d2fe997c3e783 Mon Sep 17 00:00:00 2001
From: eToledo <etoledom@icloud.com>
Date: Tue, 1 Dec 2020 16:24:16 +0100
Subject: [PATCH 3/6] Hound!

---
 .../Gutenberg/Utils/GutenbergFilesAppMediaSource.swift          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift b/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift
index 0a104215cb94..f7ece51e4052 100644
--- a/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift
+++ b/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift
@@ -70,7 +70,7 @@ extension Gutenberg.MediaType {
     }
 
     private func getTypesFrom(_ allTypes: [String], conformingTo uttype: CFString) -> [String] {
-        return allTypes.filter{ UTTypeConformsTo($0 as CFString, uttype) }
+        return allTypes.filter { UTTypeConformsTo($0 as CFString, uttype) }
     }
 
     private var typeIdentifier: CFString? {

From 21bde46fe5e902a6f0d9a880c10a24b0efb1523d Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Mon, 7 Dec 2020 12:55:40 +0100
Subject: [PATCH 4/6] Update
 WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift

Co-authored-by: Paul Von Schrottky <paul.von.schrottky@automattic.com>
---
 .../Gutenberg/Processors/GutenbergAudioUploadProcessor.swift    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
index 1c48b5d838e7..227bb2ed07d3 100644
--- a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
+++ b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
@@ -3,7 +3,7 @@ import Aztec
 
 class GutenbergAudioUploadProcessor: Processor {
     private struct AudioBlockKeys {
-        static var name = "wp:audio"
+        static let name = "wp:audio"
         static var id = "id"
         static var src = "src"
     }

From 93adfd6de036bb3e89184f73d7aa71386733b1ff Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Mon, 7 Dec 2020 12:55:52 +0100
Subject: [PATCH 5/6] Update
 WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift

Co-authored-by: Paul Von Schrottky <paul.von.schrottky@automattic.com>
---
 .../Gutenberg/Processors/GutenbergAudioUploadProcessor.swift    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
index 227bb2ed07d3..963e80266067 100644
--- a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
+++ b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
@@ -4,7 +4,7 @@ import Aztec
 class GutenbergAudioUploadProcessor: Processor {
     private struct AudioBlockKeys {
         static let name = "wp:audio"
-        static var id = "id"
+        static let id = "id"
         static var src = "src"
     }
 

From 860d2ff197caae4c9c3c23b80a528e4f6751f83e Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Mon, 7 Dec 2020 12:55:58 +0100
Subject: [PATCH 6/6] Update
 WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift

Co-authored-by: Paul Von Schrottky <paul.von.schrottky@automattic.com>
---
 .../Gutenberg/Processors/GutenbergAudioUploadProcessor.swift    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
index 963e80266067..d3db038c0c6a 100644
--- a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
+++ b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
@@ -5,7 +5,7 @@ class GutenbergAudioUploadProcessor: Processor {
     private struct AudioBlockKeys {
         static let name = "wp:audio"
         static let id = "id"
-        static var src = "src"
+        static let src = "src"
     }
 
     let mediaUploadID: Int32