From 98063c8bf77394699310998b9f6db49f00ce38f9 Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 6 May 2016 12:48:33 -0400 Subject: [PATCH] refactoring --- Source/SocketPacket.swift | 2 +- Source/SocketParsable.swift | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Source/SocketPacket.swift b/Source/SocketPacket.swift index 2f039c1..a9c0538 100644 --- a/Source/SocketPacket.swift +++ b/Source/SocketPacket.swift @@ -61,7 +61,7 @@ struct SocketPacket { return createPacketString() } - init(type: SocketPacket.PacketType, data: [AnyObject] = [AnyObject](), id: Int = -1, + init(type: PacketType, data: [AnyObject] = [AnyObject](), id: Int = -1, nsp: String, placeholders: Int = 0, binary: [NSData] = [NSData]()) { self.data = data self.id = id diff --git a/Source/SocketParsable.swift b/Source/SocketParsable.swift index 80b5fa5..b6228e2 100644 --- a/Source/SocketParsable.swift +++ b/Source/SocketParsable.swift @@ -35,8 +35,6 @@ extension SocketParsable { private func handleConnect(p: SocketPacket) { if p.nsp == "/" && nsp != "/" { joinNamespace(nsp) - } else if p.nsp != "/" && nsp == "/" { - didConnect() } else { didConnect() } @@ -91,8 +89,7 @@ extension SocketParsable { } if !parser.hasNext { - return .Right(SocketPacket(type: type, id: -1, - nsp: namespace ?? "/", placeholders: placeholders)) + return .Right(SocketPacket(type: type, nsp: namespace, placeholders: placeholders)) } var idString = ""