From 076bbfc782c60dda1aba11fab2944d3db93f086e Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 8 Apr 2015 21:51:11 -0400 Subject: [PATCH] commit fix for binary --- SwiftIO/SocketEngine.swift | 8 ++++---- SwiftIO/SocketParser.swift | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/SwiftIO/SocketEngine.swift b/SwiftIO/SocketEngine.swift index eaca423..2fdd7f3 100644 --- a/SwiftIO/SocketEngine.swift +++ b/SwiftIO/SocketEngine.swift @@ -83,11 +83,11 @@ public class SocketEngine: NSObject, WebSocketDelegate { case UPGRADE = 5 case NOOP = 6 - init(str:String) { - if let value = str.toInt() { + init?(str:String?) { + if let value = str?.toInt() { self = PacketType(rawValue: value)! } else { - self = PacketType.NOOP + return nil } } } @@ -450,7 +450,7 @@ public class SocketEngine: NSObject, WebSocketDelegate { fixDoubleUTF8(&message) } - let type = PacketType(str: (message["^(\\d)"].groups()?[1])!) + let type = PacketType(str: (message["^(\\d)"].groups()?[1])) if type == PacketType.MESSAGE { // Remove message type diff --git a/SwiftIO/SocketParser.swift b/SwiftIO/SocketParser.swift index 8dbd04e..1b1d789 100644 --- a/SwiftIO/SocketParser.swift +++ b/SwiftIO/SocketParser.swift @@ -183,11 +183,7 @@ class SocketParser { } func checkNSP(nsp:String) -> Bool { - if nsp == "" && socket.nsp != "/" { - return true - } else { - return false - } + return nsp == "" && socket.nsp != "/" } let p = parseString(stringMessage) as SocketPacket!