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

rename variables. tweaks

Browse Source
This commit is contained in:
Erik 2015-01-28 22:21:51 -05:00
parent 0b84ec6ac9
commit c4a1391b70
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
SwiftIO/SocketIOClient.swift
View File

@ -114,7 +114,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
var items = [AnyObject](count: args.count, repeatedValue: 1) var items = [AnyObject](count: args.count, repeatedValue: 1)
var numberOfPlaceholders = -1 var numberOfPlaceholders = -1
var hasBinary = false var hasBinary = false
var datas = [NSData]() var emitDatas = [NSData]()
for i in 0..<args.count { for i in 0..<args.count {
if let dict = args[i] as? NSDictionary { if let dict = args[i] as? NSDictionary {
@ -122,9 +122,9 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
let (newDict, hadBinary, binaryDatas) = SocketIOClient.parseNSDictionary(dict, let (newDict, hadBinary, binaryDatas) = SocketIOClient.parseNSDictionary(dict,
placeholders: numberOfPlaceholders) placeholders: numberOfPlaceholders)
if hadBinary { if hadBinary {
numberOfPlaceholders = binaryDatas!.count numberOfPlaceholders = binaryDatas.count
datas.extend(binaryDatas!) emitDatas.extend(binaryDatas)
hasBinary = true hasBinary = true
items[i] = newDict items[i] = newDict
} else { } else {
@ -137,10 +137,10 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
if hadData { if hadData {
hasBinary = true hasBinary = true
numberOfPlaceholders += datas.count numberOfPlaceholders += emitDatas.count
for data in newDatas! { for data in newDatas {
datas.append(data) emitDatas.append(data)
} }
items[i] = replace items[i] = replace
@ -154,7 +154,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
numberOfPlaceholders++ numberOfPlaceholders++
items[i] = ["_placeholder": true, "num": numberOfPlaceholders] items[i] = ["_placeholder": true, "num": numberOfPlaceholders]
datas.append(sendData) emitDatas.append(sendData)
} else { } else {
items[i] = args[i] items[i] = args[i]
} }
@ -162,10 +162,10 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
if hasBinary { if hasBinary {
str = SocketEvent.createMessageForEvent(event, withArgs: items, str = SocketEvent.createMessageForEvent(event, withArgs: items,
hasBinary: true, withDatas: datas.count) hasBinary: true, withDatas: emitDatas.count)
self.io?.send(str) self.io?.send(str)
for data in datas { for data in emitDatas {
self.io?.send(data) self.io?.send(data)
} }
} else { } else {
@ -213,11 +213,10 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
} }
// Parse an NSArray looking for binary data // Parse an NSArray looking for binary data
class func parseArray(arr:NSArray, var placeholders:Int) -> (NSArray, Bool, [NSData]?) { private class func parseArray(arr:NSArray, var placeholders:Int) -> (NSArray, Bool, [NSData]) {
var replacementArr = [AnyObject](count: arr.count, repeatedValue: 1) var replacementArr = [AnyObject](count: arr.count, repeatedValue: 1)
var hasBinary = false var hasBinary = false
var recurse = false var arrayDatas = [NSData]()
var datas = [NSData]()
if placeholders == -1 { if placeholders == -1 {
placeholders = 0 placeholders = 0
@ -228,7 +227,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
hasBinary = true hasBinary = true
let sendData = self.createBinaryDataForSend(arr[g] as NSData) let sendData = self.createBinaryDataForSend(arr[g] as NSData)
datas.append(sendData) arrayDatas.append(sendData)
replacementArr[g] = ["_placeholder": true, replacementArr[g] = ["_placeholder": true,
"num": placeholders++] "num": placeholders++]
} else if let dict = arr[g] as? NSDictionary { } else if let dict = arr[g] as? NSDictionary {
@ -236,22 +235,21 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
if hadBinary { if hadBinary {
hasBinary = true hasBinary = true
placeholders += dictArrs!.count placeholders += dictArrs.count
replacementArr[g] = nestDict replacementArr[g] = nestDict
datas.extend(dictArrs!) arrayDatas.extend(dictArrs)
} else { } else {
replacementArr[g] = dict replacementArr[g] = dict
} }
} else if let nestArr = arr[g] as? NSArray { } else if let nestArr = arr[g] as? NSArray {
// Recursive // Recursive
recurse = true
let (nested, hadBinary, nestDatas) = self.parseArray(nestArr, placeholders: placeholders) let (nested, hadBinary, nestDatas) = self.parseArray(nestArr, placeholders: placeholders)
if hadBinary { if hadBinary {
hasBinary = true hasBinary = true
placeholders += nestDatas!.count placeholders += nestDatas.count
replacementArr[g] = nested replacementArr[g] = nested
datas.extend(nestDatas!) arrayDatas.extend(nestDatas)
} else { } else {
replacementArr[g] = arr[g] replacementArr[g] = arr[g]
} }
@ -260,7 +258,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
} }
} }
return (replacementArr, hasBinary, datas) return (replacementArr, hasBinary, arrayDatas)
} }
// Parses data for events // Parses data for events
@ -283,7 +281,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
} }
// Parses a NSDictionary, looking for NSData objects // 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 returnDict = NSMutableDictionary()
var hasBinary = false var hasBinary = false
if placeholders == -1 { if placeholders == -1 {
@ -303,8 +301,8 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
if hadBinary { if hadBinary {
hasBinary = true hasBinary = true
returnDict[key as String] = replace returnDict[key as String] = replace
placeholders += arrDatas!.count placeholders += arrDatas.count
returnDatas.extend(arrDatas!) returnDatas.extend(arrDatas)
} else { } else {
returnDict[key as String] = arr returnDict[key as String] = arr
} }
@ -315,8 +313,8 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
if hadBinary { if hadBinary {
hasBinary = true hasBinary = true
returnDict[key as String] = nestDict returnDict[key as String] = nestDict
placeholders += nestDatas!.count placeholders += nestDatas.count
returnDatas.extend(nestDatas!) returnDatas.extend(nestDatas)
} else { } else {
returnDict[key as String] = dict returnDict[key as String] = dict
} }