buzzert/Xaibatsu-Control-Panel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug where sometimes "ALL ON" or "ALL OFF" don't work

Browse Source
This commit is contained in:
Charles Magahern
2016-01-18 19:18:06 -08:00
parent 858ea41746
commit bb59974376
3 changed files with 155 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
XIONControlPanel/Controllers/WemoServer.swift
View File

@@ -16,11 +16,12 @@ enum ConnectionStatus {
}
class WemoServer {
private(set) var baseURL: NSURL
private(set) var connected: Bool = false
private(set) var baseURL: NSURL
private(set) var connected: Bool = false
private var _urlSession: NSURLSession
private var _errorStream: StandardErrorOutputStream = StandardErrorOutputStream()
private var _urlSession: NSURLSession
private var _errorStream: StandardErrorOutputStream = StandardErrorOutputStream()
private var _operationQueue: NSOperationQueue = NSOperationQueue()
init(_ url: NSURL)
{
@@ -28,28 +29,26 @@ class WemoServer {
let config = NSURLSessionConfiguration.defaultSessionConfiguration()
_urlSession = NSURLSession(configuration: config)
_operationQueue.maxConcurrentOperationCount = 1
}
func connect(completion: (NSError?) -> Void)
{
if (!self.connected) {
let url = self.baseURL.URLByAppendingPathComponent("api/environment")
let request = NSMutableURLRequest(URL: url)
request.HTTPMethod = "POST"
let task = _urlSession.dataTaskWithRequest(request) { (data: NSData?, response: NSURLResponse?, error: NSError?) -> Void in
var clientError: NSError? = nil
if (error != nil) {
clientError = NSError.xionError(.ConnectionError, underlying: error!)
self._logError("Error connecting to server", error: clientError!)
let op = ConnectOperation(baseURL: self.baseURL, session: _urlSession)
weak var weakOp = op
op.completionBlock = {
guard let strongOp = weakOp else { completion(nil) ; return }
if (strongOp.error != nil) {
self._logError("Error connecting to server", error: strongOp.error!)
} else {
self.connected = true
}
completion(clientError)
completion(strongOp.error)
}
task.resume()
_operationQueue.addOperation(op)
} else {
completion(nil)
}
@@ -64,21 +63,17 @@ class WemoServer {
func fetchDevices(completion: ([WemoDevice], NSError?) -> Void)
{
if (self.connected) {
let url = self.baseURL.URLByAppendingPathComponent("api/environment")
let task = _urlSession.dataTaskWithURL(url) { (data: NSData?, response: NSURLResponse?, error: NSError?) -> Void in
var devices: [WemoDevice] = []
var clientError: NSError? = nil
if (data != nil) {
devices = self._parseDevices(data!)
} else {
clientError = NSError.xionError(.ConnectionError, underlying: error)
self._logError("Error fetching devices", error: clientError!)
let op = FetchDevicesOperation(baseURL: self.baseURL, session: _urlSession)
weak var weakOp = op
op.completionBlock = {
guard let strongOp = weakOp else { completion([], nil) ; return }
if (strongOp.error != nil) {
self._logError("Error fetching devices", error: strongOp.error!)
}
completion(devices, clientError)
completion(strongOp.devices, strongOp.error)
}
task.resume()
_operationQueue.addOperation(op)
} else {
let err = NSError.xionError(.ConnectionError)
completion([], err)
@@ -88,24 +83,17 @@ class WemoServer {
func toggleDevice(device: WemoDevice, state: WemoDevice.State, completion: (NSError?) -> Void)
{
if (self.connected) {
let stateArg = (state == .On ? "on" : "off")
let url = self.baseURL.URLByAppendingPathComponent("api/device/\(device.name)").URLByAppendingRequestParameters(["state" : stateArg])
let request = NSMutableURLRequest(URL: url!)
request.HTTPMethod = "POST"
print("Toggle: \(url!.absoluteString)")
let task = _urlSession.dataTaskWithRequest(request) { (data: NSData?, response: NSURLResponse?, error: NSError?) -> Void in
var clientError: NSError? = nil
if (error != nil) {
clientError = NSError.xionError(.ConnectionError, underlying: error)
self._logError("Error toggling device \"\(device.name)\"", error: clientError!)
let op = ToggleDeviceOperation(baseURL: self.baseURL, session: _urlSession, device: device, state: state)
weak var weakOp = op
op.completionBlock = {
guard let strongOp = weakOp else { completion(nil) ; return }
if (strongOp.error != nil) {
self._logError("Error toggling device", error: strongOp.error!)
}
completion(clientError)
completion(strongOp.error)
}
task.resume()
_operationQueue.addOperation(op)
} else {
let err = NSError.xionError(.ConnectionError)
completion(err)
@@ -118,6 +106,58 @@ class WemoServer {
{
print("ERROR: \(description) \(error)", toStream: &_errorStream)
}
}
internal class WemoOperation : NSOperation {
var baseURL: NSURL
var session: NSURLSession
internal(set) var error: NSError?
init(baseURL: NSURL, session: NSURLSession)
{
self.baseURL = baseURL
self.session = session
}
}
internal class ConnectOperation : WemoOperation {
override func main()
{
let semaphore = Semaphore(value: 0)
let url = self.baseURL.URLByAppendingPathComponent("api/environment")
let request = NSMutableURLRequest(URL: url)
request.HTTPMethod = "POST"
let task = self.session.dataTaskWithRequest(request) { (data: NSData?, response: NSURLResponse?, error: NSError?) -> Void in
if (error != nil) {
self.error = NSError.xionError(.ConnectionError, underlying: error!)
}
semaphore.signal()
}
task.resume()
semaphore.wait()
}
}
internal class FetchDevicesOperation : WemoOperation {
internal(set) var devices: [WemoDevice] = []
override func main()
{
let semaphore = Semaphore(value: 0)
let url = self.baseURL.URLByAppendingPathComponent("api/environment")
let task = self.session.dataTaskWithURL(url) { (data: NSData?, response: NSURLResponse?, error: NSError?) -> Void in
if (data != nil) {
self.devices = self._parseDevices(data!)
} else {
self.error = NSError.xionError(.ConnectionError, underlying: error)
}
semaphore.signal()
}
task.resume()
semaphore.wait()
}
internal func _parseDevices(data: NSData) -> [WemoDevice]
{
@@ -135,3 +175,33 @@ class WemoServer {
return devices
}
}
internal class ToggleDeviceOperation : WemoOperation {
var device: WemoDevice
var state: WemoDevice.State
init(baseURL: NSURL, session: NSURLSession, device: WemoDevice, state: WemoDevice.State)
{
self.device = device
self.state = state
super.init(baseURL: baseURL, session: session)
}
override func main()
{
let semaphore = Semaphore(value: 0)
let stateArg = (self.state == .On ? "on" : "off")
let url = self.baseURL.URLByAppendingPathComponent("api/device/\(self.device.name)").URLByAppendingRequestParameters(["state" : stateArg])
let request = NSMutableURLRequest(URL: url!)
request.HTTPMethod = "POST"
let task = self.session.dataTaskWithRequest(request) { (data: NSData?, response: NSURLResponse?, error: NSError?) -> Void in
if (error != nil) {
self.error = NSError.xionError(.ConnectionError, underlying: error)
}
semaphore.signal()
}
task.resume()
semaphore.wait()
}
}

38
XIONControlPanel/Utilities/Semaphore.swift Normal file
View File

@@ -0,0 +1,38 @@
//
// Semaphore.swift
// XIONControlPanel
//
// Created by Charles Magahern on 1/18/16.
// Copyright © 2016 XION. All rights reserved.
//
import Foundation
class Semaphore {
private var _semaphore: dispatch_semaphore_t
init(value: Int)
{
_semaphore = dispatch_semaphore_create(value)
}
func wait()
{
self.wait(nil)
}
func wait(untilDate: NSDate?)
{
var time: dispatch_time_t = DISPATCH_TIME_FOREVER
if (untilDate != nil) {
time = UInt64(untilDate!.timeIntervalSinceNow) * NSEC_PER_SEC
}
dispatch_semaphore_wait(_semaphore, time)
}
func signal()
{
dispatch_semaphore_signal(_semaphore)
}
}