FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move CloudKitSendStatusOperation to CloudKitSync module.

This commit is contained in:
Brent Simmons 2024-04-21 12:44:15 -07:00
parent 5bd8ff4f6a
commit fb423ad495
3 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Account/Sources/Account/AccountDelegates/CloudKitAccountDelegate.swift
View File

@ -691,11 +691,11 @@ private extension CloudKitAccountDelegate {
}
private func sendArticleStatus(for account: Account, showProgress: Bool, completion: @escaping ((Result<Void, Error>) -> Void)) {
let op = CloudKitSendStatusOperation(account: account,
articlesZone: articlesZone,
let op = CloudKitSendStatusOperation(articlesZone: articlesZone,
refreshProgress: refreshProgress,
showProgress: showProgress,
database: database)
database: database,
delegate: self)
op.completionBlock = { mainThreadOperaion in
Task { @MainActor in
if mainThreadOperaion.isCanceled {
@ -762,3 +762,26 @@ extension CloudKitAccountDelegate: CloudKitFeedInfoDelegate {
article.feed?.url
}
}
extension CloudKitAccountDelegate: CloudKitSendStatusOperationDelegate {
@MainActor func cloudKitSendStatusOperation(_ : CloudKitSendStatusOperation, articlesFor articleIDs: Set<String>) async throws -> Set<Article> {
guard let account else { return Set<Article>() }
return try await account.articles(articleIDs: articleIDs)
}
@MainActor func cloudKitSendStatusOperation(_ : CloudKitSendStatusOperation, userDidDeleteZone: Error) {
// Delete feeds and folders
guard let account else { return }
account.removeFeeds(account.topLevelFeeds)
for folder in account.folders ?? Set<Folder>() {
account.removeFolder(folder: folder)
}
}
}

2
CloudKitSync/Sources/CloudKitSync/CloudKitReceiveStatusOperation.swift
View File

@ -10,7 +10,7 @@ import Foundation
import os.log
import Core
public final class CloudKitReceiveStatusOperation: MainThreadOperation {
@MainActor public final class CloudKitReceiveStatusOperation: MainThreadOperation {
private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit")

34
Account/Sources/Account/CloudKit/CloudKitSendStatusOperation.swift → CloudKitSync/Sources/CloudKitSync/CloudKitSendStatusOperation.swift
View File

@ -14,9 +14,14 @@ import SyncDatabase
import Database
import Core
import CloudKitExtras
import CloudKitSync
class CloudKitSendStatusOperation: MainThreadOperation {
public protocol CloudKitSendStatusOperationDelegate: AnyObject {
@MainActor func cloudKitSendStatusOperation(_ : CloudKitSendStatusOperation, articlesFor articleIDs: Set<String>) async throws -> Set<Article>
@MainActor func cloudKitSendStatusOperation(_ : CloudKitSendStatusOperation, userDidDeleteZone: Error)
}
@MainActor public final class CloudKitSendStatusOperation: MainThreadOperation {
private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit")
private let blockSize = 150
@ -28,21 +33,23 @@ class CloudKitSendStatusOperation: MainThreadOperation {
public var name: String? = "CloudKitSendStatusOperation"
public var completionBlock: MainThreadOperation.MainThreadOperationCompletionBlock?
private weak var account: Account?
private weak var articlesZone: CloudKitArticlesZone?
private weak var refreshProgress: DownloadProgress?
private var showProgress: Bool
private var database: SyncDatabase
init(account: Account, articlesZone: CloudKitArticlesZone, refreshProgress: DownloadProgress, showProgress: Bool, database: SyncDatabase) {
self.account = account
private weak var delegate: CloudKitSendStatusOperationDelegate?
public init(articlesZone: CloudKitArticlesZone, refreshProgress: DownloadProgress, showProgress: Bool, database: SyncDatabase, delegate: CloudKitSendStatusOperationDelegate) {
self.articlesZone = articlesZone
self.refreshProgress = refreshProgress
self.showProgress = showProgress
self.database = database
self.delegate = delegate
}
@MainActor func run() {
@MainActor public func run() {
os_log(.debug, log: log, "Sending article statuses...")
if showProgress {
@ -102,7 +109,8 @@ private extension CloudKitSendStatusOperation {
}
@MainActor func processStatuses(_ syncStatuses: [SyncStatus], completion: @escaping (Bool) -> Void) {
guard let account = account, let articlesZone = articlesZone else {
guard let delegate, let articlesZone else {
completion(true)
return
}
@ -112,7 +120,7 @@ private extension CloudKitSendStatusOperation {
Task { @MainActor in
do {
let articles = try await account.articles(articleIDs: Set(articleIDs))
let articles = try await delegate.cloudKitSendStatusOperation(self, articlesFor: Set(articleIDs))
let syncStatusesDict = Dictionary(grouping: syncStatuses, by: { $0.articleID })
let articlesDict = articles.reduce(into: [String: Article]()) { result, article in
@ -148,7 +156,7 @@ private extension CloudKitSendStatusOperation {
done(false)
case .failure(let error):
try? await self.database.resetSelectedForProcessing(syncStatuses.map({ $0.articleID }))
self.processAccountError(account, error)
self.processAccountError(error)
os_log(.error, log: self.log, "Send article status modify articles error: %@.", error.localizedDescription)
completion(true)
}
@ -162,12 +170,10 @@ private extension CloudKitSendStatusOperation {
}
}
@MainActor func processAccountError(_ account: Account, _ error: Error) {
@MainActor func processAccountError(_ error: Error) {
if case CloudKitZoneError.userDeletedZone = error {
account.removeFeeds(account.topLevelFeeds)
for folder in account.folders ?? Set<Folder>() {
account.removeFolder(folder: folder)
}
delegate?.cloudKitSendStatusOperation(self, userDidDeleteZone: error)
}
}
}