Combine cancellation flag with progress tracker

marmelroy · Jun 9, 2016 · 8e75ae3 · 8e75ae3
1 parent 3b492da
commit 8e75ae3
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/Zip/Zip.swift b/Zip/Zip.swift
@@ -40,9 +40,9 @@ public class Zip {
     internal static var customFileExtensions: Set<String> = []
 
     /**
-     Property used for cancellation of process
+     Static progress tracker (also used for cancellation)
     */
-    private static var operationShouldContinue = true
+    private static var progressTracker: NSProgress?
 
     // MARK: Lifecycle
 
@@ -97,10 +97,10 @@ public class Zip {
             totalSize += attributeFileSize
         }
 
-        let progressTracker = NSProgress(totalUnitCount: Int64(totalSize))
-        progressTracker.cancellable = false
-        progressTracker.pausable = false
-        progressTracker.kind = NSProgressKindFile
+        progressTracker = NSProgress(totalUnitCount: Int64(totalSize))
+        progressTracker?.cancellable = true
+        progressTracker?.pausable = false
+        progressTracker?.kind = NSProgressKindFile
 
         // Begin unzipping
         let zip = unzOpen64(path)
@@ -188,12 +188,11 @@ public class Zip {
                 progressHandler(progress: (currentPosition/totalSize))
             }
 
-            progressTracker.completedUnitCount = Int64(currentPosition)
+            progressTracker?.completedUnitCount = Int64(currentPosition)
 
-        } while (ret == UNZ_OK && ret != UNZ_END_OF_LIST_OF_FILE) && operationShouldContinue
+        } while (ret == UNZ_OK && ret != UNZ_END_OF_LIST_OF_FILE) && !(progressTracker?.cancelled ?? false)
 
-        guard operationShouldContinue else {
-            operationShouldContinue = true
+        guard !(progressTracker?.cancelled ?? false) else {
             throw ZipError.OperationCancelled
         }
 
@@ -202,7 +201,7 @@ public class Zip {
             progressHandler(progress: 1.0)
         }
 
-        progressTracker.completedUnitCount = Int64(totalSize)
+        progressTracker?.completedUnitCount = Int64(totalSize)
 
     }
 
@@ -252,10 +251,10 @@ public class Zip {
             catch {}
         }
 
-        let progressTracker = NSProgress(totalUnitCount: Int64(totalSize))
-        progressTracker.cancellable = false
-        progressTracker.pausable = false
-        progressTracker.kind = NSProgressKindFile
+        progressTracker = NSProgress(totalUnitCount: Int64(totalSize))
+        progressTracker?.cancellable = true
+        progressTracker?.pausable = false
+        progressTracker?.kind = NSProgressKindFile
 
         // Begin Zipping
         let zip = zipOpen(destinationPath, APPEND_STATUS_CREATE)
@@ -298,8 +297,7 @@ public class Zip {
                 }
                 var length: Int = 0
                 while (feof(input) == 0) {
-                    guard operationShouldContinue else {
-                        operationShouldContinue = true
+                    guard !(progressTracker?.cancelled ?? false) else {
                         throw ZipError.OperationCancelled
                     }
 
@@ -312,7 +310,7 @@ public class Zip {
                     progressHandler(progress: (currentPosition/totalSize))
                 }
 
-                progressTracker.completedUnitCount = Int64(currentPosition)
+                progressTracker?.completedUnitCount = Int64(currentPosition)
 
                 zipCloseFileInZip(zip)
                 free(buffer)
@@ -326,14 +324,14 @@ public class Zip {
             progressHandler(progress: 1.0)
         }
 
-        progressTracker.completedUnitCount = Int64(totalSize)
+        progressTracker?.completedUnitCount = Int64(totalSize)
     }
 
     /**
      Set the cancel operation flag
      */
     public class func cancelCurrentOperation() {
-        operationShouldContinue = false
+        progressTracker?.cancel()
     }
 
     /**