From 65be52418d95147b0c5c110b92385c1e2defa6d3 Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 19 Jun 2015 08:02:51 -0400 Subject: [PATCH] remove old stuff --- SocketIOClientSwift/SocketPacket.swift | 213 ------------------------- 1 file changed, 213 deletions(-) diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift index 9270d5a..5bb541f 100644 --- a/SocketIOClientSwift/SocketPacket.swift +++ b/SocketIOClientSwift/SocketPacket.swift @@ -302,216 +302,3 @@ struct SocketPacket { return (data, binary) } } - -//final class SocketPacket: CustomStringConvertible { -// var binary = ContiguousArray() -// var currentPlace = 0 -// var data:[AnyObject]? -// var description:String { -// var better = "SocketPacket {type: ~~0; data: ~~1; " + -// "id: ~~2; placeholders: ~~3;}" -// -// better = better["~~0"] ~= (type != nil ? String(type!.rawValue) : "nil") -// better = better["~~1"] ~= (data != nil ? "\(data!)" : "nil") -// better = better["~~2"] ~= (id != nil ? String(id!) : "nil") -// better = better["~~3"] ~= (placeholders != nil ? String(placeholders!) : "nil") -// -// return better -// } -// var id:Int? -// var justAck = false -// var nsp = "" -// var placeholders:Int? -// var type:PacketType? -// -// enum PacketType:Int { -// case CONNECT = 0 -// case DISCONNECT = 1 -// case EVENT = 2 -// case ACK = 3 -// case ERROR = 4 -// case BINARY_EVENT = 5 -// case BINARY_ACK = 6 -// -// init?(str:String) { -// if let int = Int(str), raw = PacketType(rawValue: int) { -// self = raw -// } else { -// return nil -// } -// } -// } -// -// init(type:PacketType?, data:[AnyObject]? = nil, nsp:String = "", -// placeholders:Int? = nil, id:Int? = nil) { -// self.type = type -// self.data = data -// self.nsp = nsp -// self.placeholders = placeholders -// self.id = id -// } -// -// func getEvent() -> String { -// return data?.removeAtIndex(0) as! String -// } -// -// func addData(data:NSData) -> Bool { -// if placeholders == currentPlace { -// return true -// } -// -// binary.append(data) -// currentPlace++ -// -// if placeholders == currentPlace { -// currentPlace = 0 -// return true -// } else { -// return false -// } -// } -// -// func createMessageForEvent(event:String) -> String { -// let message:String -// -// if binary.count == 0 { -// type = PacketType.EVENT -// -// if nsp == "/" { -// if id == nil { -// message = "2[\"\(event)\"" -// } else { -// message = "2\(id!)[\"\(event)\"" -// } -// } else { -// if id == nil { -// message = "2/\(nsp),[\"\(event)\"" -// } else { -// message = "2/\(nsp),\(id!)[\"\(event)\"" -// } -// } -// } else { -// type = PacketType.BINARY_EVENT -// -// if nsp == "/" { -// if id == nil { -// message = "5\(binary.count)-[\"\(event)\"" -// } else { -// message = "5\(binary.count)-\(id!)[\"\(event)\"" -// } -// } else { -// if id == nil { -// message = "5\(binary.count)-/\(nsp),[\"\(event)\"" -// } else { -// message = "5\(binary.count)-/\(nsp),\(id!)[\"\(event)\"" -// } -// } -// } -// -// return completeMessage(message) -// } -// -// func createAck() -> String { -// var msg:String -// -// if binary.count == 0 { -// type = PacketType.ACK -// -// if nsp == "/" { -// msg = "3\(id!)[" -// } else { -// msg = "3/\(nsp),\(id!)[" -// } -// } else { -// type = PacketType.BINARY_ACK -// -// if nsp == "/" { -// msg = "6\(binary.count)-\(id!)[" -// } else { -// msg = "6\(binary.count)-/\(nsp),\(id!)[" -// } -// } -// -// return completeMessage(msg, ack: true) -// } - -// private func completeMessage(var message:String, ack:Bool = false) -> String { -// if data == nil || data!.count == 0 { -// return message + "]" -// } else if !ack { -// message += "," -// } -// -// for arg in data! { -// if arg is NSDictionary || arg is [AnyObject] { -// let jsonSend: NSData? -// do { -// jsonSend = try NSJSONSerialization.dataWithJSONObject(arg, -// options: NSJSONWritingOptions(rawValue: 0)) -// } catch { -// jsonSend = nil -// } -// let jsonString = NSString(data: jsonSend!, encoding: NSUTF8StringEncoding) -// -// message += jsonString! as String + "," -// } else if var str = arg as? String { -// str = str["\n"] ~= "\\\\n" -// str = str["\r"] ~= "\\\\r" -// -// message += "\"\(str)\"," -// } else if arg is NSNull { -// message += "null," -// } else { -// message += "\(arg)," -// } -// } -// -// if message != "" { -// message.removeAtIndex(message.endIndex.predecessor()) -// } -// -// return message + "]" -// } -// -// func fillInPlaceholders() { -// let newArr = NSMutableArray(array: data!) -// -// for i in 0.. AnyObject { -// if let str = data as? String { -// if let num = str["~~(\\d)"].groups() { -// return binary[Int(num[1])!] -// } else { -// return str -// } -// } else if let dict = data as? NSDictionary { -// let newDict = NSMutableDictionary(dictionary: dict) -// -// for (key, value) in dict { -// newDict[key as! NSCopying] = _fillInPlaceholders(value) -// } -// -// return newDict -// } else if let arr = data as? NSArray { -// let newArr = NSMutableArray(array: arr) -// -// for i in 0..