Refactor constraints

Sources/SwiftQueue/Constraint+Charging.swift

@@ -54,10 +54,6 @@ internal final class BatteryChargingConstraint: JobConstraint {
     func willRun(operation: SqOperation) throws {}
 
     func run(operation: SqOperation) -> Bool {
-        guard operation.info.requireCharging else {
-            return true
-        }
-
         guard UIDevice.current.batteryState != .charging else {
             return true
         }

Sources/SwiftQueue/Constraint+Deadline.swift

@@ -24,6 +24,12 @@ import Foundation
 
 internal final class DeadlineConstraint: JobConstraint {
 
+    private let deadline: Date
+
+    init(deadline: Date) {
+        self.deadline = deadline
+    }
+
     func willSchedule(queue: SqOperationQueue, operation: SqOperation) throws {
         try check(operation: operation)
     }
@@ -33,11 +39,7 @@ internal final class DeadlineConstraint: JobConstraint {
     }
 
     func run(operation: SqOperation) -> Bool {
-        guard let delay = operation.info.deadline else {
-            return true
-        }
-
-        operation.dispatchQueue.runAfter(delay.timeIntervalSinceNow, callback: { [weak operation] in
+        operation.dispatchQueue.runAfter(deadline.timeIntervalSinceNow, callback: { [weak operation] in
             guard let ope = operation else { return }
             guard !ope.isFinished else { return }
 
@@ -47,7 +49,7 @@ internal final class DeadlineConstraint: JobConstraint {
     }
 
     private func check(operation: SqOperation) throws {
-        if let deadline = operation.info.deadline, deadline < Date() {
+        if deadline < Date() {
             throw SwiftQueueError.deadline
         }
     }

Sources/SwiftQueue/Constraint+Delay.swift

@@ -24,6 +24,12 @@ import Foundation
 
 internal final class DelayConstraint: JobConstraint {
 
+    private let delay: TimeInterval
+
+    init(delay: TimeInterval) {
+        self.delay = delay
+    }
+
     func willSchedule(queue: SqOperationQueue, operation: SqOperation) throws {
         // Nothing to do
     }
@@ -33,11 +39,6 @@ internal final class DelayConstraint: JobConstraint {
     }
 
     func run(operation: SqOperation) -> Bool {
-        guard let delay = operation.info.delay else {
-            // No delay run immediately
-            return true
-        }
-
         let epoch = Date().timeIntervalSince(operation.info.createTime)
         guard epoch < delay else {
             // Epoch already greater than delay

Sources/SwiftQueue/Constraint+Timeout.swift

@@ -24,6 +24,12 @@ import Foundation
 
 internal final class TimeoutConstraint: JobConstraint {
 
+    private let timeout: TimeInterval
+
+    init(timeout: TimeInterval) {
+        self.timeout = timeout
+    }
+
     func willSchedule(queue: SqOperationQueue, operation: SqOperation) throws {
         // Nothing to do
     }
@@ -33,10 +39,6 @@ internal final class TimeoutConstraint: JobConstraint {
     }
 
     func run(operation: SqOperation) -> Bool {
-        guard let timeout = operation.info.timeout else {
-            return true
-        }
-
         operation.dispatchQueue.runAfter(timeout) {
             if operation.isExecuting && !operation.isFinished {
                 operation.cancel(with: SwiftQueueError.timeout)

Sources/SwiftQueue/JobInfo.swift

@@ -100,20 +100,20 @@ public struct JobInfo {
             constraints.append(BatteryChargingConstraint())
         }
 
-        if deadline != nil {
-            constraints.append(DeadlineConstraint())
+        if let deadline = deadline {
+            constraints.append(DeadlineConstraint(deadline: deadline))
         }
 
-        if delay != nil {
-            constraints.append(DelayConstraint())
+        if let delay = delay {
+            constraints.append(DelayConstraint(delay: delay))
         }
 
         if requireNetwork != NetworkType.any {
             constraints.append(NetworkConstraint())
         }
 
-        if timeout != nil {
-            constraints.append(TimeoutConstraint())
+        if let timeout = timeout {
+            constraints.append(TimeoutConstraint(timeout: timeout))
         }
 
         return constraints