buzzert/Xaibatsu-Control-Panel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conversion to Swift3

Browse Source
This commit is contained in:
Charles Magahern
2017-05-13 00:40:03 -07:00
parent 687b45c73a
commit 091af0844a
16 changed files with 353 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XIONControlPanel/Utilities/NSURLAdditions.swift
+10 -10
View File
@@ -7,22 +7,22 @@
import Foundation
extension NSURL
extension URL
{
var requestParameters: [String : String]?
{
get
{
let urlComponents = self.absoluteString.componentsSeparatedByString("/")
let urlComponents = self.absoluteString.components(separatedBy: "/")
let paramsString = urlComponents[urlComponents.count - 1]
let parameterComponents = paramsString.componentsSeparatedByCharactersInSet(NSCharacterSet(charactersInString: "&?"))
let parameterComponents = paramsString.components(separatedBy: CharacterSet(charactersIn: "&?"))
var dict: Dictionary<String, String> = Dictionary()
for paramPair in parameterComponents {
let kvPair = paramPair.componentsSeparatedByString("=")
let kvPair = paramPair.components(separatedBy: "=")
if (kvPair.count == 2 && kvPair[0].characters.count > 0) {
let key = kvPair[0].stringByRemovingPercentEncoding!
let value = kvPair[1].stringByRemovingPercentEncoding!
let key = kvPair[0].removingPercentEncoding!
let value = kvPair[1].removingPercentEncoding!
dict[key] = value
}
}
@@ -31,7 +31,7 @@ extension NSURL
}
}
func URLByAppendingRequestParameters(params: [String : String]) -> NSURL?
func URLByAppendingRequestParameters(_ params: [String : String]) -> URL?
{
var paramsString = ""
@@ -43,14 +43,14 @@ extension NSURL
delim = "&"
}
let keyParam = key.stringByAddingPercentEncodingWithAllowedCharacters(NSCharacterSet.URLQueryAllowedCharacterSet())
let valueParam = value.stringByAddingPercentEncodingWithAllowedCharacters(NSCharacterSet.URLQueryAllowedCharacterSet())
let keyParam = key.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)
let valueParam = value.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)
paramsString += "\(delim)\(keyParam!)=\(valueParam!)"
}
var absoluteString = self.absoluteString
absoluteString += paramsString
return NSURL(string: absoluteString)
return URL(string: absoluteString)
}
}