work on a better output for socketpacket.description

This commit is contained in:
Erik 2015-04-13 11:35:56 -04:00
parent f67d3b23bb
commit 43ec517156
2 changed files with 29 additions and 3 deletions

View File

@ -29,10 +29,34 @@ final class SocketPacket: Printable {
var currentPlace = 0
var data:[AnyObject]?
var description:String {
let ret = "SocketPacket {type: \(self.type?.rawValue) data: \(self.data) " +
"id: \(self.id) placeholders: \(self.placeholders)}"
var better = "SocketPacket {type: ~~0; data: ~~1; " +
"id: ~~2; placeholders: ~~3;}"
return ret
if let type = self.type?.rawValue {
better = better["~~0"] ~= String(type)
} else {
better = better["~~0"] ~= "nil"
}
if let data = self.data {
better = better["~~1"] ~= "\(data)"
} else {
better = better["~~1"] ~= "nil"
}
if let id = self.id {
better = better["~~2"] ~= String(id)
} else {
better = better["~~2"] ~= "nil"
}
if let placeholders = self.placeholders {
better = better["~~3"] ~= String(placeholders)
} else {
better = better["~~3"] ~= "nil"
}
return better
}
var id:Int?
var justAck = false

View File

@ -194,6 +194,8 @@ class SocketParser {
return
}
// Don't call SocketPacket.description unless we need to
if socket.log {
SocketLogger.log("Parser: Decoded packet as: \(p)", client: socket)
}