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

Conversion to Swift3

Browse Source
This commit is contained in:
Charles Magahern
2017-05-13 00:40:03 -07:00
parent 687b45c73a
commit 091af0844a
16 changed files with 353 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XIONControlPanel/Controllers/WemoServer.swift
+56 -54
View File
@@ -10,40 +10,46 @@ import Foundation
enum ConnectionStatus
{
case Disconnected
case Connecting
case Connected
case Error
case disconnected
case connecting
case connected
case error
}
enum ConnectionError : Error
{
case unknown
case serverUnavailable
}
class WemoServer
{
private(set) var baseURL: NSURL
private(set) var connected: Bool = false
fileprivate(set) var baseURL: URL
fileprivate(set) var connected: Bool = false
private var _urlSession: NSURLSession
private var _errorStream: StandardErrorOutputStream = StandardErrorOutputStream()
private var _operationQueue: NSOperationQueue = NSOperationQueue()
fileprivate var _urlSession: URLSession
fileprivate var _errorStream: StandardErrorOutputStream = StandardErrorOutputStream()
fileprivate var _operationQueue: OperationQueue = OperationQueue()
init(_ url: NSURL)
init(_ url: URL)
{
self.baseURL = url
let config = NSURLSessionConfiguration.defaultSessionConfiguration()
_urlSession = NSURLSession(configuration: config)
let config = URLSessionConfiguration.default
_urlSession = URLSession(configuration: config)
_operationQueue.maxConcurrentOperationCount = 1
}
func connect(completion: (NSError?) -> Void)
func connect(_ completion: @escaping (Error?) -> Void)
{
if (!self.connected) {
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!)
if let error = strongOp.error {
self._logError("Error connecting to server", error: error)
} else {
self.connected = true
}
@@ -56,68 +62,68 @@ class WemoServer
}
}
func disconnect(completion: (NSError?) -> Void)
func disconnect(_ completion: (Error?) -> Void)
{
self.connected = false
completion(nil)
}
func fetchDevices(completion: ([WemoDevice], NSError?) -> Void)
func fetchDevices(_ completion: @escaping ([WemoDevice], Error?) -> Void)
{
if (self.connected) {
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!)
if let error = strongOp.error {
self._logError("Error fetching devices", error: error)
}
completion(strongOp.devices, strongOp.error)
}
_operationQueue.addOperation(op)
} else {
let err = NSError.xionError(.ConnectionError)
let err = ConnectionError.serverUnavailable
completion([], err)
}
}
func toggleDevice(device: WemoDevice, state: WemoDevice.State, completion: (NSError?) -> Void)
func toggleDevice(_ device: WemoDevice, state: WemoDevice.State, completion: @escaping (Error?) -> Void)
{
if (self.connected) {
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!)
if let error = strongOp.error {
self._logError("Error toggling device", error: error)
}
completion(strongOp.error)
}
_operationQueue.addOperation(op)
} else {
let err = NSError.xionError(.ConnectionError)
let err = ConnectionError.serverUnavailable
completion(err)
}
}
// MARK: Internal
internal func _logError(description: String, error: NSError)
internal func _logError(_ description: String, error: Error)
{
print("ERROR: \(description) \(error)", toStream: &_errorStream)
print("ERROR: \(description) \(error)", to: &_errorStream)
}
}
internal class WemoOperation : NSOperation
internal class WemoOperation : Operation
{
var baseURL: NSURL
var session: NSURLSession
var baseURL: URL
var session: URLSession
internal(set) var error: NSError?
internal(set) var error: Error?
init(baseURL: NSURL, session: NSURLSession)
init(baseURL: URL, session: URLSession)
{
self.baseURL = baseURL
self.session = session
@@ -129,16 +135,14 @@ 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 url = self.baseURL.appendingPathComponent("api/environment")
var request = URLRequest(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!)
}
let task = self.session.dataTask(with: request, completionHandler: { (data: Data?, response: URLResponse?, error: Error?) -> Void in
self.error = error
semaphore.signal()
}
})
task.resume()
semaphore.wait()
}
@@ -151,24 +155,24 @@ internal class FetchDevicesOperation : WemoOperation
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
let url = self.baseURL.appendingPathComponent("api/environment")
let task = self.session.dataTask(with: url, completionHandler: { (data: Data?, response: URLResponse?, error: NSError?) -> Void in
if (data != nil) {
self.devices = self._parseDevices(data!)
} else {
self.error = NSError.xionError(.ConnectionError, underlying: error)
self.error = NSError.xionError(.connectionError, underlying: error)
}
semaphore.signal()
}
} as! (Data?, URLResponse?, Error?) -> Void)
task.resume()
semaphore.wait()
}
internal func _parseDevices(data: NSData) -> [WemoDevice]
internal func _parseDevices(_ data: Data) -> [WemoDevice]
{
var devices: [WemoDevice] = []
if let responseDict = (try? NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions()) as? NSDictionary) {
if let responseDict = (try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions()) as? NSDictionary) {
for responseObj in (responseDict?.allValues)! {
if let responseDict = responseObj as? NSDictionary {
let device = WemoDevice(responseDict)
@@ -186,7 +190,7 @@ internal class ToggleDeviceOperation : WemoOperation
var device: WemoDevice
var state: WemoDevice.State
init(baseURL: NSURL, session: NSURLSession, device: WemoDevice, state: WemoDevice.State)
init(baseURL: URL, session: URLSession, device: WemoDevice, state: WemoDevice.State)
{
self.device = device
self.state = state
@@ -196,15 +200,13 @@ internal class ToggleDeviceOperation : WemoOperation
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 stateArg = (self.state == .on ? "on" : "off")
let url = self.baseURL.appendingPathComponent("api/device/\(self.device.name)").URLByAppendingRequestParameters(["state" : stateArg])
var request = URLRequest(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)
}
let task = self.session.dataTask(with: request) { (data: Data?, response: URLResponse?, error: Error?) in
self.error = error
semaphore.signal()
}
task.resume()