cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use swift 2 guard statement

Browse Source
This commit is contained in:
Hank Bao 2015-09-09 22:40:09 +08:00
parent 44508a5193
commit 713ce46e3b
1 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
SocketIOClientSwift/WebSocket.swift
View File

@ -135,16 +135,20 @@ public class WebSocket : NSObject, NSStreamDelegate {
} }
dispatch_async(queue, { [weak self] in dispatch_async(queue, { [weak self] in
if let weakSelf = self { guard let weakSelf = self else {
weakSelf.didDisconnect = false return
} }
weakSelf.didDisconnect = false
}) })
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), { [weak self] in dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), { [weak self] in
if let weakSelf = self { guard let weakSelf = self else {
weakSelf.isCreated = true return
weakSelf.createHTTPRequest()
weakSelf.isCreated = false
} }
weakSelf.isCreated = true
weakSelf.createHTTPRequest()
weakSelf.isCreated = false
}) })
} }
@ -375,13 +379,15 @@ public class WebSocket : NSObject, NSStreamDelegate {
if totalSize > 0 { if totalSize > 0 {
if validateResponse(buffer, bufferLen: totalSize) { if validateResponse(buffer, bufferLen: totalSize) {
dispatch_async(queue, { [weak self] in dispatch_async(queue, { [weak self] in
if let weakSelf = self { guard let weakSelf = self else {
weakSelf.connected = true return
if let connectBlock = weakSelf.onConnect {
connectBlock()
}
weakSelf.delegate?.websocketDidConnect(weakSelf)
} }
weakSelf.connected = true
if let connectBlock = weakSelf.onConnect {
connectBlock()
}
weakSelf.delegate?.websocketDidConnect(weakSelf)
}) })
totalSize += 1 //skip the last \n totalSize += 1 //skip the last \n
let restSize = bufferLen - totalSize let restSize = bufferLen - totalSize
@ -520,12 +526,14 @@ public class WebSocket : NSObject, NSStreamDelegate {
} }
if receivedOpcode == OpCode.Pong.rawValue { if receivedOpcode == OpCode.Pong.rawValue {
dispatch_async(queue, { [weak self] in dispatch_async(queue, { [weak self] in
if let weakSelf = self { guard let weakSelf = self else {
if let pongBlock = weakSelf.onPong { return
pongBlock()
}
weakSelf.pongDelegate?.websocketDidReceivePong(weakSelf)
} }
if let pongBlock = weakSelf.onPong {
pongBlock()
}
weakSelf.pongDelegate?.websocketDidReceivePong(weakSelf)
}) })
let step = Int(offset+numericCast(len)) let step = Int(offset+numericCast(len))
@ -615,22 +623,26 @@ public class WebSocket : NSObject, NSStreamDelegate {
return false return false
} }
dispatch_async(queue, { [weak self] in dispatch_async(queue, { [weak self] in
if let weakSelf = self { guard let weakSelf = self else {
if let textBlock = weakSelf.onText { return
textBlock(str! as String)
}
weakSelf.delegate?.websocketDidReceiveMessage(weakSelf, text: str! as String)
} }
if let textBlock = weakSelf.onText {
textBlock(str! as String)
}
weakSelf.delegate?.websocketDidReceiveMessage(weakSelf, text: str! as String)
}) })
} else if response.code == .BinaryFrame { } else if response.code == .BinaryFrame {
let data = response.buffer! //local copy so it is perverse for writing let data = response.buffer! //local copy so it is perverse for writing
dispatch_async(queue, { [weak self] in dispatch_async(queue, { [weak self] in
if let weakSelf = self { guard let weakSelf = self else {
if let dataBlock = weakSelf.onData { return
dataBlock(data)
}
weakSelf.delegate?.websocketDidReceiveData(weakSelf, data: data)
} }
if let dataBlock = weakSelf.onData {
dataBlock(data)
}
weakSelf.delegate?.websocketDidReceiveData(weakSelf, data: data)
}) })
} }
readStack.removeLast() readStack.removeLast()
@ -734,13 +746,15 @@ public class WebSocket : NSObject, NSStreamDelegate {
private func doDisconnect(error: NSError?) { private func doDisconnect(error: NSError?) {
if !self.didDisconnect { if !self.didDisconnect {
dispatch_async(queue, { [weak self] in dispatch_async(queue, { [weak self] in
if let weakSelf = self { guard let weakSelf = self else {
weakSelf.didDisconnect = true return
if let disconnect = weakSelf.onDisconnect {
disconnect(error)
}
weakSelf.delegate?.websocketDidDisconnect(weakSelf, error: error)
} }
weakSelf.didDisconnect = true
if let disconnect = weakSelf.onDisconnect {
disconnect(error)
}
weakSelf.delegate?.websocketDidDisconnect(weakSelf, error: error)
}) })
} }
} }