Add the ability to specify RunLoop and RunLoopMode in after and

Marc-Antoine Sauvé · Marc-Antoine Sauvé · commit e4f81cc761ad · 2017-08-08T10:47:00.000-04:00
`every` methods while conserving the initial signature and behavior for
backward compatibility
diff --git a/Sources/SwiftyTimer.swift b/Sources/SwiftyTimer.swift
@@ -31,28 +31,28 @@ extension Timer {
     /// Create and schedule a timer that will call `block` once after the specified time.
     
     @discardableResult
-    public class func after(_ interval: TimeInterval, _ block: @escaping () -> Void) -> Timer {
+    public class func after(_ interval: TimeInterval, runLoop: RunLoop = .current, modes: RunLoopMode..., _ block: @escaping () -> Void) -> Timer {
         let timer = Timer.new(after: interval, block)
-        timer.start()
+        timer.start(runLoop: runLoop, modes: modes)
         return timer
     }
     
     /// Create and schedule a timer that will call `block` repeatedly in specified time intervals.
     
     @discardableResult
-    public class func every(_ interval: TimeInterval, _ block: @escaping () -> Void) -> Timer {
+    public class func every(_ interval: TimeInterval, runLoop: RunLoop = .current, modes: RunLoopMode..., _ block: @escaping () -> Void) -> Timer {
         let timer = Timer.new(every: interval, block)
-        timer.start()
+        timer.start(runLoop: runLoop, modes: modes)
         return timer
     }
     
     /// Create and schedule a timer that will call `block` repeatedly in specified time intervals.
     /// (This variant also passes the timer instance to the block)
     
     @nonobjc @discardableResult
-    public class func every(_ interval: TimeInterval, _ block: @escaping (Timer) -> Void) -> Timer {
+    public class func every(_ interval: TimeInterval, runLoop: RunLoop = .current, modes: RunLoopMode..., _ block: @escaping (Timer) -> Void) -> Timer {
         let timer = Timer.new(every: interval, block)
-        timer.start()
+        timer.start(runLoop: runLoop, modes: modes)
         return timer
     }
     
@@ -111,6 +111,20 @@ extension Timer {
             runLoop.add(self, forMode: mode)
         }
     }
+    
+    /// Schedule this timer on the run loop
+    ///
+    /// By default, the timer is scheduled on the current run loop for the default mode.
+    /// Specify `runLoop` or `modes` to override these defaults.
+    /// Usefull since the splat operator is not a thing in Swift
+    
+    public func start(runLoop: RunLoop = .current, modes: [RunLoopMode]) {
+        let modes = modes.isEmpty ? [.defaultRunLoopMode] : modes
+        
+        for mode in modes {
+            runLoop.add(self, forMode: mode)
+        }
+    }
 }
 
 // MARK: - Time extensions
diff --git a/SwiftyTimerTests/SwiftyTimerTests/main.swift b/SwiftyTimerTests/SwiftyTimerTests/main.swift
@@ -101,6 +101,19 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             guard fires <= 1 else { fatalError("should be invalidated") }
             defer { fires += 1 }
             
+            if fires == 1 {
+                timer.invalidate()
+                self.test10()
+            }
+        }
+    }
+    
+    func test10() {
+        var fires = 0
+        Timer.every(0.1.seconds, modes: .commonModes) { (timer: Timer) in
+            guard fires <= 1 else { fatalError("should be invalidated") }
+            defer { fires += 1 }
+            
             if fires == 1 {
                 timer.invalidate()
                 self.done()
