Improving reliability of MultipartUpload abort logic (cont'd.)

Author: Ruben Nine

FilestackSDK/Internal/Operations/BaseOperation.swift

@@ -38,7 +38,20 @@ class BaseOperation: Operation {
         }
     }
 
+    override func start() {
+        state = .executing
+
+        guard !isCancelled else {
+            state = .finished
+            return
+        }
+
+        main()
+    }
+
     override func cancel() {
+        super.cancel()
+
         if isExecuting {
             state = .finished
         }

FilestackSDK/Internal/Operations/MultipartIntelligentUploadSubmitPartOperation.swift

@@ -92,12 +92,6 @@ internal class MultipartIntelligentUploadSubmitPartOperation: BaseOperation, Mul
 
 private extension MultipartIntelligentUploadSubmitPartOperation {
     func upload() {
-        if isCancelled {
-            state = .finished
-            return
-        }
-
-        state = .executing
         partChunkSize = resumableMobileChunkSize
 
         beforeCommitCheckPointOperation = BlockOperation()

FilestackSDK/Internal/Operations/MultipartRegularUploadSubmitPartOperation.swift

@@ -74,13 +74,6 @@ internal class MultipartRegularUploadSubmitPartOperation: BaseOperation, Multipa
 
 private extension MultipartRegularUploadSubmitPartOperation {
     func upload() {
-        guard !isCancelled else {
-            state = .finished
-            return
-        }
-
-        state = .executing
-
         reader.seek(position: seek)
         let dataChunk = reader.read(amount: chunkSize)
 

FilestackSDK/Internal/Operations/MultipartUploadCommitOperation.swift

@@ -41,11 +41,6 @@ class MultipartUploadCommitOperation: BaseOperation {
     }
 
     override func main() {
-        if isCancelled {
-            state = .finished
-            return
-        }
-        state = .executing
         UploadService.upload(multipartFormData: multipartFormData, url: uploadUrl) { response in
             self.response = response
             self.state = .finished

FilestackSDK/Internal/Operations/MultipartUploadCompleteOperation.swift

@@ -53,13 +53,6 @@ class MultipartUploadCompleteOperation: BaseOperation {
     }
 
     override func main() {
-        if isCancelled {
-            state = .finished
-            return
-        }
-
-        state = .executing
-
         UploadService.upload(multipartFormData: multipartFormData, url: uploadUrl) { response in
             self.response = response
             self.state = .finished

FilestackSDK/Internal/Operations/MultipartUploadStartOperation.swift

@@ -38,11 +38,6 @@ class MultipartUploadStartOperation: BaseOperation {
     }
 
     override func main() {
-        if isCancelled {
-            state = .finished
-            return
-        }
-        state = .executing
         UploadService.upload(multipartFormData: multipartFormData, url: uploadUrl) { response in
             self.response = response
             self.state = .finished

FilestackSDK/Internal/Operations/MultipartuploadSubmitChunkOperation.swift

@@ -43,18 +43,12 @@ class MultipartUploadSubmitChunkOperation: BaseOperation {
     }
 
     override func main() {
-        if isCancelled {
-            state = .finished
-            return
-        }
-        state = .executing
         UploadService.upload(multipartFormData: multipartFormData, url: uploadUrl, completionHandler: uploadDidFinish)
     }
 
     override func cancel() {
         super.cancel()
         uploadRequest?.cancel()
-        state = .finished
     }
 }