Skip to content

A
Alamofire

white49 / Alamofire
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
A
Alamofire

体验新版 GitCode，发现更多精彩内容 >>

提交 7b4bb4b1 编写于 作者: J Joan Disho 提交者： Christian Noon
浏览文件
操作

[PR #2691] Simplified and refactored queue and switch logic throughout (#2765)

上级 4b2c33cb
隐藏空白更改
内联 并排
Showing with 64 addition and 156 deletion
Source/AFError.swift
浏览文件 @ 7b4bb4b1
......@@ -294,22 +294,14 @@ extension AFError {
extension AFError {
/// The `URLConvertible` associated with the error.
public var urlConvertible: URLConvertible? {
switch self {
case .invalidURL(let url):
return url
default:
return nil
}
guard case .invalidURL(let url) = self else { return nil }
return url
}
/// The `URL` associated with the error.
public var url: URL? {
switch self {
case .multipartEncodingFailed(let reason):
return reason.url
default:
return nil
}
guard case .multipartEncodingFailed(let reason) = self else { return nil }
return reason.url
}
/// The underlying `Error` responsible for generating the failure associated with `.sessionInvalidated`,
......@@ -338,64 +330,40 @@ extension AFError {
/// The acceptable `Content-Type`s of a `.responseValidationFailed` error.
public var acceptableContentTypes: [String]? {
switch self {
case .responseValidationFailed(let reason):
return reason.acceptableContentTypes
default:
return nil
}
guard case .responseValidationFailed(let reason) = self else { return nil }
return reason.acceptableContentTypes
}
/// The response `Content-Type` of a `.responseValidationFailed` error.
public var responseContentType: String? {
switch self {
case .responseValidationFailed(let reason):
return reason.responseContentType
default:
return nil
}
guard case .responseValidationFailed(let reason) = self else { return nil }
return reason.responseContentType
}
/// The response code of a `.responseValidationFailed` error.
public var responseCode: Int? {
switch self {
case .responseValidationFailed(let reason):
return reason.responseCode
default:
return nil
}
guard case .responseValidationFailed(let reason) = self else { return nil }
return reason.responseCode
}
/// The `String.Encoding` associated with a failed `.stringResponse()` call.
public var failedStringEncoding: String.Encoding? {
switch self {
case .responseSerializationFailed(let reason):
return reason.failedStringEncoding
default:
return nil
}
guard case .responseSerializationFailed(let reason) = self else { return nil }
return reason.failedStringEncoding
}
}
extension AFError.ParameterEncodingFailureReason {
var underlyingError: Error? {
switch self {
case .jsonEncodingFailed(let error):
return error
default:
return nil
}
guard case .jsonEncodingFailed(let error) = self else { return nil }
return error
}
}
extension AFError.ParameterEncoderFailureReason {
var underlyingError: Error? {
switch self {
case .encoderFailed(let error):
return error
default:
return nil
}
guard case .encoderFailed(let error) = self else { return nil }
return error
}
}
......@@ -435,41 +403,25 @@ extension AFError.ResponseValidationFailureReason {
}
var responseContentType: String? {
switch self {
case .unacceptableContentType(_, let responseType):
return responseType
default:
return nil
}
guard case .unacceptableContentType(_, let responseType) = self else { return nil }
return responseType
}
var responseCode: Int? {
switch self {
case .unacceptableStatusCode(let code):
return code
default:
return nil
}
guard case .unacceptableStatusCode(let code) = self else { return nil }
return code
}
}
extension AFError.ResponseSerializationFailureReason {
var failedStringEncoding: String.Encoding? {
switch self {
case .stringSerializationFailed(let encoding):
return encoding
default:
return nil
}
guard case .stringSerializationFailed(let encoding) = self else { return nil }
return encoding
}
var underlyingError: Error? {
switch self {
case .jsonSerializationFailed(let error):
return error
default:
return nil
}
guard case .jsonSerializationFailed(let error) = self else { return nil }
return error
}
}
......
Source/ParameterEncoding.swift
浏览文件 @ 7b4bb4b1
......@@ -69,6 +69,14 @@ public struct URLEncoding: ParameterEncoding {
/// - httpBody: Sets encoded query string result as the HTTP body of the URL request.
public enum Destination {
case methodDependent, queryString, httpBody
func encodesParametersInURL(for method: HTTPMethod) -> Bool {
switch self {
case .methodDependent: return [.get, .head, .delete].contains(method)
case .queryString: return true
case .httpBody: return false
}
}
}
/// Configures how `Array` parameters are encoded.
......@@ -108,12 +116,9 @@ public struct URLEncoding: ParameterEncoding {
// MARK: Properties
/// Returns a default `URLEncoding` instance.
/// Returns a default `URLEncoding` instance with a `.methodDependent` destination.
public static var `default`: URLEncoding { return URLEncoding() }
/// Returns a `URLEncoding` instance with a `.methodDependent` destination.
public static var methodDependent: URLEncoding { return URLEncoding() }
/// Returns a `URLEncoding` instance with a `.queryString` destination.
public static var queryString: URLEncoding { return URLEncoding(destination: .queryString) }
......@@ -159,7 +164,7 @@ public struct URLEncoding: ParameterEncoding {
guard let parameters = parameters else { return urlRequest }
if let method = HTTPMethod(rawValue: urlRequest.httpMethod ?? "GET"), encodesParametersInURL(with: method) {
if let method = urlRequest.method, destination.encodesParametersInURL(for: method) {
guard let url = urlRequest.url else {
throw AFError.parameterEncodingFailed(reason: .missingURL)
}
......@@ -230,24 +235,6 @@ public struct URLEncoding: ParameterEncoding {
}
return components.map { "\($0)=\($1)" }.joined(separator: "&")
}
private func encodesParametersInURL(with method: HTTPMethod) -> Bool {
switch destination {
case .queryString:
return true
case .httpBody:
return false
default:
break
}
switch method {
case .get, .head, .delete:
return true
default:
return false
}
}
}
// MARK: -
......
Source/ResponseSerialization.swift
浏览文件 @ 7b4bb4b1
......@@ -104,14 +104,12 @@ extension DataRequest {
/// Adds a handler to be called once the request has finished.
///
/// - Parameters:
/// - queue: The queue on which the completion handler is dispatched. Defaults to `nil`, which means
/// the handler is called on `.main`.
/// - queue: The queue on which the completion handler is dispatched. Defaults to `.main`.
/// - completionHandler: The code to be executed once the request has finished.
/// - Returns: The request.
@discardableResult
public func response(queue: DispatchQueue? = nil, completionHandler: @escaping (DataResponse<Data?>) -> Void) -> Self {
public func response(queue: DispatchQueue = .main, completionHandler: @escaping (DataResponse<Data?>) -> Void) -> Self {
appendResponseSerializer {
let queue = queue ?? .main
let result = Result(value: self.data, error: self.error)
let response = DataResponse(request: self.request,
response: self.response,
......@@ -131,14 +129,13 @@ extension DataRequest {
/// Adds a handler to be called once the request has finished.
///
/// - Parameters:
/// - queue: The queue on which the completion handler is dispatched. Defaults to `nil`, which means
/// the handler is called on `.main`.
/// - queue: The queue on which the completion handler is dispatched. Defaults to `.main`.
/// - responseSerializer: The response serializer responsible for serializing the request, response, and data.
/// - completionHandler: The code to be executed once the request has finished.
/// - Returns: The request.
@discardableResult
public func response<Serializer: DataResponseSerializerProtocol>(
queue: DispatchQueue? = nil,
queue: DispatchQueue = .main,
responseSerializer: Serializer,
completionHandler: @escaping (DataResponse<Serializer.SerializedObject>) -> Void)
-> Self
......@@ -151,7 +148,6 @@ extension DataRequest {
error: self.error) }
let end = CFAbsoluteTimeGetCurrent()
let queue: DispatchQueue = queue ?? .main
let response = DataResponse(request: self.request,
response: self.response,
data: self.data,
......@@ -205,18 +201,16 @@ extension DownloadRequest {
/// Adds a handler to be called once the request has finished.
///
/// - Parameters:
/// - queue: The queue on which the completion handler is dispatched. Defaults to `nil`, which means
/// the handler is called on `.main`.
/// - queue: The queue on which the completion handler is dispatched. Defaults to `.main`.
/// - completionHandler: The code to be executed once the request has finished.
/// - Returns: The request.
@discardableResult
public func response(
queue: DispatchQueue? = nil,
queue: DispatchQueue = .main,
completionHandler: @escaping (DownloadResponse<URL?>) -> Void)
-> Self
{
appendResponseSerializer {
let queue = queue ?? .main
let result = Result(value: self.fileURL , error: self.error)
let response = DownloadResponse(request: self.request,
response: self.response,
......@@ -235,15 +229,14 @@ extension DownloadRequest {
/// Adds a handler to be called once the request has finished.
///
/// - Parameters:
/// - queue: The queue on which the completion handler is dispatched. Defaults to `nil`, which means
/// the handler is called on `.main`.
/// - queue: The queue on which the completion handler is dispatched. Defaults to `.main`.
/// - responseSerializer: The response serializer responsible for serializing the request, response, and data
/// contained in the destination url.
/// - completionHandler: The code to be executed once the request has finished.
/// - Returns: The request.
@discardableResult
public func response<T: DownloadResponseSerializerProtocol>(
queue: DispatchQueue? = nil,
queue: DispatchQueue = .main,
responseSerializer: T,
completionHandler: @escaping (DownloadResponse<T.SerializedObject>) -> Void)
-> Self
......@@ -256,7 +249,6 @@ extension DownloadRequest {
error: self.error) }
let end = CFAbsoluteTimeGetCurrent()
let queue: DispatchQueue = queue ?? .main
let response = DownloadResponse(request: self.request,
response: self.response,
fileURL: self.fileURL,
......@@ -312,13 +304,12 @@ extension DataRequest {
/// Adds a handler to be called once the request has finished.
///
/// - Parameters:
/// - queue: The queue on which the completion handler is dispatched. Defaults to `nil`, which means
/// the handler is called on `.main`.
/// - queue: The queue on which the completion handler is dispatched. Defaults to `.main`.
/// - completionHandler: The code to be executed once the request has finished.
/// - Returns: The request.
@discardableResult
public func responseData(
queue: DispatchQueue? = nil,
queue: DispatchQueue = .main,
completionHandler: @escaping (DataResponse<Data>) -> Void)
-> Self
{
......@@ -368,13 +359,12 @@ extension DownloadRequest {
/// Adds a handler to be called once the request has finished.
///
/// - Parameters:
/// - queue: The queue on which the completion handler is dispatched. Defaults to `nil`, which means
/// the handler is called on `.main`.
/// - queue: The queue on which the completion handler is dispatched. Defaults to `.main`.
/// - completionHandler: The code to be executed once the request has finished.
/// - Returns: The request.
@discardableResult
public func responseData(
queue: DispatchQueue? = nil,
queue: DispatchQueue = .main,
completionHandler: @escaping (DownloadResponse<Data>) -> Void)
-> Self
{
......@@ -448,14 +438,13 @@ extension DataRequest {
/// Adds a handler to be called once the request has finished.
///
/// - Parameters:
/// - queue: The queue on which the completion handler is dispatched. Defaults to `nil`, which means
/// the handler is called on `.main`.
/// - queue: The queue on which the completion handler is dispatched. Defaults to `.main`.
/// - encoding: The string encoding. Defaults to `nil`, in which case the encoding will be determined from
/// the server response, falling back to the default HTTP character set, `ISO-8859-1`.
/// - completionHandler: A closure to be executed once the request has finished.
/// - Returns: The request.
@discardableResult
public func responseString(queue: DispatchQueue? = nil,
public func responseString(queue: DispatchQueue = .main,
encoding: String.Encoding? = nil,
completionHandler: @escaping (DataResponse<String>) -> Void) -> Self {
return response(queue: queue,
......@@ -468,15 +457,14 @@ extension DownloadRequest {
/// Adds a handler to be called once the request has finished.
///
/// - Parameters:
/// - queue: The queue on which the completion handler is dispatched. Defaults to `nil`, which means
/// the handler is called on `.main`.
/// - queue: The queue on which the completion handler is dispatched. Defaults to `.main`.
/// - encoding: The string encoding. Defaults to `nil`, in which case the encoding will be determined from
/// the server response, falling back to the default HTTP character set, `ISO-8859-1`.
/// - completionHandler: A closure to be executed once the request has finished.
/// - Returns: The request.
@discardableResult
public func responseString(
queue: DispatchQueue? = nil,
queue: DispatchQueue = .main,
encoding: String.Encoding? = nil,
completionHandler: @escaping (DownloadResponse<String>) -> Void)
-> Self
......@@ -540,13 +528,12 @@ extension DataRequest {
/// Adds a handler to be called once the request has finished.
///
/// - Parameters:
/// - queue: The queue on which the completion handler is dispatched. Defaults to `nil`, which means
/// the handler is called on `.main`.
/// - queue: The queue on which the completion handler is dispatched. Defaults to `.main`.
/// - options: The JSON serialization reading options. Defaults to `.allowFragments`.
/// - completionHandler: A closure to be executed once the request has finished.
/// - Returns: The request.
@discardableResult
public func responseJSON(queue: DispatchQueue? = nil,
public func responseJSON(queue: DispatchQueue = .main,
options: JSONSerialization.ReadingOptions = .allowFragments,
completionHandler: @escaping (DataResponse<Any>) -> Void) -> Self {
return response(queue: queue,
......@@ -559,14 +546,13 @@ extension DownloadRequest {
/// Adds a handler to be called once the request has finished.
///
/// - Parameters:
/// - queue: The queue on which the completion handler is dispatched. Defaults to `nil`, which means
/// the handler is called on `.main`.
/// - queue: The queue on which the completion handler is dispatched. Defaults to `.main`.
/// - options: The JSON serialization reading options. Defaults to `.allowFragments`.
/// - completionHandler: A closure to be executed once the request has finished.
/// - Returns: The request.
@discardableResult
public func responseJSON(
queue: DispatchQueue? = nil,
queue: DispatchQueue = .main,
options: JSONSerialization.ReadingOptions = .allowFragments,
completionHandler: @escaping (DownloadResponse<Any>) -> Void)
-> Self
......@@ -667,14 +653,13 @@ extension DataRequest {
/// Adds a handler to be called once the request has finished.
///
/// - Parameters:
/// - queue: The queue on which the completion handler is dispatched. Defaults to `nil`, which means
/// the handler is called on `.main`.
/// - queue: The queue on which the completion handler is dispatched. Defaults to `.main`.
/// - decoder: The `DataDecoder` to use to decode the response. Defaults to a `JSONDecoder` with default
/// settings.
/// - completionHandler: A closure to be executed once the request has finished.
/// - Returns: The request.
@discardableResult
public func responseDecodable<T: Decodable>(queue: DispatchQueue? = nil,
public func responseDecodable<T: Decodable>(queue: DispatchQueue = .main,
decoder: DataDecoder = JSONDecoder(),
completionHandler: @escaping (DataResponse<T>) -> Void) -> Self {
return response(queue: queue,
......
Source/Result.swift
浏览文件 @ 7b4bb4b1
......@@ -50,12 +50,8 @@ public enum Result<Value> {
/// Returns `true` if the result is a success, `false` otherwise.
public var isSuccess: Bool {
switch self {
case .success:
return true
case .failure:
return false
}
guard case .success = self else { return false }
return true
}
/// Returns `true` if the result is a failure, `false` otherwise.
......@@ -65,22 +61,14 @@ public enum Result<Value> {
/// Returns the associated value if the result is a success, `nil` otherwise.
public var value: Value? {
switch self {
case .success(let value):
return value
case .failure:
return nil
}
guard case .success(let value) = self else { return nil }
return value
}
/// Returns the associated error value if the result is a failure, `nil` otherwise.
public var error: Error? {
switch self {
case .success:
return nil
case .failure(let error):
return error
}
guard case .failure(let error) = self else { return nil }
return error
}
}
......@@ -225,12 +213,8 @@ extension Result {
/// - Returns: A `Result` instance containing the result of the transform. If this instance is a success, returns
/// the same instance.
public func mapError<T: Error>(_ transform: (Error) -> T) -> Result {
switch self {
case .failure(let error):
return .failure(transform(error))
case .success:
return self
}
guard case .failure(let error) = self else { return self }
return .failure(transform(error))
}
/// Evaluates the specified closure when the `Result` is a failure, passing the unwrapped error as a parameter.
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或