Passing store options to MultipartRegularUploadSubmitOperation.

Author: Ruben Nine

FilestackSDK.xcodeproj/project.pbxproj

@@ -829,7 +829,7 @@
 		};
 		45CDA04C22C666E4008DF3F4 /* Run SwiftFormat */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
+			buildActionMask = 12;
 			files = (
 			);
 			inputFileListPaths = (

FilestackSDK/Internal/Extensions/StorageOptions+MultipartFormData.swift

@@ -0,0 +1,26 @@
+//
+//  StorageOptions+MultipartFormData.swift
+//  FilestackSDK
+//
+//  Created by Ruben Nine on 16/01/2020.
+//  Copyright © 2020 Filestack. All rights reserved.
+//
+
+import Foundation
+import Alamofire
+
+extension StorageOptions {
+
+    internal func append(to form: MultipartFormData) {
+        form.append(location.description, withName: "store_location")
+        form.append(region, withName: "store_region")
+        form.append(container, withName: "store_container")
+        form.append(path, withName: "store_path")
+        form.append(access?.description, withName: "store_access")
+
+        if let workflows = workflows {
+            let joinedWorkflows = "[\((workflows.map { "\"\($0)\"" }).joined(separator: ","))]"
+            form.append(joinedWorkflows, withName: "workflows")
+        }
+    }
+}

FilestackSDK/Internal/Operations/MultipartRegularUploadSubmitPartOperation.swift

@@ -21,6 +21,7 @@ internal class MultipartRegularUploadSubmitPartOperation: BaseOperation, Multipa
     let uri: String
     let region: String
     let uploadID: String
+    let storeOptions: StorageOptions
     let chunkSize: Int
     var uploadProgress: ((Int64) -> Void)?
 
@@ -39,6 +40,7 @@ internal class MultipartRegularUploadSubmitPartOperation: BaseOperation, Multipa
                   uri: String,
                   region: String,
                   uploadID: String,
+                  storeOptions: StorageOptions,
                   chunkSize: Int,
                   uploadProgress: @escaping ((Int64) -> Void)) {
         self.seek = seek
@@ -50,6 +52,7 @@ internal class MultipartRegularUploadSubmitPartOperation: BaseOperation, Multipa
         self.uri = uri
         self.region = region
         self.uploadID = uploadID
+        self.storeOptions = storeOptions
         self.chunkSize = chunkSize
         self.didFail = false
         self.uploadProgress = uploadProgress
@@ -97,6 +100,8 @@ private extension MultipartRegularUploadSubmitPartOperation {
             form.append(String(dataChunk.count), withName: "size")
             form.append(String(self.part), withName: "part")
             form.append(dataChunk.base64MD5Digest(), withName: "md5")
+
+            self.storeOptions.append(to: form)
         }
     }
 

FilestackSDK/Internal/Operations/MultipartUploadCompleteOperation.swift

@@ -80,16 +80,8 @@ private extension MultipartUploadCompleteOperation {
         form.append(fileName, withName: "filename")
         form.append(String(fileSize), withName: "size")
         form.append(mimeType, withName: "mimetype")
-        form.append(storeOptions.location.description, withName: "store_location")
-        form.append(storeOptions.region, withName: "store_region")
-        form.append(storeOptions.container, withName: "store_container")
-        form.append(storeOptions.path, withName: "store_path")
-        form.append(storeOptions.access?.description, withName: "store_access")
 
-        if let workflows = storeOptions.workflows {
-            let joinedWorkflows = "[\((workflows.map { "\"\($0)\"" }).joined(separator: ","))]"
-            form.append(joinedWorkflows, withName: "workflows")
-        }
+        storeOptions.append(to: form)
 
         if let security = security {
             form.append(security.encodedPolicy, withName: "policy")

FilestackSDK/Internal/Operations/MultipartUploadStartOperation.swift

@@ -60,15 +60,14 @@ private extension MultipartUploadStartOperation {
         form.append(fileName, withName: "filename")
         form.append(mimeType, withName: "mimetype")
         form.append(String(fileSize), withName: "size")
-        form.append(storeOptions.location.description, withName: "store_location")
-        form.append(storeOptions.region, withName: "store_region")
-        form.append(storeOptions.container, withName: "store_container")
-        form.append(storeOptions.path, withName: "store_path")
-        form.append(storeOptions.access?.description, withName: "store_access")
+
+        storeOptions.append(to: form)
+
         if let security = security {
             form.append(security.encodedPolicy, withName: "policy")
             form.append(security.signature, withName: "signature")
         }
+
         if useIntelligentIngestionIfAvailable {
             form.append("true", withName: "multipart")
         }

FilestackSDK/Internal/Uploaders/MultipartUpload.swift

@@ -313,6 +313,7 @@ private extension MultipartUpload {
                                                              uri: uri,
                                                              region: region,
                                                              uploadID: uploadId,
+                                                             storeOptions: options.storeOptions,
                                                              chunkSize: chunkSize,
                                                              uploadProgress: updateProgress)
         }