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

Fix a few concurrency warnings.

Browse Source
This commit is contained in:
Brent Simmons 2024-05-03 09:56:51 -07:00
parent 51b78ddd70
commit 325f8061de
3 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Account/Sources/Account/Account.swift
View File

@ -995,7 +995,8 @@ public enum FetchType {
// MARK: - AccountMetadataDelegate // MARK: - AccountMetadataDelegate
extension Account: AccountMetadataDelegate { extension Account: AccountMetadataDelegate {
func valueDidChange(_ accountMetadata: AccountMetadata, key: AccountMetadata.CodingKeys) {
nonisolated func valueDidChange(_ accountMetadata: AccountMetadata, key: AccountMetadata.CodingKeys) {
Task { @MainActor in Task { @MainActor in
metadataFile.markAsDirty() metadataFile.markAsDirty()
} }
@ -1006,11 +1007,13 @@ extension Account: AccountMetadataDelegate {
extension Account: FeedMetadataDelegate { extension Account: FeedMetadataDelegate {
func valueDidChange(_ feedMetadata: FeedMetadata, key: FeedMetadata.CodingKeys) { nonisolated func valueDidChange(_ feedMetadata: FeedMetadata, key: FeedMetadata.CodingKeys) {
let feedID = feedMetadata.feedID
Task { @MainActor in Task { @MainActor in
feedMetadataFile.markAsDirty() feedMetadataFile.markAsDirty()
guard let feed = existingFeed(withFeedID: feedMetadata.feedID) else { guard let feed = existingFeed(withFeedID: feedID) else {
return return
} }
feed.postFeedSettingDidChangeNotification(key) feed.postFeedSettingDidChangeNotification(key)

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

@ -57,7 +57,7 @@ final class CloudKitArticlesZoneDelegate: CloudKitZoneDelegate {
private extension CloudKitArticlesZoneDelegate { private extension CloudKitArticlesZoneDelegate {
func delete(recordKeys: [CloudKitRecordKey], pendingStarredStatusArticleIDs: Set<String>) async { @MainActor func delete(recordKeys: [CloudKitRecordKey], pendingStarredStatusArticleIDs: Set<String>) async {
let receivedRecordIDs = recordKeys.filter({ $0.recordType == CloudKitArticlesZone.CloudKitArticleStatus.recordType }).map({ $0.recordID }) let receivedRecordIDs = recordKeys.filter({ $0.recordType == CloudKitArticlesZone.CloudKitArticleStatus.recordType }).map({ $0.recordID })
let receivedArticleIDs = Set(receivedRecordIDs.map({ stripPrefix($0.externalID) })) let receivedArticleIDs = Set(receivedRecordIDs.map({ stripPrefix($0.externalID) }))

41
Account/Sources/Account/Feedbin/FeedbinAccountDelegate.swift
View File

@ -445,14 +445,40 @@ private extension FeedbinAccountDelegate {
} }
} }
private func delay(seconds: Double) async {
await withCheckedContinuation { continuation in
self.performBlockAfter(seconds: seconds) {
continuation.resume()
}
}
}
nonisolated private func performBlockAfter(seconds: Double, block: @escaping @Sendable @MainActor () -> ()) {
let delayTime = DispatchTime.now() + seconds
DispatchQueue.main.asyncAfter(deadline: delayTime) {
Task { @MainActor in
block()
}
}
}
func checkImportResult(opmlImportResultID: Int, completion: @escaping @Sendable (Result<Void, Error>) -> Void) { func checkImportResult(opmlImportResultID: Int, completion: @escaping @Sendable (Result<Void, Error>) -> Void) {
DispatchQueue.main.async {
Timer.scheduledTimer(withTimeInterval: 15, repeats: true) { timer in
Task { @MainActor in Task { @MainActor in
var retry = 0
let maxRetries = 6 // a guess at a good number
@MainActor func checkResult() async {
if retry >= maxRetries {
return
}
retry = retry + 1
await delay(seconds: 15)
os_log(.debug, log: self.log, "Checking status of OPML import...") os_log(.debug, log: self.log, "Checking status of OPML import...")
do { do {
@ -460,17 +486,18 @@ private extension FeedbinAccountDelegate {
if let importResult, importResult.complete { if let importResult, importResult.complete {
os_log(.debug, log: self.log, "Checking status of OPML import successfully completed.") os_log(.debug, log: self.log, "Checking status of OPML import successfully completed.")
timer.invalidate()
completion(.success(())) completion(.success(()))
} else {
await checkResult()
} }
} catch { } catch {
os_log(.debug, log: self.log, "Import OPML check failed.") os_log(.debug, log: self.log, "Import OPML check failed.")
timer.invalidate()
completion(.failure(error)) completion(.failure(error))
} }
} }
}
await checkResult()
} }
} }