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

Continue adopting async/await.

Browse Source
This commit is contained in:
Brent Simmons
2023-07-14 11:02:48 -07:00
parent 9bbecc99c7
commit b322b87b91
4 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -946,6 +946,14 @@ public enum FetchType {
mark(articleIDs: articleIDs, statusKey: .starred, flag: false, completion: completion)
}
// Delete the articles associated with the given set of articleIDs
func deleteArticleIDs(_ articleIDs: Set<String>) async throws {
guard !articleIDs.isEmpty else {
return
}
try await database.deleteArticleIDs(articleIDs)
}
// Delete the articles associated with the given set of articleIDs
func delete(articleIDs: Set<String>, completion: DatabaseCompletionBlock? = nil) {
guard !articleIDs.isEmpty else {

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

@@ -74,22 +74,22 @@ private extension CloudKitArticlesZoneDelegate {
return
}
database.deleteSelectedForProcessing(Array(deletableArticleIDs)) { databaseError in
database.deleteSelectedForProcessing(Array(deletableArticleIDs)) { databaseError in
Task { @MainActor in
if let databaseError = databaseError {
completion(databaseError)
} else {
self.account?.delete(articleIDs: deletableArticleIDs) { databaseError in
if let databaseError = databaseError {
completion(databaseError)
} else {
completion(nil)
}
}
return
}
do {
try await self.account?.deleteArticleIDs(deletableArticleIDs)
completion(nil)
} catch let error {
completion(error)
}
}
}
}
}
}
@MainActor func update(records: [CKRecord], pendingReadStatusArticleIDs: Set<String>, pendingStarredStatusArticleIDs: Set<String>, completion: @escaping (Result<Void, Error>) -> Void) {

5
ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift
View File

@@ -231,6 +231,11 @@ public typealias ArticleStatusesResultBlock = (ArticleStatusesResult) -> Void
articlesTable.update(feedIDsAndItems, defaultRead, completion)
}
/// Delete articles
public func deleteArticleIDs(_ articleIDs: Set<String>) async throws {
try await articlesTable.deleteArticleIDs(articleIDs)
}
/// Delete articles
public func delete(articleIDs: Set<String>, completion: DatabaseCompletionBlock?) {
articlesTable.delete(articleIDs: articleIDs, completion: completion)

17
ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift
View File

@@ -367,6 +367,23 @@ final class ArticlesTable: DatabaseTable {
}
}
public func deleteArticleIDs(_ articleIDs: Set<String>) async throws {
try await withCheckedThrowingContinuation { continuation in
Task { @MainActor in
queue.runInTransaction { databaseResult in
switch databaseResult {
case .success(let database):
self.removeArticles(articleIDs, database)
continuation.resume()
case .failure(let databaseError):
continuation.resume(throwing: databaseError)
}
}
}
}
}
public func delete(articleIDs: Set<String>, completion: DatabaseCompletionBlock?) {
self.queue.runInTransaction { (databaseResult) in