Moving Defaults.maxRetries inside the relevant operation.

Improving error message.

Author: Ruben Nine

FilestackSDK/Internal/Operations/CommitPartUploadOperation.swift

@@ -14,15 +14,13 @@ class CommitPartUploadOperation: BaseOperation<HTTPURLResponse> {
 
     private let descriptor: UploadDescriptor
     private let part: Int
-    private let retries: Int
     private var retrier: TaskRetrier<HTTPURLResponse>?
 
     // MARK: - Lifecyle
 
-    required init(descriptor: UploadDescriptor, part: Int, retries: Int) {
+    required init(descriptor: UploadDescriptor, part: Int) {
         self.descriptor = descriptor
         self.part = part
-        self.retries = retries
 
         super.init()
     }
@@ -56,7 +54,7 @@ private extension CommitPartUploadOperation {
     func upload() {
         let uploadURL = URL(string: "multipart/commit", relativeTo: Constants.uploadURL)!
 
-        retrier = .init(attempts: retries, label: uploadURL.relativePath) { (semaphore) -> HTTPURLResponse? in
+        retrier = .init(attempts: Defaults.maxRetries, label: uploadURL.relativePath) { (semaphore) -> HTTPURLResponse? in
             var httpURLResponse: HTTPURLResponse?
 
             UploadService.shared.upload(multipartFormData: self.multipartFormData, url: uploadURL) { response in
@@ -88,3 +86,11 @@ private extension CommitPartUploadOperation {
         form.append(descriptor.options.storeOptions.location.description, named: "store_location")
     }
 }
+
+// MARK: - Defaults
+
+private extension CommitPartUploadOperation {
+    struct Defaults {
+        static let maxRetries = 5
+    }
+}

FilestackSDK/Internal/Operations/CompleteUploadOperation.swift

@@ -14,14 +14,12 @@ class CompleteUploadOperation: BaseOperation<JSONResponse> {
 
     private let partsAndEtags: [Int: String]
     private let descriptor: UploadDescriptor
-    private let retries: Int
     private var retrier: TaskRetrier<JSONResponse>?
 
     // MARK: - Lifecycle
 
-    required init(partsAndEtags: [Int: String], retries: Int, descriptor: UploadDescriptor) {
+    required init(partsAndEtags: [Int: String], descriptor: UploadDescriptor) {
         self.partsAndEtags = partsAndEtags
-        self.retries = retries
         self.descriptor = descriptor
 
         super.init()
@@ -56,7 +54,7 @@ private extension CompleteUploadOperation {
     func upload() {
         let uploadURL = URL(string: "multipart/complete", relativeTo: Constants.uploadURL)!
 
-        retrier = .init(attempts: retries, label: uploadURL.relativePath) { (semaphore) -> JSONResponse? in
+        retrier = .init(attempts: Defaults.maxRetries, label: uploadURL.relativePath) { (semaphore) -> JSONResponse? in
             var jsonResponse: JSONResponse?
 
             UploadService.shared.upload(multipartFormData: self.multipartFormData, url: uploadURL) { response in
@@ -102,3 +100,11 @@ private extension CompleteUploadOperation {
         }
     }
 }
+
+// MARK: - Defaults
+
+private extension CompleteUploadOperation {
+    struct Defaults {
+        static let maxRetries = 5
+    }
+}

FilestackSDK/Internal/Operations/SubmitPartIntelligentUploadOperation.swift

@@ -82,7 +82,7 @@ private extension SubmitPartIntelligentUploadOperation {
         guard !isCancelled else { return nil }
 
         guard retries > 0 else {
-            finish(with: .failure(.custom("Too many retries.")))
+            finish(with: .failure(.custom("Exceeded max retries trying to submit data chunk.")))
             return nil
         }
 
@@ -133,7 +133,7 @@ private extension SubmitPartIntelligentUploadOperation {
     func executeCommit() {
         guard !isCancelled else { return }
 
-        let commitOperation = CommitPartUploadOperation(descriptor: descriptor, part: number, retries: Defaults.maxRetries)
+        let commitOperation = CommitPartUploadOperation(descriptor: descriptor, part: number)
 
         commitOperation.completionBlock = {
             switch commitOperation.result {
@@ -155,6 +155,6 @@ private extension SubmitPartIntelligentUploadOperation {
         static let resumableMobileChunkSize = 1_048_576
         static let resumableDesktopChunkSize = 8_388_608
         static let minimumPartChunkSize = 32_768
-        static let maxRetries: Int = 5
+        static let maxRetries = 5
     }
 }

FilestackSDK/Internal/Operations/UploadOperation.swift

@@ -178,20 +178,10 @@ private extension UploadOperation {
                                   completion: @escaping (CompleteUploadOperation.Result) -> Void) {
         guard !isCancelled else { return }
 
-        let completeOperation = CompleteUploadOperation(partsAndEtags: partsAndEtags,
-                                                        retries: Defaults.maxRetries,
-                                                        descriptor: descriptor)
+        let completeOperation = CompleteUploadOperation(partsAndEtags: partsAndEtags, descriptor: descriptor)
 
         completeOperation.completionBlock = { completion(completeOperation.result) }
 
         operationQueue.addOperation(completeOperation)
     }
 }
-
-// MARK: - Defaults
-
-private extension UploadOperation {
-    struct Defaults {
-        static let maxRetries = 5
-    }
-}