Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit 5673524

Browse files
authored
A couple of minor api changes (#700)
2 parents b4ffba5 + 299bf23 commit 5673524

File tree

4 files changed

+3
-26
lines changed

4 files changed

+3
-26
lines changed

WordPressKit/HTTPClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extension URLSession {
4444
func perform<E: LocalizedError>(
4545
request builder: HTTPRequestBuilder,
4646
acceptableStatusCodes: [ClosedRange<Int>] = [200...299],
47-
fulfillingProgress parentProgress: Progress? = nil,
47+
fulfilling parentProgress: Progress? = nil,
4848
errorType: E.Type = E.self
4949
) async -> WordPressAPIResult<HTTPAPIResponse<Data>, E> {
5050
if let parentProgress {

WordPressKit/WordPressComRestApi.swift

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ open class WordPressComRestApi: NSObject {
6363
@objc public static let LocaleKeyDefault = "locale" // locale is specified with this for v1 endpoints
6464
@objc public static let LocaleKeyV2 = "_locale" // locale is prefixed with an underscore for v2
6565

66-
@objc public static let SessionTaskKey = "WordPressComRestAPI.sessionTask"
67-
6866
public typealias RequestEnqueuedBlock = (_ taskID: NSNumber) -> Void
6967
public typealias SuccessResponseBlock = (_ responseObject: AnyObject, _ httpResponse: HTTPURLResponse?) -> Void
7068
public typealias FailureReponseBlock = (_ error: NSError, _ httpResponse: HTTPURLResponse?) -> Void
@@ -225,7 +223,6 @@ open class WordPressComRestApi: NSObject {
225223
failure(processedError ?? (error as NSError), response.response)
226224
}
227225
}).downloadProgress(closure: progressUpdater)
228-
progress.sessionTask = dataRequest.task
229226
progress.cancellationHandler = { [weak dataRequest] in
230227
dataRequest?.cancel()
231228
}
@@ -606,25 +603,6 @@ private extension WordPressComRestApi {
606603
}
607604
}
608605

609-
// MARK: - Progress
610-
611-
@objc extension Progress {
612-
613-
var sessionTask: URLSessionTask? {
614-
get {
615-
return userInfo[.sessionTaskKey] as? URLSessionTask
616-
}
617-
618-
set {
619-
self.setUserInfoObject(newValue, forKey: .sessionTaskKey)
620-
}
621-
}
622-
}
623-
624-
extension ProgressUserInfoKey {
625-
public static let sessionTaskKey = ProgressUserInfoKey(rawValue: WordPressComRestApi.SessionTaskKey)
626-
}
627-
628606
// MARK: - POST encoding
629607

630608
private extension Dictionary {

WordPressKit/WordPressOrgRestApi.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ open class WordPressOrgRestApi: NSObject, WordPressRestApi {
7070
}
7171

7272
}).downloadProgress(closure: progressUpdater)
73-
progress.sessionTask = dataRequest.task
7473
progress.cancellationHandler = {
7574
dataRequest.cancel()
7675
}

WordPressKitTests/Utilities/URLSessionHelperTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class URLSessionHelperTests: XCTestCase {
116116
XCTAssertEqual(progress.completedUnitCount, 0)
117117
XCTAssertEqual(progress.fractionCompleted, 0)
118118

119-
let _ = await URLSession.shared.perform(request: .init(url: URL(string: "https://wordpress.org/hello")!), fulfillingProgress: progress, errorType: TestError.self)
119+
let _ = await URLSession.shared.perform(request: .init(url: URL(string: "https://wordpress.org/hello")!), fulfilling: progress, errorType: TestError.self)
120120
XCTAssertEqual(progress.completedUnitCount, 20)
121121
XCTAssertEqual(progress.fractionCompleted, 1)
122122
}
@@ -136,7 +136,7 @@ class URLSessionHelperTests: XCTestCase {
136136
}
137137

138138
// The result should be an cancellation result
139-
let result = await URLSession.shared.perform(request: .init(url: URL(string: "https://wordpress.org/hello")!), fulfillingProgress: progress, errorType: TestError.self)
139+
let result = await URLSession.shared.perform(request: .init(url: URL(string: "https://wordpress.org/hello")!), fulfilling: progress, errorType: TestError.self)
140140
if case let .failure(.connection(urlError)) = result, urlError.code == .cancelled {
141141
// Do nothing
142142
} else {

0 commit comments

Comments
 (0)