waitUntilAllOperationsAreFinished(timeout:) now takes Optional time…

…out parameter
orchetect · Jan 19, 2023 · 6c90fbb · 6c90fbb
1 parent 836cad2
commit 6c90fbb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/Sources/OTOperations/Operation/Complex/AtomicBlockOperation.swift b/Sources/OTOperations/Operation/Complex/AtomicBlockOperation.swift
@@ -302,12 +302,8 @@ extension AtomicBlockOperation {
     }
 
     /// Blocks the current thread until all the receiver’s queued and executing operations finish executing.
-    public func waitUntilAllOperationsAreFinished(timeout: TimeInterval? = nil) {
-        if let timeout = timeout {
-            operationQueue.waitUntilAllOperationsAreFinished(timeout: timeout)
-        } else {
-            operationQueue.waitUntilAllOperationsAreFinished()
-        }
+    public func waitUntilAllQueueOperationsAreFinished(timeout: TimeInterval? = nil) {
+        operationQueue.waitUntilAllOperationsAreFinished(timeout: timeout)
     }
 }
 

diff --git a/Sources/OTOperations/OperationQueue/OperationQueue Extensions.swift b/Sources/OTOperations/OperationQueue/OperationQueue Extensions.swift
@@ -13,8 +13,17 @@ extension OperationQueue {
     /// executing. Same as calling `waitUntilAllOperationsAreFinished()` but offers a timeout duration.
     @discardableResult
     public func waitUntilAllOperationsAreFinished(
-        timeout: TimeInterval
+        timeout: TimeInterval? = nil
     ) -> DispatchTimeoutResult {
+        // no timeout
+
+        guard let timeout = timeout else {
+            self.waitUntilAllOperationsAreFinished()
+            return .success
+        }
+
+        // with timeout
+
         let g = DispatchGroup()
         g.enter()