mirror of
https://github.com/Ranchero-Software/NetNewsWire
synced 2025-08-12 06:26:36 +00:00
Remove numerous superfluous MainActor annotations.
This commit is contained in:
@@ -54,7 +54,7 @@ import CrashReporter
|
||||
let formData = formString.data(using: .utf8, allowLossyConversion: true)
|
||||
request.httpBody = formData
|
||||
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
try? await OneShotDownloadManager.shared.download(request)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,7 +211,7 @@ private extension FeedInspectorViewController {
|
||||
return
|
||||
}
|
||||
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
|
||||
do {
|
||||
try await account.renameFeed(feed, to: newName)
|
||||
|
||||
@@ -113,7 +113,7 @@ private extension FolderInspectorViewController {
|
||||
return
|
||||
}
|
||||
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
|
||||
do {
|
||||
try await account.renameFolder(folder, to: newName)
|
||||
|
||||
@@ -65,7 +65,7 @@ import CommonErrors
|
||||
|
||||
beginShowingProgress()
|
||||
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
do {
|
||||
let feed = try await account.createFeed(url: url.absoluteString, name: title, container: container, validateFeed: true)
|
||||
NotificationCenter.default.post(name: .UserDidAddFeed, object: self, userInfo: [UserInfoKey.feed: feed])
|
||||
|
||||
@@ -48,7 +48,7 @@ private extension NNW3ImportController {
|
||||
return
|
||||
}
|
||||
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
do {
|
||||
try await account.importOPML(opmlURL)
|
||||
try? FileManager.default.removeItem(at: opmlURL)
|
||||
|
||||
@@ -314,7 +314,7 @@ private extension SidebarOutlineDataSource {
|
||||
return
|
||||
}
|
||||
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
do {
|
||||
try await destination.account?.addFeed(feed, to: destination)
|
||||
} catch {
|
||||
@@ -332,7 +332,7 @@ private extension SidebarOutlineDataSource {
|
||||
|
||||
BatchUpdate.shared.start()
|
||||
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
|
||||
do {
|
||||
try await source.account?.moveFeed(feed, from: source, to: destination)
|
||||
@@ -353,7 +353,7 @@ private extension SidebarOutlineDataSource {
|
||||
|
||||
if let existingFeed = destinationAccount.existingFeed(withURL: feed.url) {
|
||||
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
do {
|
||||
try await destinationAccount.addFeed(existingFeed, to: destinationContainer)
|
||||
} catch {
|
||||
@@ -361,7 +361,7 @@ private extension SidebarOutlineDataSource {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
do {
|
||||
try await destinationAccount.createFeed(url: feed.url, name: feed.nameForDisplay, container: destinationContainer, validateFeed: false)
|
||||
} catch {
|
||||
@@ -430,7 +430,7 @@ private extension SidebarOutlineDataSource {
|
||||
return
|
||||
}
|
||||
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
|
||||
do {
|
||||
let destinationFolder = try await destinationAccount.addFolder(folder.name ?? "")
|
||||
|
||||
@@ -256,14 +256,14 @@ protocol SidebarDelegate: AnyObject {
|
||||
}
|
||||
}
|
||||
|
||||
@MainActor @IBAction func doubleClickedSidebar(_ sender: Any?) {
|
||||
@IBAction func doubleClickedSidebar(_ sender: Any?) {
|
||||
|
||||
guard outlineView.clickedRow == outlineView.selectedRow else {
|
||||
return
|
||||
}
|
||||
|
||||
if AppDefaults.shared.feedDoubleClickMarkAsRead, let feed = singleSelectedFeed {
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
await markArticlesInFeedAsRead(feed: feed)
|
||||
}
|
||||
}
|
||||
@@ -271,7 +271,7 @@ protocol SidebarDelegate: AnyObject {
|
||||
openInBrowser(sender)
|
||||
}
|
||||
|
||||
@MainActor private func markArticlesInFeedAsRead(feed: Feed) async {
|
||||
private func markArticlesInFeedAsRead(feed: Feed) async {
|
||||
|
||||
guard let articles = try? await feed.fetchUnreadArticles() else {
|
||||
return
|
||||
|
||||
@@ -67,7 +67,7 @@ import Core
|
||||
return self.classDescription as! NSScriptClassDescription
|
||||
}
|
||||
|
||||
@MainActor func deleteElement(_ element:ScriptingObject) {
|
||||
func deleteElement(_ element:ScriptingObject) {
|
||||
// TODO: fix this
|
||||
// if let scriptableFolder = element as? ScriptableFolder {
|
||||
// BatchUpdate.shared.perform {
|
||||
|
||||
@@ -111,7 +111,7 @@ import Articles
|
||||
return article.status.boolStatus(forKey:.read)
|
||||
}
|
||||
set {
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
markArticles([self.article], statusKey: .read, flag: newValue)
|
||||
}
|
||||
}
|
||||
@@ -123,7 +123,7 @@ import Articles
|
||||
return article.status.boolStatus(forKey:.starred)
|
||||
}
|
||||
set {
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
markArticles([self.article], statusKey: .starred, flag: newValue)
|
||||
}
|
||||
}
|
||||
@@ -146,7 +146,7 @@ import Articles
|
||||
}
|
||||
|
||||
@objc(feed)
|
||||
@MainActor var feed: ScriptableFeed? {
|
||||
var feed: ScriptableFeed? {
|
||||
guard let parentFeed = self.article.feed,
|
||||
let account = parentFeed.account
|
||||
else { return nil }
|
||||
|
||||
@@ -52,7 +52,7 @@ import Core
|
||||
return self.classDescription as! NSScriptClassDescription
|
||||
}
|
||||
|
||||
@MainActor func deleteElement(_ element:ScriptingObject) {
|
||||
func deleteElement(_ element:ScriptingObject) {
|
||||
// TODO: fix this
|
||||
// if let scriptableFeed = element as? ScriptableFeed {
|
||||
// BatchUpdate.shared.perform {
|
||||
@@ -68,7 +68,7 @@ import Core
|
||||
or
|
||||
tell account X to make new folder at end with properties {name:"new folder name"}
|
||||
*/
|
||||
@MainActor class func handleCreateElement(command:NSCreateCommand) -> Any? {
|
||||
class func handleCreateElement(command:NSCreateCommand) -> Any? {
|
||||
guard command.isCreateCommand(forClass:"fold") else { return nil }
|
||||
let name = command.property(forKey:"name") as? String ?? ""
|
||||
|
||||
@@ -82,7 +82,7 @@ import Core
|
||||
|
||||
command.suspendExecution()
|
||||
|
||||
Task { @MainActor in
|
||||
Task {
|
||||
do {
|
||||
let folder = try await account.addFolder(name)
|
||||
let scriptableAccount = ScriptableAccount(account)
|
||||
|
||||
Reference in New Issue
Block a user