From c6997f32dd7e90b72ec6d2b5a9c2b9520bc17977 Mon Sep 17 00:00:00 2001 From: NachoSoto Date: Fri, 11 Sep 2015 05:52:17 +0000 Subject: [PATCH] Fixed indentation --- SocketIOClientSwift/SocketEngine.swift | 56 ++++++++++++------------ SocketIOClientSwift/SocketIOClient.swift | 30 ++++++------- SocketIOClientSwift/SwiftRegex.swift | 6 +-- SocketIOClientSwift/WebSocket.swift | 34 +++++++------- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift index 946b38e..cddaaf9 100644 --- a/SocketIOClientSwift/SocketEngine.swift +++ b/SocketIOClientSwift/SocketEngine.swift @@ -24,7 +24,7 @@ import Foundation -public final class SocketEngine: NSObject, WebSocketDelegate { +public final class SocketEngine: NSObject, WebSocketDelegate { private typealias Probe = (msg: String, type: PacketType, data: [NSData]?) private typealias ProbeWaitQueue = [Probe] @@ -350,11 +350,11 @@ public final class SocketEngine: NSObject, WebSocketDelegate { // We had packets waiting for send when we upgraded // Send them raw private func flushWaitingForPostToWebSocket() { - if let ws = ws { - for msg in postWait { - ws.writeString(msg) - } - } + if let ws = ws { + for msg in postWait { + ws.writeString(msg) + } + } postWait.removeAll(keepCapacity: true) } @@ -527,7 +527,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate { if msg.characters.count != 0 { // Be sure to capture the value of the msg - dispatch_async(handleQueue) { + dispatch_async(handleQueue) { self.parseEngineMessage(msg, fromPolling: true) } } @@ -552,7 +552,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate { let type = PacketType(str: (message["^(\\d)"].groups()?[1]) ?? "") ?? { self.checkIfMessageIsBase64Binary(message) return .Noop - }() + }() switch type { case PacketType.Message: @@ -610,11 +610,11 @@ public final class SocketEngine: NSObject, WebSocketDelegate { postWait.append(strMsg) - for data in datas ?? [] { - let (_, b64Data) = createBinaryDataForSend(data) + for data in datas ?? [] { + let (_, b64Data) = createBinaryDataForSend(data) - postWait.append(b64Data!) - } + postWait.append(b64Data!) + } if !waitingForPost { flushWaitingForPost() @@ -629,26 +629,26 @@ public final class SocketEngine: NSObject, WebSocketDelegate { ws?.writeString("\(type.rawValue)\(str)") - for data in datas ?? [] { - let (data, _) = createBinaryDataForSend(data) - if data != nil { - ws?.writeData(data!) - } - } + for data in datas ?? [] { + let (data, _) = createBinaryDataForSend(data) + if data != nil { + ws?.writeData(data!) + } + } } // Starts the ping timer private func startPingTimer() { - if let pingInterval = pingInterval { - pingTimer?.invalidate() - pingTimer = nil + if let pingInterval = pingInterval { + pingTimer?.invalidate() + pingTimer = nil - dispatch_async(dispatch_get_main_queue()) { - self.pingTimer = NSTimer.scheduledTimerWithTimeInterval(pingInterval, target: self, - selector: Selector("sendPing"), userInfo: nil, repeats: true) - } - } - } + dispatch_async(dispatch_get_main_queue()) { + self.pingTimer = NSTimer.scheduledTimerWithTimeInterval(pingInterval, target: self, + selector: Selector("sendPing"), userInfo: nil, repeats: true) + } + } + } func stopPolling() { session.invalidateAndCancel() @@ -668,7 +668,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate { Write a message, independent of transport. */ public func write(msg: String, withType type: PacketType, withData data: [NSData]?) { - dispatch_async(emitQueue) { + dispatch_async(emitQueue) { if self.connected { if self.websocket { Logger.log("Writing ws: %@ has data: %@", type: self.logType, args: msg, diff --git a/SocketIOClientSwift/SocketIOClient.swift b/SocketIOClientSwift/SocketIOClient.swift index 2118d1b..3b3fbf3 100644 --- a/SocketIOClientSwift/SocketIOClient.swift +++ b/SocketIOClientSwift/SocketIOClient.swift @@ -28,7 +28,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient { private let emitQueue = dispatch_queue_create("emitQueue", DISPATCH_QUEUE_SERIAL) private let handleQueue: dispatch_queue_t! - public let socketURL: String + public let socketURL: String public private(set) var engine: SocketEngine? public private(set) var secure = false @@ -117,10 +117,10 @@ public final class SocketIOClient: NSObject, SocketEngineClient { private func addEngine() -> SocketEngine { Logger.log("Adding engine", type: logType) - let newEngine = SocketEngine(client: self, opts: opts) + let newEngine = SocketEngine(client: self, opts: opts) engine = newEngine - return newEngine + return newEngine } private func clearReconnectTimer() { @@ -153,7 +153,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient { */ public func connect(timeoutAfter timeoutAfter:Int, withTimeoutHandler handler:(() -> Void)?) { - assert(timeoutAfter >= 0, "Invalid timeout: \(timeoutAfter)") + assert(timeoutAfter >= 0, "Invalid timeout: \(timeoutAfter)") guard status != .Connected else { return @@ -172,9 +172,9 @@ public final class SocketIOClient: NSObject, SocketEngineClient { } let time = dispatch_time(DISPATCH_TIME_NOW, Int64(timeoutAfter) * Int64(NSEC_PER_SEC)) - - dispatch_after(time, dispatch_get_main_queue()) { - if self.status != .Connected { + + dispatch_after(time, dispatch_get_main_queue()) { + if self.status != .Connected { self.status = .Closed self.engine?.close(fast: true) @@ -259,8 +259,8 @@ public final class SocketIOClient: NSObject, SocketEngineClient { guard status == .Connected else { return } - - dispatch_async(emitQueue) { + + dispatch_async(emitQueue) { self._emit([event] + items) } } @@ -300,7 +300,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient { // If the server wants to know that the client received data func emitAck(ack: Int, withItems items: [AnyObject]) { dispatch_async(emitQueue) { - if self.status == .Connected { + if self.status == .Connected { let packet = SocketPacket.packetFromEmit(items, id: ack ?? -1, nsp: self.nsp, ack: true) let str = packet.packetString @@ -448,13 +448,13 @@ public final class SocketIOClient: NSObject, SocketEngineClient { public func parseSocketMessage(msg: String) { dispatch_async(handleQueue) { - SocketParser.parseSocketMessage(msg, socket: self) + SocketParser.parseSocketMessage(msg, socket: self) } } public func parseBinaryData(data: NSData) { dispatch_async(handleQueue) { - SocketParser.parseBinaryData(data, socket: self) + SocketParser.parseBinaryData(data, socket: self) } } @@ -472,9 +472,9 @@ public final class SocketIOClient: NSObject, SocketEngineClient { status = .Reconnecting - dispatch_async(dispatch_get_main_queue()) { - self.reconnectTimer = NSTimer.scheduledTimerWithTimeInterval(Double(self.reconnectWait), - target: self, selector: "_tryReconnect", userInfo: nil, repeats: true) + dispatch_async(dispatch_get_main_queue()) { + self.reconnectTimer = NSTimer.scheduledTimerWithTimeInterval(Double(self.reconnectWait), + target: self, selector: "_tryReconnect", userInfo: nil, repeats: true) } } } diff --git a/SocketIOClientSwift/SwiftRegex.swift b/SocketIOClientSwift/SwiftRegex.swift index df384f4..fcd7652 100644 --- a/SocketIOClientSwift/SwiftRegex.swift +++ b/SocketIOClientSwift/SwiftRegex.swift @@ -37,9 +37,9 @@ internal class SwiftRegex: NSObject, BooleanType { super.init() } - private static func failure(message: String) { - fatalError("SwiftRegex: \(message)") - } + private static func failure(message: String) { + fatalError("SwiftRegex: \(message)") + } private final var targetRange: NSRange { return NSRange(location: 0,length: target.utf16.count) diff --git a/SocketIOClientSwift/WebSocket.swift b/SocketIOClientSwift/WebSocket.swift index f4d5bb2..016be75 100644 --- a/SocketIOClientSwift/WebSocket.swift +++ b/SocketIOClientSwift/WebSocket.swift @@ -378,7 +378,7 @@ public class WebSocket : NSObject, NSStreamDelegate { } if totalSize > 0 { if validateResponse(buffer, bufferLen: totalSize) { - dispatch_async(queue, { + dispatch_async(queue, { self.connected = true if let connectBlock = self.onConnect { connectBlock() @@ -522,7 +522,7 @@ public class WebSocket : NSObject, NSStreamDelegate { } if receivedOpcode == OpCode.Pong.rawValue { dispatch_async(queue, { - self.onPong?() + self.onPong?() self.pongDelegate?.websocketDidReceivePong(self) }) @@ -609,20 +609,20 @@ public class WebSocket : NSObject, NSStreamDelegate { } else if response.code == .TextFrame { let str: NSString? = NSString(data: response.buffer!, encoding: NSUTF8StringEncoding) - if let str = str as String? { - dispatch_async(queue, { - self.onText?(str) - self.delegate?.websocketDidReceiveMessage(self, text: str) - }) - } else { - writeError(CloseCode.Encoding.rawValue) - return false - } + if let str = str as String? { + dispatch_async(queue, { + self.onText?(str) + self.delegate?.websocketDidReceiveMessage(self, text: str) + }) + } else { + writeError(CloseCode.Encoding.rawValue) + return false + } } else if response.code == .BinaryFrame { let data = response.buffer! //local copy so it is perverse for writing - dispatch_async(queue) { - self.onData?(data) - self.delegate?.websocketDidReceiveData(self, data: data) + dispatch_async(queue) { + self.onData?(data) + self.delegate?.websocketDidReceiveData(self, data: data) } } @@ -726,11 +726,11 @@ public class WebSocket : NSObject, NSStreamDelegate { ///used to preform the disconnect delegate private func doDisconnect(error: NSError?) { if !self.didDisconnect { - dispatch_async(queue) { + dispatch_async(queue) { self.didDisconnect = true - self.onDisconnect?(error) - self.delegate?.websocketDidDisconnect(self, error: error) + self.onDisconnect?(error) + self.delegate?.websocketDidDisconnect(self, error: error) } } }