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

Convert sendArticleStatus to async/await.

Browse Source
This commit is contained in:
Brent Simmons 2024-03-26 17:49:21 -07:00
parent 39f639244b
commit 82679fb4b1
8 changed files with 81 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Account/Sources/Account/Account.swift
View File

@ -426,29 +426,9 @@ public enum FetchType {
try await delegate.refreshAll(for: self)
}
public func sendArticleStatus(completion: ((Result<Void, Error>) -> Void)? = nil) {
delegate.sendArticleStatus(for: self) { result in
switch result {
case .success:
completion?(.success(()))
case .failure(let error):
completion?(.failure(error))
}
}
}
public func sendArticleStatus() async throws {
try await withCheckedThrowingContinuation { continuation in
self.sendArticleStatus { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
try await delegate.sendArticleStatus(for: self)
}
public func syncArticleStatus() async throws {

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

@ -27,7 +27,7 @@ import Secrets
func refreshAll(for account: Account) async throws
func syncArticleStatus(for account: Account) async throws
func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void))
func sendArticleStatus(for account: Account) async throws
func refreshArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void))
func importOPML(for account:Account, opmlFile: URL, completion: @escaping (Result<Void, Error>) -> Void)

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

@ -124,7 +124,21 @@ enum CloudKitAccountDelegateError: LocalizedError {
}
}
func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void)) {
func sendArticleStatus(for account: Account) async throws {
try await withCheckedThrowingContinuation { continuation in
self.sendArticleStatus(for: account) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
private func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void)) {
sendArticleStatus(for: account, showProgress: false, completion: completion)
}

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

@ -134,7 +134,22 @@ final class FeedbinAccountDelegate: AccountDelegate {
}
}
func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void)) {
public func sendArticleStatus(for account: Account) async throws {
try await withCheckedThrowingContinuation { continuation in
self.sendArticleStatus(for: account) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
private func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void)) {
os_log(.debug, log: log, "Sending article statuses...")

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

@ -180,7 +180,22 @@ final class FeedlyAccountDelegate: AccountDelegate {
}
}
@MainActor func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void)) {
public func sendArticleStatus(for account: Account) async throws {
try await withCheckedThrowingContinuation { continuation in
self.sendArticleStatus(for: account) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
@MainActor private func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void)) {
// Ensure remote articles have the same status as they do locally.
let send = FeedlySendArticleStatusesOperation(database: database, service: caller, log: log)
send.completionBlock = { operation in

3
Account/Sources/Account/LocalAccount/LocalAccountDelegate.swift
View File

@ -62,8 +62,7 @@ final class LocalAccountDelegate: AccountDelegate {
func syncArticleStatus(for account: Account) async throws {
}
func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void)) {
completion(.success(()))
func sendArticleStatus(for account: Account) async throws {
}
func refreshArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void)) {

17
Account/Sources/Account/NewsBlur/NewsBlurAccountDelegate.swift
View File

@ -149,7 +149,22 @@ final class NewsBlurAccountDelegate: AccountDelegate {
}
}
func sendArticleStatus(for account: Account, completion: @escaping (Result<Void, Error>) -> ()) {
public func sendArticleStatus(for account: Account) async throws {
try await withCheckedThrowingContinuation { continuation in
self.sendArticleStatus(for: account) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
private func sendArticleStatus(for account: Account, completion: @escaping (Result<Void, Error>) -> ()) {
os_log(.debug, log: log, "Sending story statuses...")
Task { @MainActor in

16
Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
View File

@ -213,7 +213,21 @@ final class ReaderAPIAccountDelegate: AccountDelegate {
}
}
func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void)) {
public func sendArticleStatus(for account: Account) async throws {
try await withCheckedThrowingContinuation { continuation in
self.sendArticleStatus(for: account) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
private func sendArticleStatus(for account: Account, completion: @escaping ((Result<Void, Error>) -> Void)) {
os_log(.debug, log: log, "Sending article statuses...")