renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert AccountDelegate.syncArticleStatus to async/await.

Browse Source
This commit is contained in:
Brent Simmons
2023-10-27 22:13:29 -07:00
parent 98c8135d04
commit 6cd8715eb0
10 changed files with 92 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Account/Sources/Account/Account.swift
View File

@@ -443,8 +443,8 @@ public enum FetchType {
}
}
public func syncArticleStatus(completion: ((Result<Void, Error>) -> Void)? = nil) {
delegate.syncArticleStatus(for: self, completion: completion)
public func syncArticleStatus() async throws {
try await delegate.syncArticleStatus(for: self)
}
public func importOPML(_ opmlFile: URL, completion: @escaping (Result<Void, Error>) -> Void) {
@@ -453,7 +453,7 @@ public enum FetchType {
return
}
delegate.importOPML(for: self, opmlFile: opmlFile) { result in
delegate.importOPML(for: self, opmlFile: opmlFile) { result in
Task { @MainActor in
switch result {
case .success:

2
Account/Sources/Account/AccountDelegate.swift
View File

@@ -26,7 +26,7 @@ import Secrets
func receiveRemoteNotification(for account: Account, userInfo: [AnyHashable : Any]) async
func refreshAll(for account: Account) async throws
func syncArticleStatus(for account: Account, completion: ((Result<Void, Error>) -> Void)?)
func syncArticleStatus(for account: Account) async throws
func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void))
func refreshArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void))

26
Account/Sources/Account/AccountDelegates/FeedbinAccountDelegate.swift
View File

@@ -108,20 +108,22 @@ public enum FeedbinAccountDelegateError: String, Error {
}
}
func syncArticleStatus(for account: Account, completion: ((Result<Void, Error>) -> Void)? = nil) {
sendArticleStatus(for: account) { result in
switch result {
case .success:
self.refreshArticleStatus(for: account) { result in
switch result {
case .success:
completion?(.success(()))
case .failure(let error):
completion?(.failure(error))
func syncArticleStatus(for account: Account) async throws {
try await withCheckedThrowingContinuation { continuation in
sendArticleStatus(for: account) { result in
switch result {
case .success:
self.refreshArticleStatus(for: account) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
case .failure(let error):
continuation.resume(throwing: error)
}
case .failure(let error):
completion?(.failure(error))
}
}
}

4
Account/Sources/Account/AccountDelegates/LocalAccountDelegate.swift
View File

@@ -72,8 +72,8 @@ final class LocalAccountDelegate: AccountDelegate, Logging {
}
func syncArticleStatus(for account: Account, completion: ((Result<Void, Error>) -> Void)? = nil) {
completion?(.success(()))
func syncArticleStatus(for account: Account) async throws {
return
}
func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void)) {

26
Account/Sources/Account/AccountDelegates/NewsBlurAccountDelegate.swift
View File

@@ -131,20 +131,22 @@ final class NewsBlurAccountDelegate: AccountDelegate, Logging {
}
}
func syncArticleStatus(for account: Account, completion: ((Result<Void, Error>) -> Void)? = nil) {
sendArticleStatus(for: account) { result in
switch result {
case .success:
self.refreshArticleStatus(for: account) { result in
switch result {
case .success:
completion?(.success(()))
case .failure(let error):
completion?(.failure(error))
func syncArticleStatus(for account: Account) async throws {
try await withCheckedThrowingContinuation { continuation in
sendArticleStatus(for: account) { result in
switch result {
case .success:
self.refreshArticleStatus(for: account) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
case .failure(let error):
continuation.resume(throwing: error)
}
case .failure(let error):
completion?(.failure(error))
}
}
}

27
Account/Sources/Account/AccountDelegates/ReaderAPIAccountDelegate.swift
View File

@@ -182,25 +182,26 @@ public enum ReaderAPIAccountDelegateError: LocalizedError {
}
}
func syncArticleStatus(for account: Account, completion: ((Result<Void, Error>) -> Void)? = nil) {
func syncArticleStatus(for account: Account) async throws {
guard variant != .inoreader else {
completion?(.success(()))
return
}
sendArticleStatus(for: account) { result in
switch result {
case .success:
self.refreshArticleStatus(for: account) { result in
switch result {
case .success:
completion?(.success(()))
case .failure(let error):
completion?(.failure(error))
try await withCheckedThrowingContinuation { continuation in
sendArticleStatus(for: account) { result in
switch result {
case .success:
self.refreshArticleStatus(for: account) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
case .failure(let error):
continuation.resume(throwing: error)
}
case .failure(let error):
completion?(.failure(error))
}
}
}

20
Account/Sources/Account/AccountManager.swift
View File

@@ -280,18 +280,16 @@ import RSDatabase
}
}
public func syncArticleStatusAll(completion: (() -> Void)? = nil) {
let group = DispatchGroup()
for account in activeAccounts {
group.enter()
account.syncArticleStatus() { _ in
group.leave()
}
}
public func syncArticleStatusAll() async {
group.notify(queue: DispatchQueue.global(qos: .background)) {
completion?()
await withTaskGroup(of: Void.self) { group in
for account in activeAccounts {
group.addTask {
try? await account.syncArticleStatus()
}
}
await group.waitForAll()
}
}

27
Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift
View File

@@ -101,20 +101,23 @@ final class CloudKitAccountDelegate: AccountDelegate, Logging {
}
}
func syncArticleStatus(for account: Account, completion: ((Result<Void, Error>) -> Void)? = nil) {
sendArticleStatus(for: account) { result in
switch result {
case .success:
self.refreshArticleStatus(for: account) { result in
switch result {
case .success:
completion?(.success(()))
case .failure(let error):
completion?(.failure(error))
func syncArticleStatus(for account: Account) async throws {
try await withCheckedThrowingContinuation { continuation in
sendArticleStatus(for: account) { result in
switch result {
case .success:
self.refreshArticleStatus(for: account) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
case .failure(let error):
continuation.resume(throwing: error)
}
case .failure(let error):
completion?(.failure(error))
}
}
}

31
Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift
View File

@@ -146,22 +146,25 @@ final class FeedlyAccountDelegate: AccountDelegate, Logging {
}
}
func syncArticleStatus(for account: Account, completion: ((Result<Void, Error>) -> Void)? = nil) {
sendArticleStatus(for: account) { result in
switch result {
case .success:
self.refreshArticleStatus(for: account) { result in
switch result {
case .success:
completion?(.success(()))
case .failure(let error):
self.logger.error("Failed to refresh article status for account \(String(describing: account.type), privacy: .public): \(error.localizedDescription, privacy: .public)")
completion?(.failure(error))
func syncArticleStatus(for account: Account) async throws {
try await withCheckedThrowingContinuation { continuation in
sendArticleStatus(for: account) { result in
switch result {
case .success:
self.refreshArticleStatus(for: account) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
self.logger.error("Failed to refresh article status for account \(String(describing: account.type), privacy: .public): \(error.localizedDescription, privacy: .public)")
continuation.resume(throwing: error)
}
}
case .failure(let error):
self.logger.error("Failed to send article status for account \(String(describing: account.type), privacy: .public): \(error.localizedDescription, privacy: .public)")
continuation.resume(throwing: error)
}
case .failure(let error):
self.logger.error("Failed to send article status for account \(String(describing: account.type), privacy: .public): \(error.localizedDescription, privacy: .public)")
completion?(.failure(error))
}
}
}

6
Shared/Timer/ArticleStatusSyncTimer.swift
View File

@@ -68,8 +68,8 @@ class ArticleStatusSyncTimer {
lastTimedRefresh = Date()
update()
AccountManager.shared.syncArticleStatusAll()
Task {
await AccountManager.shared.syncArticleStatusAll()
}
}
}