diff --git a/SwiftIO/SocketIOClient.swift b/SwiftIO/SocketIOClient.swift index 2cf96db..248c945 100644 --- a/SwiftIO/SocketIOClient.swift +++ b/SwiftIO/SocketIOClient.swift @@ -114,7 +114,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { var items = [AnyObject](count: args.count, repeatedValue: 1) var numberOfPlaceholders = -1 var hasBinary = false - var datas = [NSData]() + var emitDatas = [NSData]() for i in 0.. (NSArray, Bool, [NSData]?) { + private class func parseArray(arr:NSArray, var placeholders:Int) -> (NSArray, Bool, [NSData]) { var replacementArr = [AnyObject](count: arr.count, repeatedValue: 1) var hasBinary = false - var recurse = false - var datas = [NSData]() + var arrayDatas = [NSData]() if placeholders == -1 { placeholders = 0 @@ -228,7 +227,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { hasBinary = true let sendData = self.createBinaryDataForSend(arr[g] as NSData) - datas.append(sendData) + arrayDatas.append(sendData) replacementArr[g] = ["_placeholder": true, "num": placeholders++] } else if let dict = arr[g] as? NSDictionary { @@ -236,22 +235,21 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { if hadBinary { hasBinary = true - placeholders += dictArrs!.count + placeholders += dictArrs.count replacementArr[g] = nestDict - datas.extend(dictArrs!) + arrayDatas.extend(dictArrs) } else { replacementArr[g] = dict } } else if let nestArr = arr[g] as? NSArray { // Recursive - recurse = true let (nested, hadBinary, nestDatas) = self.parseArray(nestArr, placeholders: placeholders) if hadBinary { hasBinary = true - placeholders += nestDatas!.count + placeholders += nestDatas.count replacementArr[g] = nested - datas.extend(nestDatas!) + arrayDatas.extend(nestDatas) } else { replacementArr[g] = arr[g] } @@ -260,7 +258,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { } } - return (replacementArr, hasBinary, datas) + return (replacementArr, hasBinary, arrayDatas) } // Parses data for events @@ -283,7 +281,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { } // Parses a NSDictionary, looking for NSData objects - private class func parseNSDictionary(dict:NSDictionary, var placeholders:Int) -> (NSDictionary, Bool, [NSData]?) { + private class func parseNSDictionary(dict:NSDictionary, var placeholders:Int) -> (NSDictionary, Bool, [NSData]) { var returnDict = NSMutableDictionary() var hasBinary = false if placeholders == -1 { @@ -303,8 +301,8 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { if hadBinary { hasBinary = true returnDict[key as String] = replace - placeholders += arrDatas!.count - returnDatas.extend(arrDatas!) + placeholders += arrDatas.count + returnDatas.extend(arrDatas) } else { returnDict[key as String] = arr } @@ -315,8 +313,8 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { if hadBinary { hasBinary = true returnDict[key as String] = nestDict - placeholders += nestDatas!.count - returnDatas.extend(nestDatas!) + placeholders += nestDatas.count + returnDatas.extend(nestDatas) } else { returnDict[key as String] = dict }