Skip to content
Snippets Groups Projects
Commit 8149aac7 authored by Tobias Ullerich's avatar Tobias Ullerich
Browse files

Add HostCallback

parent 777aa406
No related branches found
No related tags found
No related merge requests found
...@@ -47,8 +47,10 @@ public class DataManager: NSObject, URLSessionDelegate ...@@ -47,8 +47,10 @@ public class DataManager: NSObject, URLSessionDelegate
} }
} }
public typealias HostCallback = () -> Host
private let timeout: TimeInterval private let timeout: TimeInterval
public private(set) var host: Host public private(set) var hostCallback: HostCallback
private lazy var urlSession: URLSession = { private lazy var urlSession: URLSession = {
URLSession(configuration: .default, delegate: self, delegateQueue: OperationQueue.main) URLSession(configuration: .default, delegate: self, delegateQueue: OperationQueue.main)
...@@ -59,8 +61,12 @@ public class DataManager: NSObject, URLSessionDelegate ...@@ -59,8 +61,12 @@ public class DataManager: NSObject, URLSessionDelegate
public var delegate: DataManagerDelegate? public var delegate: DataManagerDelegate?
public init(host: Host, responseOkFilter: HttpSuccessFilter, responseFilters: [Int: HttpResponseFilter] = [:], timeout: TimeInterval = 10.0) { public convenience init(host: Host, responseOkFilter: HttpSuccessFilter, responseFilters: [Int: HttpResponseFilter] = [:], timeout: TimeInterval = 10.0) {
self.host = host self.init(hostCallback: { host }, responseOkFilter: responseOkFilter, responseFilters: responseFilters, timeout: timeout)
}
public required init(hostCallback: @escaping HostCallback, responseOkFilter: HttpSuccessFilter, responseFilters: [Int: HttpResponseFilter] = [:], timeout: TimeInterval = 10.0) {
self.hostCallback = hostCallback
self.responseOkFilter = responseOkFilter self.responseOkFilter = responseOkFilter
self.responseFilters = responseFilters self.responseFilters = responseFilters
self.timeout = timeout self.timeout = timeout
...@@ -68,6 +74,7 @@ public class DataManager: NSObject, URLSessionDelegate ...@@ -68,6 +74,7 @@ public class DataManager: NSObject, URLSessionDelegate
} }
public func url(username: String = "", password: String = "", path: String) -> String { public func url(username: String = "", password: String = "", path: String) -> String {
let host = hostCallback()
var url: String = host.protocol var url: String = host.protocol
if !username.isEmpty || !password.isEmpty { if !username.isEmpty || !password.isEmpty {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment