use computed variables

This commit is contained in:
Erik 2015-08-27 09:45:27 -04:00
parent 9510ef9d4f
commit 1f5402ce1c
2 changed files with 25 additions and 24 deletions

View File

@ -25,9 +25,11 @@
import Foundation
struct SocketPacket {
private var currentPlace = 0
private let placeholders: Int
let nsp: String
let id: Int
let placeholders: Int
let type: PacketType
enum PacketType: Int {
@ -42,7 +44,21 @@ struct SocketPacket {
}
}
var currentPlace = 0
var args: [AnyObject]? {
var arr = data
if data.count == 0 {
return nil
} else {
if type == PacketType.Event || type == PacketType.BinaryEvent {
arr.removeAtIndex(0)
return arr
} else {
return arr
}
}
}
var binary: [NSData]
var data: [AnyObject]
var description: String {
@ -57,6 +73,10 @@ struct SocketPacket {
return better
}
var event: String {
return data[0] as! String
}
var packetString: String {
return createPacketString()
}
@ -232,25 +252,6 @@ struct SocketPacket {
return data
}
}
func getEvent() -> String {
return data[0] as! String
}
func getArgs() -> [AnyObject]? {
var arr = data
if data.count == 0 {
return nil
} else {
if type == PacketType.Event || type == PacketType.BinaryEvent {
arr.removeAtIndex(0)
return arr
} else {
return arr
}
}
}
}
extension SocketPacket {

View File

@ -66,7 +66,7 @@ class SocketParser {
return
}
socket.handleEvent(p.getEvent(), data: p.getArgs(),
socket.handleEvent(p.event, data: p.args,
isInternalMessage: false, wantsAck: p.id)
}
@ -224,10 +224,10 @@ class SocketParser {
packet.fillInPlaceholders()
if packet.type != SocketPacket.PacketType.BinaryAck {
socket.handleEvent(packet.getEvent(), data: packet.getArgs(),
socket.handleEvent(packet.event, data: packet.args,
isInternalMessage: false, wantsAck: packet.id)
} else {
socket.handleAck(packet.id, data: packet.getArgs())
socket.handleAck(packet.id, data: packet.args)
}
}
}