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

Convert refreshArticles to async await.

Browse Source
This commit is contained in:
Brent Simmons 2024-04-21 12:12:19 -07:00
parent 756e2aff12
commit ba70b8d4b7
2 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Account/Sources/Account/CloudKit/CloudKitReceiveStatusOperation.swift
View File

@ -29,23 +29,24 @@ final class CloudKitReceiveStatusOperation: MainThreadOperation {
}
@MainActor func run() {
guard let articlesZone = articlesZone else {
self.operationDelegate?.operationDidComplete(self)
guard let articlesZone else {
operationDelegate?.operationDidComplete(self)
return
}
os_log(.debug, log: log, "Refreshing article statuses...")
articlesZone.refreshArticles() { result in
os_log(.debug, log: self.log, "Done refreshing article statuses.")
switch result {
case .success:
Task { @MainActor in
do {
try await articlesZone.refreshArticles()
self.operationDelegate?.operationDidComplete(self)
case .failure(let error):
} catch {
os_log(.error, log: self.log, "Receive status error: %@.", error.localizedDescription)
self.operationDelegate?.cancelOperation(self)
}
os_log(.debug, log: self.log, "Done refreshing article statuses.")
}
}
}

34
CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZone.swift
View File

@ -22,9 +22,9 @@ public protocol CloudKitFeedInfoDelegate {
@MainActor func feedURL(article: Article) -> String?
}
public final class CloudKitArticlesZone: CloudKitZone {
@MainActor public final class CloudKitArticlesZone: CloudKitZone {
public var zoneID: CKRecordZone.ID
public let zoneID: CKRecordZone.ID
public var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit")
@ -72,26 +72,17 @@ public final class CloudKitArticlesZone: CloudKitZone {
migrateChangeToken()
}
@MainActor public func refreshArticles(completion: @escaping ((Result<Void, Error>) -> Void)) {
fetchChangesInZone() { result in
switch result {
case .success:
completion(.success(()))
case .failure(let error):
if case CloudKitZoneError.userDeletedZone = error {
@MainActor public func refreshArticles() async throws {
Task { @MainActor in
do {
_ = try await self.createZoneRecord()
self.refreshArticles(completion: completion)
} catch {
completion(.failure(error))
}
}
do {
try await fetchChangesInZone()
} else {
completion(.failure(error))
}
} catch {
if case CloudKitZoneError.userDeletedZone = error {
_ = try await self.createZoneRecord()
try await refreshArticles()
} else {
throw error
}
}
}
@ -247,7 +238,7 @@ private extension CloudKitArticlesZone {
return record
}
func compressArticleRecords(_ records: [CKRecord]) -> [CKRecord] {
nonisolated func compressArticleRecords(_ records: [CKRecord]) -> [CKRecord] {
var result = [CKRecord]()
for record in records {
@ -277,5 +268,4 @@ private extension CloudKitArticlesZone {
return result
}
}