Using a fixed chunk size depending on upload type.

Author: rnine

FilestackSDK/Internal/Uploaders/MultipartUpload.swift

@@ -28,6 +28,14 @@ extension MultipartUploadError: LocalizedError {
     }
 }
 
+/// Chunksize depending on upload type.
+enum ChunkSize: Int {
+    /// Regular (5 megabytes)
+    case regular = 5_242_880
+    /// Intelligent Ingestion (8 megabytes)
+    case ii = 8_388_608
+}
+
 /// This class allows uploading a single `Uploadable` item to a given storage location.
 class MultipartUpload: Uploader {
     typealias UploadProgress = (Int64) -> Void
@@ -192,12 +200,11 @@ private extension MultipartUpload {
             canUseIntelligentIngestion = false
         }
 
-        let chunkSize: Int = options.chunkSize
-
         var part: Int = 0
         var seekPoint: UInt64 = 0
         var partsAndEtags: [Int: String] = [:]
 
+        let chunkSize = (canUseIntelligentIngestion ? ChunkSize.ii : ChunkSize.regular).rawValue
         let beforeCompleteCheckPointOperation = BlockOperation()
 
         beforeCompleteCheckPointOperation.completionBlock = {

FilestackSDK/Public/Models/UploadOptions.swift

@@ -19,9 +19,6 @@ import Foundation
     /// An object containing the store options (e.g. location, region, container, access, etc.)
     @objc public var storeOptions: StorageOptions
 
-    /// The chunksize in bytes to use.
-    @objc public var chunkSize: Int
-
     /// How many parts should be uploaded concurrently
     @objc public var partUploadConcurrency: Int
 
@@ -32,20 +29,15 @@ import Foundation
     @objc public init(preferIntelligentIngestion: Bool,
                       startImmediately: Bool,
                       storeOptions: StorageOptions = .defaults,
-                      chunkSize: Int = UploadOptions.defaultChunkSize,
                       partUploadConcurrency: Int = UploadOptions.defaultPartUploadConcurrency,
                       chunkUploadConcurrency: Int = UploadOptions.defaultChunkUploadConcurrency) {
         self.preferIntelligentIngestion = preferIntelligentIngestion
         self.startImmediately = startImmediately
         self.storeOptions = storeOptions
-        self.chunkSize = chunkSize
         self.partUploadConcurrency = partUploadConcurrency
         self.chunkUploadConcurrency = chunkUploadConcurrency
     }
 
-    /// Default chunk size (5 megabytes)
-    @objc public static var defaultChunkSize: Int = 5 * Int(pow(Double(1024), Double(2)))
-
     /// Default part upload concurrency
     @objc public static var defaultPartUploadConcurrency: Int = 5