LightTarget#setColor respects power property in in-memory cache.

tatey · Sep 2, 2015 · f0ad29d · f0ad29d
1 parent f3e61d1
commit f0ad29d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Source/Light.swift b/Source/Light.swift
@@ -23,7 +23,7 @@ public struct Light: Equatable, Printable {
 		return Light(id: id, power: power, brightness: brightness, color: color, label: label, connected: connected, group: group, location: location)
 	}
 
-	func lightWithColor(color: Color, andBrightness brightness: Double) -> Light {
+	func lightWithPower(power: Bool, color: Color, brightness: Double) -> Light {
 		return Light(id: id, power: power, brightness: brightness, color: color, label: label, connected: connected, group: group, location: location)
 	}
 

diff --git a/Source/LightTarget.swift b/Source/LightTarget.swift
@@ -135,17 +135,19 @@ public class LightTarget {
 		setColor(color, brightness: brightness, duration: duration, completionHandler: completionHandler)
 	}
 
-	public func setColor(color: Color, brightness: Double, duration: Float = LightTarget.defaultDuration, powerOn: Bool = LightTarget.defaultPowerOn, completionHandler: ((results: [Result], error: NSError?) -> Void)? = nil) {
+	public func setColor(color: Color, brightness: Double, duration: Float = LightTarget.defaultDuration, power: Bool = LightTarget.defaultPowerOn, completionHandler: ((results: [Result], error: NSError?) -> Void)? = nil) {
 		let newBrightness = brightness
 		let oldBrightness = self.brightness
 		let newColor = color
 		let oldColor = self.color
-		client.updateLights(lights.map({ $0.lightWithColor(newColor, andBrightness: newBrightness) }))
-		client.session.setLightsColor(selector.toQueryStringValue(), color: newColor.toQueryStringValue(newBrightness), duration: duration, powerOn: powerOn) { [weak self] (request, response, results, error) in
+		let newPower = power
+		let oldPower = self.power
+		client.updateLights(lights.map({ $0.lightWithPower(newPower, color: newColor, brightness: newBrightness) }))
+		client.session.setLightsColor(selector.toQueryStringValue(), color: newColor.toQueryStringValue(newBrightness), duration: duration, powerOn: newPower) { [weak self] (request, response, results, error) in
 			if let strongSelf = self {
 				var newLights = strongSelf.lightsByDeterminingConnectivityWithResults(strongSelf.lights, results: results)
 				if error != nil {
-					newLights = newLights.map({ $0.lightWithColor(oldColor, andBrightness: oldBrightness) })
+					newLights = newLights.map({ $0.lightWithPower(power, color: oldColor, brightness: oldBrightness) })
 				}
 				strongSelf.client.updateLights(newLights)
 			}