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

refactor socketpacket

Browse Source
This commit is contained in:
Erik 2015-12-25 11:24:03 -05:00
parent 1aacab2567
commit ca90938675
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/SocketPacket.swift
View File

@ -78,10 +78,10 @@ struct SocketPacket {
} }
binary.append(data) binary.append(data)
currentPlace++ currentPlace += 1
if placeholders == currentPlace { if placeholders == currentPlace {
currentPlace = 0 fillInPlaceholders()
return true return true
} else { } else {
return false return false
@ -192,15 +192,8 @@ struct SocketPacket {
return str return str
} }
mutating func fillInPlaceholders() { private mutating func fillInPlaceholders() {
for i in 0..<data.count { data = data.map({_fillInPlaceholders($0)})
if let str = data[i] as? String, num = str["~~(\\d)"].groups() {
// Fill in binary placeholder with data
data[i] = binary[Int(num[1])!]
} else if data[i] is NSDictionary || data[i] is NSArray {
data[i] = _fillInPlaceholders(data[i])
}
}
} }
private mutating func _fillInPlaceholders(data: AnyObject) -> AnyObject { private mutating func _fillInPlaceholders(data: AnyObject) -> AnyObject {

3
Source/SocketParser.swift
View File

@ -166,8 +166,7 @@ class SocketParser {
return return
} }
var packet = socket.waitingData.removeLast() let packet = socket.waitingData.removeLast()
packet.fillInPlaceholders()
if packet.type != .BinaryAck { if packet.type != .BinaryAck {
socket.handleEvent(packet.event, data: packet.args ?? [], socket.handleEvent(packet.event, data: packet.args ?? [],