added: isRunning, counter callback

ilandbt · ilandbt · commit 5670e8e5ff00 · 2018-02-11T18:29:56.000+02:00
diff --git a/Sources/SwiftyTimer.swift b/Sources/SwiftyTimer.swift
@@ -31,23 +31,29 @@ extension Timer {
     
     private struct AssociatedKeys {
         static var repeatCounterAddress = "repeat_counter_address"
-        static var numberOfRepeatsAddress = "number_of_repeats_address"
+        //        static var isTimerRunning = "is_timer_running_address"
     }
     
+    private var isRunning: Bool {
+        get {
+            return isValid//objc_getAssociatedObject(self, &AssociatedKeys.isTimerRunning) as? Bool ?? false
+        }
+    }
+    
+    
     private var repeatCounter: Int {
         get {
             return objc_getAssociatedObject(self, &AssociatedKeys.repeatCounterAddress) as? Int ?? 0
         }
         set {
-            
             objc_setAssociatedObject(self,
                                      &AssociatedKeys.repeatCounterAddress,
                                      newValue,
-                                     .OBJC_ASSOCIATION_RETAIN)
+                                     .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
         }
     }
     
-    public class func every(_ interval: TimeInterval, `for` times: Int, _ block: @escaping (Timer) -> Void) -> Timer  {
+    public class func every(_ interval: TimeInterval, `for` times: Int, _ block: @escaping (Timer, Int) -> Void) -> Timer  {
         
         let timer = Timer.new(every: interval, for: times, block)
         timer.start()
@@ -91,7 +97,7 @@ extension Timer {
     /// - Note: The `new` class function is a workaround for a crashing bug when using convenience initializers (rdar://18720947)
     
     public class func new(after interval: TimeInterval, _ block: @escaping () -> Void) -> Timer {
-        return CFRunLoopTimerCreateWithHandler(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + interval, 0, 0, 0) { _ in
+        return CFRunLoopTimerCreateWithHandler(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + interval, 0, 0, 0) { timer  in
             block()
         }
     }
@@ -134,7 +140,7 @@ extension Timer {
     ///         Use `NSTimer.every` to create and schedule a timer in one step.
     /// - Note: The `new` class function is a workaround for a crashing bug when using convenience initializers (rdar://18720947)
     
-    @nonobjc public class func new(every interval: TimeInterval, `for` times: Int, _ block: @escaping (Timer) -> Void) -> Timer {
+    @nonobjc public class func new(every interval: TimeInterval, `for` times: Int, _ block: @escaping (Timer, Int) -> Void) -> Timer {
         var timer: Timer!
         
         timer = CFRunLoopTimerCreateWithHandler(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + interval, interval, 0, 0) { _ in
@@ -148,7 +154,7 @@ extension Timer {
                 }
             }
             
-            block(timer)
+            block(timer, timer.repeatCounter)
         }
         return timer
     }
@@ -175,6 +181,7 @@ extension Timer {
             runLoop.add(self, forMode: mode)
         }
     }
+    
 }
 
 // MARK: - Time extensions
@@ -197,4 +204,3 @@ public extension Double {
     public var days: TimeInterval         { return self * 3600 * 24 }
 }
 
-

Original file line number	Diff line number	Diff line change
`@@ -31,23 +31,29 @@ extension Timer {`
`31`	`31`
`32`	`32`	`private struct AssociatedKeys {`
`33`	`33`	`static var repeatCounterAddress = "repeat_counter_address"`
`34`		`- static var numberOfRepeatsAddress = "number_of_repeats_address"`
	`34`	`+ // static var isTimerRunning = "is_timer_running_address"`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ private var isRunning: Bool {`
	`38`	`+ get {`
	`39`	`+ return isValid//objc_getAssociatedObject(self, &AssociatedKeys.isTimerRunning) as? Bool ?? false`
	`40`	`+ }`
	`41`	`+ }`
	`42`	`+`
	`43`	`+`
`37`	`44`	`private var repeatCounter: Int {`
`38`	`45`	`get {`
`39`	`46`	`return objc_getAssociatedObject(self, &AssociatedKeys.repeatCounterAddress) as? Int ?? 0`
`40`	`47`	`}`
`41`	`48`	`set {`
`42`		`-`
`43`	`49`	`objc_setAssociatedObject(self,`
`44`	`50`	`&AssociatedKeys.repeatCounterAddress,`
`45`	`51`	`newValue,`
`46`		`- .OBJC_ASSOCIATION_RETAIN)`
	`52`	`+ .OBJC_ASSOCIATION_RETAIN_NONATOMIC)`
`47`	`53`	`}`
`48`	`54`	`}`
`49`	`55`
`50`		- public class func every(_ interval: TimeInterval, `for` times: Int, _ block: @escaping (Timer) -> Void) -> Timer {
	`56`	+ public class func every(_ interval: TimeInterval, `for` times: Int, _ block: @escaping (Timer, Int) -> Void) -> Timer {
`51`	`57`
`52`	`58`	`let timer = Timer.new(every: interval, for: times, block)`
`53`	`59`	`timer.start()`
`@@ -91,7 +97,7 @@ extension Timer {`
`91`	`97`	/// - Note: The `new` class function is a workaround for a crashing bug when using convenience initializers (rdar://18720947)
`92`	`98`
`93`	`99`	`public class func new(after interval: TimeInterval, _ block: @escaping () -> Void) -> Timer {`
`94`		`- return CFRunLoopTimerCreateWithHandler(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + interval, 0, 0, 0) { _ in`
	`100`	`+ return CFRunLoopTimerCreateWithHandler(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + interval, 0, 0, 0) { timer in`
`95`	`101`	`block()`
`96`	`102`	`}`
`97`	`103`	`}`
`@@ -134,7 +140,7 @@ extension Timer {`
`134`	`140`	/// Use `NSTimer.every` to create and schedule a timer in one step.
`135`	`141`	/// - Note: The `new` class function is a workaround for a crashing bug when using convenience initializers (rdar://18720947)
`136`	`142`
`137`		- @nonobjc public class func new(every interval: TimeInterval, `for` times: Int, _ block: @escaping (Timer) -> Void) -> Timer {
	`143`	+ @nonobjc public class func new(every interval: TimeInterval, `for` times: Int, _ block: @escaping (Timer, Int) -> Void) -> Timer {
`138`	`144`	`var timer: Timer!`
`139`	`145`
`140`	`146`	`timer = CFRunLoopTimerCreateWithHandler(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + interval, interval, 0, 0) { _ in`
`@@ -148,7 +154,7 @@ extension Timer {`
`148`	`154`	`}`
`149`	`155`	`}`
`150`	`156`
`151`		`- block(timer)`
	`157`	`+ block(timer, timer.repeatCounter)`
`152`	`158`	`}`
`153`	`159`	`return timer`
`154`	`160`	`}`
`@@ -175,6 +181,7 @@ extension Timer {`
`175`	`181`	`runLoop.add(self, forMode: mode)`
`176`	`182`	`}`
`177`	`183`	`}`
	`184`	`+`
`178`	`185`	`}`
`179`	`186`
`180`	`187`	`// MARK: - Time extensions`
`@@ -197,4 +204,3 @@ public extension Double {`
`197`	`204`	`public var days: TimeInterval { return self * 3600 * 24 }`
`198`	`205`	`}`
`199`	`206`
`200`		`-`