FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix concurrency warnings.

Browse Source
This commit is contained in:
Brent Simmons 2024-04-19 22:17:02 -07:00
parent 24c8bdcc1a
commit ee466170c8
3 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift
View File

@ -31,8 +31,8 @@ import CloudKitExtras
self.articlesZone = articlesZone self.articlesZone = articlesZone
} }
func cloudKitDidModify(changed: [CKRecord], deleted: [CloudKitRecordKey]) async throws { func cloudKitDidModify(changed: [CKRecord], deleted: [CloudKitRecordKey], completion: @escaping (Result<Void, Error>) -> Void) {
for deletedRecordKey in deleted { for deletedRecordKey in deleted {
switch deletedRecordKey.recordType { switch deletedRecordKey.recordType {
case CloudKitAccountZone.CloudKitFeed.recordType: case CloudKitAccountZone.CloudKitFeed.recordType:
@ -43,7 +43,7 @@ import CloudKitExtras
assertionFailure("Unknown record type: \(deletedRecordKey.recordType)") assertionFailure("Unknown record type: \(deletedRecordKey.recordType)")
} }
} }
for changedRecord in changed { for changedRecord in changed {
switch changedRecord.recordType { switch changedRecord.recordType {
case CloudKitAccountZone.CloudKitFeed.recordType: case CloudKitAccountZone.CloudKitFeed.recordType:
@ -54,6 +54,8 @@ import CloudKitExtras
assertionFailure("Unknown record type: \(changedRecord.recordType)") assertionFailure("Unknown record type: \(changedRecord.recordType)")
} }
} }
completion(.success())
} }
func addOrUpdateFeed(_ record: CKRecord) { func addOrUpdateFeed(_ record: CKRecord) {

16
Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift
View File

@ -32,21 +32,7 @@ class CloudKitArticlesZoneDelegate: CloudKitZoneDelegate {
self.articlesZone = articlesZone self.articlesZone = articlesZone
} }
func cloudKitDidModify(changed: [CKRecord], deleted: [CloudKitRecordKey]) async throws { func cloudKitDidModify(changed: [CKRecord], deleted: [CloudKitRecordKey], completion: @escaping (Result<Void, Error>) -> Void) {
try await withCheckedThrowingContinuation { continuation in
self.cloudKitDidModify(changed: changed, deleted: deleted) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
private func cloudKitDidModify(changed: [CKRecord], deleted: [CloudKitRecordKey], completion: @escaping (Result<Void, Error>) -> Void) {
Task { @MainActor in Task { @MainActor in
do { do {

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

@ -29,7 +29,7 @@ public enum CloudKitZoneError: LocalizedError {
public protocol CloudKitZoneDelegate: AnyObject { public protocol CloudKitZoneDelegate: AnyObject {
func cloudKitDidModify(changed: [CKRecord], deleted: [CloudKitRecordKey]) async throws func cloudKitDidModify(changed: [CKRecord], deleted: [CloudKitRecordKey], completion: @escaping (Result<Void, Error>) -> Void)
} }
public typealias CloudKitRecordKey = (recordType: CKRecord.RecordType, recordID: CKRecord.ID) public typealias CloudKitRecordKey = (recordType: CKRecord.RecordType, recordID: CKRecord.ID)
@ -1046,12 +1046,7 @@ public protocol CloudKitZone: AnyObject {
switch result { switch result {
case .success: case .success:
do { self.delegate?.cloudKitDidModify(changed: changedRecords, deleted: deletedRecordKeys, completion: completion)
try await self.delegate?.cloudKitDidModify(changed: changedRecords, deleted: deletedRecordKeys)
completion(.success(()))
} catch {
completion(.failure(error))
}
case .failure(let error): case .failure(let error):