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

Convert removeFolder async await.

Browse Source
This commit is contained in:
Brent Simmons 2024-03-27 20:21:44 -07:00
parent 6ad90583a4
commit 0ce67a3f3f
14 changed files with 139 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Account/Sources/Account/Account.swift
View File

@ -646,8 +646,9 @@ public enum FetchType {
try await delegate.createFolder(for: self, name: name)
}
public func removeFolder(_ folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
delegate.removeFolder(for: self, with: folder, completion: completion)
public func removeFolder(_ folder: Folder) async throws {
try await delegate.removeFolder(for: self, with: folder)
}
public func renameFolder(_ folder: Folder, to name: String) async throws {
@ -1020,7 +1021,7 @@ public enum FetchType {
}
}
func removeFolder(_ folder: Folder) {
func removeFolder(folder: Folder) {
folders?.remove(folder)
structureDidChange()
postChildrenDidChangeNotification()

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

@ -34,7 +34,7 @@ import Secrets
func createFolder(for account: Account, name: String) async throws -> Folder
func renameFolder(for account: Account, with folder: Folder, to name: String) async throws
func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void)
func removeFolder(for account: Account, with folder: Folder) async throws
func createFeed(for account: Account, url: String, name: String?, container: Container, validateFeed: Bool, completion: @escaping (Result<Feed, Error>) -> Void)
func renameFeed(for account: Account, with feed: Feed, to name: String) async throws

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

@ -415,7 +415,22 @@ enum CloudKitAccountDelegateError: LocalizedError {
}
}
func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
func removeFolder(for account: Account, with folder: Folder) async throws {
try await withCheckedThrowingContinuation { continuation in
self.removeFolder(for: account, with: folder) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
private func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
refreshProgress.addToNumberOfTasksAndRemaining(2)
accountZone.findFeedExternalIDs(for: folder) { result in
@ -450,7 +465,7 @@ enum CloudKitAccountDelegateError: LocalizedError {
self.refreshProgress.completeTask()
switch result {
case .success:
account.removeFolder(folder)
account.removeFolder(folder: folder)
completion(.success(()))
case .failure(let error):
completion(.failure(error))
@ -858,7 +873,7 @@ private extension CloudKitAccountDelegate {
if case CloudKitZoneError.userDeletedZone = error {
account.removeFeeds(account.topLevelFeeds)
for folder in account.folders ?? Set<Folder>() {
account.removeFolder(folder)
account.removeFolder(folder: folder)
}
}
}

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

@ -132,7 +132,7 @@ import CloudKitExtras
func removeContainer(_ externalID: String) {
if let folder = account?.existingFolder(withExternalID: externalID) {
account?.removeFolder(folder)
account?.removeFolder(folder: folder)
}
}
}

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

@ -174,7 +174,7 @@ private extension CloudKitSendStatusOperation {
if case CloudKitZoneError.userDeletedZone = error {
account.removeFeeds(account.topLevelFeeds)
for folder in account.folders ?? Set<Folder>() {
account.removeFolder(folder)
account.removeFolder(folder: folder)
}
}
}

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

@ -389,11 +389,26 @@ final class FeedbinAccountDelegate: AccountDelegate {
}
func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
func removeFolder(for account: Account, with folder: Folder) async throws {
try await withCheckedThrowingContinuation { continuation in
self.removeFolder(for: account, with: folder) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
private func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
// Feedbin uses tags and if at least one feed isn't tagged, then the folder doesn't exist on their system
guard folder.hasAtLeastOneFeed() else {
account.removeFolder(folder)
account.removeFolder(folder: folder)
completion(.success(()))
return
}
@ -446,7 +461,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
}
group.notify(queue: DispatchQueue.main) {
account.removeFolder(folder)
account.removeFolder(folder: folder)
completion(.success(()))
}
@ -930,7 +945,7 @@ private extension FeedbinAccountDelegate {
account.addFeed(feed)
clearFolderRelationship(for: feed, withFolderName: folder.name ?? "")
}
account.removeFolder(folder)
account.removeFolder(folder: folder)
}
}
}

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

@ -381,7 +381,22 @@ final class FeedlyAccountDelegate: AccountDelegate {
folder.name = name
}
func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
func removeFolder(for account: Account, with folder: Folder) async throws {
try await withCheckedThrowingContinuation { continuation in
self.removeFolder(for: account, with: folder) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
private func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
guard let id = folder.externalID else {
return DispatchQueue.main.async {
completion(.failure(FeedlyAccountDelegateError.unableToRemoveFolder(folder.nameForDisplay)))
@ -396,7 +411,7 @@ final class FeedlyAccountDelegate: AccountDelegate {
switch result {
case .success:
account.removeFolder(folder)
account.removeFolder(folder: folder)
completion(.success(()))
case .failure(let error):
completion(.failure(error))

2
Account/Sources/Account/Feedly/Operations/FeedlyMirrorCollectionsAsFoldersOperation.swift
View File

@ -54,7 +54,7 @@ final class FeedlyMirrorCollectionsAsFoldersOperation: FeedlyOperation, FeedlyFe
if !foldersWithoutCollections.isEmpty {
for unmatched in foldersWithoutCollections {
account.removeFolder(unmatched)
account.removeFolder(folder: unmatched)
}
os_log(.debug, log: log, "Removed %i folders: %@", foldersWithoutCollections.count, foldersWithoutCollections.map { $0.externalID ?? $0.nameForDisplay })

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

@ -130,12 +130,13 @@ final class LocalAccountDelegate: AccountDelegate {
folder.name = name
}
func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
account.removeFolder(folder)
completion(.success(()))
func removeFolder(for account: Account, with folder: Folder) async throws {
account.removeFolder(folder: folder)
}
func restoreFolder(for account: Account, folder: Folder) async throws {
account.addFolder(folder)
}

2
Account/Sources/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift
View File

@ -54,7 +54,7 @@ extension NewsBlurAccountDelegate {
account.addFeed(feed)
clearFolderRelationship(for: feed, withFolderName: folder.name ?? "")
}
account.removeFolder(folder)
account.removeFolder(folder: folder)
}
}
}

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

@ -470,7 +470,22 @@ final class NewsBlurAccountDelegate: AccountDelegate {
folder.name = name
}
func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> ()) {
func removeFolder(for account: Account, with folder: Folder) async throws {
try await withCheckedThrowingContinuation { continuation in
self.removeFolder(for: account, with: folder) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
private func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> ()) {
guard let folderToRemove = folder.name else {
completion(.failure(NewsBlurError.invalidParameter))
return
@ -492,7 +507,7 @@ final class NewsBlurAccountDelegate: AccountDelegate {
switch result {
case .success:
account.removeFolder(folder)
account.removeFolder(folder: folder)
completion(.success(()))
case .failure(let error):
completion(.failure(error))

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

@ -386,7 +386,22 @@ final class ReaderAPIAccountDelegate: AccountDelegate {
}
func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
func removeFolder(for account: Account, with folder: Folder) async throws {
try await withCheckedThrowingContinuation { continuation in
self.removeFolder(for: account, with: folder) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
}
}
private func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void) {
let group = DispatchGroup()
@ -437,13 +452,13 @@ final class ReaderAPIAccountDelegate: AccountDelegate {
group.notify(queue: DispatchQueue.main) {
if self.variant == .theOldReader {
account.removeFolder(folder)
account.removeFolder(folder: folder)
completion(.success(()))
} else {
self.caller.deleteTag(folder: folder) { result in
switch result {
case .success:
account.removeFolder(folder)
account.removeFolder(folder: folder)
completion(.success(()))
case .failure(let error):
completion(.failure(error))
@ -872,7 +887,7 @@ private extension ReaderAPIAccountDelegate {
account.addFeed(feed)
clearFolderRelationship(for: feed, folderExternalID: folder.externalID)
}
account.removeFolder(folder)
account.removeFolder(folder: folder)
}
}
}

35
Mac/Scriptability/Account+Scriptability.swift
View File

@ -68,23 +68,24 @@ import Core
}
@MainActor func deleteElement(_ element:ScriptingObject) {
if let scriptableFolder = element as? ScriptableFolder {
BatchUpdate.shared.perform {
account.removeFolder(scriptableFolder.folder) { result in
}
}
} else if let scriptableFeed = element as? ScriptableFeed {
BatchUpdate.shared.perform {
var container: Container? = nil
if let scriptableFolder = scriptableFeed.container as? ScriptableFolder {
container = scriptableFolder.folder
} else {
container = account
}
account.removeFeed(scriptableFeed.feed, from: container!) { result in
}
}
}
// TODO: fix this
// if let scriptableFolder = element as? ScriptableFolder {
// BatchUpdate.shared.perform {
// account.removeFolder(scriptableFolder.folder) { result in
// }
// }
// } else if let scriptableFeed = element as? ScriptableFeed {
// BatchUpdate.shared.perform {
// var container: Container? = nil
// if let scriptableFolder = scriptableFeed.container as? ScriptableFolder {
// container = scriptableFolder.folder
// } else {
// container = account
// }
// account.removeFeed(scriptableFeed.feed, from: container!) { result in
// }
// }
// }
}
@objc(isLocationRequiredToCreateForKey:)

16
Shared/Commands/DeleteCommand.swift
View File

@ -161,12 +161,18 @@ import Core
} else if let folder = folder {
BatchUpdate.shared.start()
account?.removeFolder(folder) { result in
BatchUpdate.shared.end()
completion()
self.checkResult(result)
}
Task { @MainActor in
do {
try await account?.removeFolder(folder)
BatchUpdate.shared.end()
completion()
} catch {
BatchUpdate.shared.end()
completion()
self.errorHandler(error)
}
}
}
}