Use swift 2 guard statement
This commit is contained in:
parent
44508a5193
commit
713ce46e3b
@ -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 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
weakSelf.isCreated = true
|
weakSelf.isCreated = true
|
||||||
weakSelf.createHTTPRequest()
|
weakSelf.createHTTPRequest()
|
||||||
weakSelf.isCreated = false
|
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 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
weakSelf.connected = true
|
weakSelf.connected = true
|
||||||
if let connectBlock = weakSelf.onConnect {
|
if let connectBlock = weakSelf.onConnect {
|
||||||
connectBlock()
|
connectBlock()
|
||||||
}
|
}
|
||||||
weakSelf.delegate?.websocketDidConnect(weakSelf)
|
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 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if let pongBlock = weakSelf.onPong {
|
if let pongBlock = weakSelf.onPong {
|
||||||
pongBlock()
|
pongBlock()
|
||||||
}
|
}
|
||||||
weakSelf.pongDelegate?.websocketDidReceivePong(weakSelf)
|
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 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if let textBlock = weakSelf.onText {
|
if let textBlock = weakSelf.onText {
|
||||||
textBlock(str! as String)
|
textBlock(str! as String)
|
||||||
}
|
}
|
||||||
weakSelf.delegate?.websocketDidReceiveMessage(weakSelf, text: 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 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if let dataBlock = weakSelf.onData {
|
if let dataBlock = weakSelf.onData {
|
||||||
dataBlock(data)
|
dataBlock(data)
|
||||||
}
|
}
|
||||||
weakSelf.delegate?.websocketDidReceiveData(weakSelf, data: 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 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
weakSelf.didDisconnect = true
|
weakSelf.didDisconnect = true
|
||||||
if let disconnect = weakSelf.onDisconnect {
|
if let disconnect = weakSelf.onDisconnect {
|
||||||
disconnect(error)
|
disconnect(error)
|
||||||
}
|
}
|
||||||
weakSelf.delegate?.websocketDidDisconnect(weakSelf, error: error)
|
weakSelf.delegate?.websocketDidDisconnect(weakSelf, error: error)
|
||||||
}
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user