FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2024-12-23 08:09:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert fetch(externalID…) to async await.

Browse Source
This commit is contained in:
Brent Simmons 2024-04-19 19:17:32 -07:00
parent cb205bfb06
commit 0963abdb8e
1 changed files with 23 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
CloudKitExtras/Sources/CloudKitExtras/CloudKitZone.swift
View File

@ -437,65 +437,36 @@ public protocol CloudKitZone: AnyObject {
/// Fetch a CKRecord by using its externalID
func fetch(externalID: String?) async throws -> CKRecord {
try await withCheckedThrowingContinuation { continuation in
self.fetch(externalID: externalID) { result in
switch result {
case .success(let record):
continuation.resume(returning: record)
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
/// Fetch a CKRecord by using its externalID
func fetch(externalID: String?, completion: @escaping (Result<CKRecord, Error>) -> Void) {
guard let externalID = externalID else {
completion(.failure(CloudKitZoneError.corruptAccount))
return
}
guard let externalID else { throw CloudKitZoneError.corruptAccount }
guard let database else { throw CloudKitZoneError.unknown }
let recordID = CKRecord.ID(recordName: externalID, zoneID: zoneID)
database?.fetch(withRecordID: recordID) { [weak self] record, error in
guard let self else {
completion(.failure(CloudKitZoneError.unknown))
return
}
Task { @MainActor in
do {
return try await database.record(for: recordID)
} catch {
switch CloudKitZoneResult.resolve(error) {
case .success:
if let record {
completion(.success(record))
} else {
completion(.failure(CloudKitZoneError.unknown))
}
case .zoneNotFound:
do {
_ = try await self.createZoneRecord()
self.fetch(externalID: externalID, completion: completion)
return try await fetch(externalID: externalID)
} catch {
completion(.failure(error))
throw error
}
case .retry(let timeToWait):
os_log(.error, log: self.log, "%@ zone fetch retry in %f seconds.", self.zoneID.zoneName, timeToWait)
self.retryIfPossible(after: timeToWait) {
self.fetch(externalID: externalID, completion: completion)
}
await delay(for: timeToWait)
return try await fetch(externalID: externalID)
case .userDeletedZone:
completion(.failure(CloudKitZoneError.userDeletedZone))
throw CloudKitZoneError.userDeletedZone
default:
completion(.failure(CloudKitError(error!)))
}
throw CloudKitError(error)
}
}
}