From 43ec517156d4f955b21406bded5e260b253994a2 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 13 Apr 2015 11:35:56 -0400 Subject: [PATCH] work on a better output for socketpacket.description --- SocketIOClientSwift/SocketPacket.swift | 30 +++++++++++++++++++++++--- SocketIOClientSwift/SocketParser.swift | 2 ++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift index deebe65..700df23 100644 --- a/SocketIOClientSwift/SocketPacket.swift +++ b/SocketIOClientSwift/SocketPacket.swift @@ -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 diff --git a/SocketIOClientSwift/SocketParser.swift b/SocketIOClientSwift/SocketParser.swift index 0352258..905db6e 100644 --- a/SocketIOClientSwift/SocketParser.swift +++ b/SocketIOClientSwift/SocketParser.swift @@ -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) }