From d887c9655083932a1135fe03969b7d86f0549767 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 13 Apr 2015 12:10:45 -0400 Subject: [PATCH] fix string becoming "nil" --- SocketIOClientSwift/SocketPacket.swift | 8 ++++---- SocketIOClientSwift/SocketParser.swift | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift index 61552ae..c89eaba 100644 --- a/SocketIOClientSwift/SocketPacket.swift +++ b/SocketIOClientSwift/SocketPacket.swift @@ -32,10 +32,10 @@ final class SocketPacket: Printable { var better = "SocketPacket {type: ~~0; data: ~~1; " + "id: ~~2; placeholders: ~~3;}" - better = self.type != nil ? better["~~0"] ~= String(self.type!.rawValue) : "nil" - better = self.data != nil ? better["~~1"] ~= "\(self.data!)" : "nil" - better = self.id != nil ? better["~~2"] ~= String(self.id!) : "nil" - better = self.placeholders != nil ? better["~~3"] ~= String(self.placeholders!) : "nil" + better = better["~~0"] ~= (self.type != nil ? String(self.type!.rawValue) : "nil") + better = better["~~1"] ~= (self.data != nil ? "\(self.data!)" : "nil") + better = better["~~2"] ~= (self.id != nil ? String(self.id!) : "nil") + better = better["~~3"] ~= (self.placeholders != nil ? String(self.placeholders!) : "nil") return better } diff --git a/SocketIOClientSwift/SocketParser.swift b/SocketIOClientSwift/SocketParser.swift index 905db6e..6dbe1b0 100644 --- a/SocketIOClientSwift/SocketParser.swift +++ b/SocketIOClientSwift/SocketParser.swift @@ -185,6 +185,8 @@ class SocketParser { return nsp == "" && socket.nsp != "/" } + SocketLogger.log("Parser: Parsing \(stringMessage)", client: socket) + let p:SocketPacket if let pack = parseString(stringMessage) { @@ -194,7 +196,6 @@ class SocketParser { return } - // Don't call SocketPacket.description unless we need to if socket.log { SocketLogger.log("Parser: Decoded packet as: \(p)", client: socket)