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

Remove numerous superfluous MainActor annotations.

Browse Source
This commit is contained in:
Brent Simmons
2024-06-08 11:58:30 -07:00
parent f872f8aa86
commit fe49f3bbe4
23 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Shared/Activity/ActivityManager.swift
View File

@@ -113,9 +113,9 @@ import CoreSpotlight
}
#if os(iOS)
@MainActor static func cleanUp(_ account: Account) {
static func cleanUp(_ account: Account) {
Task { @MainActor in
Task {
var ids = [String]()
if let folders = account.folders {
@@ -133,9 +133,9 @@ import CoreSpotlight
}
}
@MainActor static func cleanUp(_ folder: Folder) {
static func cleanUp(_ folder: Folder) {
Task { @MainActor in
Task {
var ids: [String] = [String]()
ids.append(identifier(for: folder))
@@ -150,9 +150,9 @@ import CoreSpotlight
}
}
@MainActor static func cleanUp(_ feed: Feed) {
static func cleanUp(_ feed: Feed) {
Task { @MainActor in
Task {
let feedIdentifiers = await identifiers(for: feed)
try? await CSSearchableIndex.default().deleteSearchableItems(withIdentifiers: feedIdentifiers)
}
@@ -264,7 +264,7 @@ private extension ActivityManager {
return value?.components(separatedBy: " ").filter { $0.count > 2 } ?? []
}
@MainActor func updateSelectingActivityFeedSearchAttributes(with feed: Feed) {
func updateSelectingActivityFeedSearchAttributes(with feed: Feed) {
let attributeSet = CSSearchableItemAttributeSet(contentType: UTType.item)
attributeSet.title = feed.nameForDisplay
@@ -305,7 +305,7 @@ private extension ActivityManager {
return "account_\(article.accountID)_feed_\(article.feedID)_article_\(article.articleID)"
}
@MainActor static func identifiers(for feed: Feed) async -> [String] {
static func identifiers(for feed: Feed) async -> [String] {
var ids = [String]()
ids.append(identifier(for: feed))

8
Shared/Commands/DeleteCommand.swift
View File

@@ -47,7 +47,7 @@ import Core
func perform() {
Task { @MainActor in
Task {
for itemSpecifier in itemSpecifiers {
await itemSpecifier.delete()
@@ -65,7 +65,7 @@ import Core
registerRedo()
}
@MainActor static func canDelete(_ nodes: [Node]) -> Bool {
static func canDelete(_ nodes: [Node]) -> Bool {
// Return true if all nodes are feeds and folders.
// Any other type: return false.
@@ -190,7 +190,7 @@ import Core
BatchUpdate.shared.start()
Task { @MainActor in
Task {
do {
try await account.restoreFeed(feed, container: container)
@@ -208,7 +208,7 @@ import Core
return
}
Task { @MainActor in
Task {
BatchUpdate.shared.start()
do {
try await account.restoreFolder(folder)

8
Shared/Commands/MarkStatusCommand.swift
View File

@@ -50,12 +50,12 @@ import Core
self.init(initialArticles: initialArticles, statusKey: .starred, flag: markingStarred, undoManager: undoManager, completion: completion)
}
@MainActor func perform() {
func perform() {
mark(statusKey, flag)
registerUndo()
}
@MainActor func undo() {
func undo() {
mark(statusKey, !flag)
registerRedo()
}
@@ -63,7 +63,7 @@ import Core
private extension MarkStatusCommand {
@MainActor func mark(_ statusKey: ArticleStatus.Key, _ flag: Bool) {
func mark(_ statusKey: ArticleStatus.Key, _ flag: Bool) {
markArticles(articles, statusKey: statusKey, flag: flag, completion: completion)
completion = nil
}
@@ -83,7 +83,7 @@ private extension MarkStatusCommand {
}
}
@MainActor static func filteredArticles(_ articles: [Article], _ statusKey: ArticleStatus.Key, _ flag: Bool) -> [Article] {
static func filteredArticles(_ articles: [Article], _ statusKey: ArticleStatus.Key, _ flag: Bool) -> [Article] {
return articles.filter{ article in
guard article.status.boolStatus(forKey: statusKey) != flag else { return false }

6
Shared/ExtensionPoints/SendToMarsEditCommand.swift
View File

@@ -22,7 +22,7 @@ import Core
appToUse() != nil
}
@MainActor func sendObject(_ object: Any?, selectedText: String?) {
func sendObject(_ object: Any?, selectedText: String?) {
guard canSendObject(object, selectedText: selectedText) else {
return
@@ -34,7 +34,7 @@ import Core
return
}
Task { @MainActor in
Task {
guard await app.launchIfNeeded(), app.bringToFront() else {
return
}
@@ -44,7 +44,7 @@ import Core
}
}
@MainActor private extension SendToMarsEditCommand {
private extension SendToMarsEditCommand {
func send(_ article: Article, to app: UserApp) {

2
Shared/ExtensionPoints/SendToMicroBlogCommand.swift
View File

@@ -39,7 +39,7 @@ import Core
return
}
Task { @MainActor in
Task {
guard await microBlogApp.launchIfNeeded(), microBlogApp.bringToFront() else {
return
}

2
Shared/Extensions/AddFeedDefaultContainer.swift
View File

@@ -11,7 +11,7 @@ import Account
@MainActor struct AddFeedDefaultContainer {
@MainActor static var defaultContainer: Container? {
static var defaultContainer: Container? {
if let accountID = AppDefaults.shared.addFeedAccountID, let account = AccountManager.shared.activeAccounts.first(where: { $0.accountID == accountID }) {
if let folderName = AppDefaults.shared.addFeedFolderName, let folder = account.existingFolder(withDisplayName: folderName) {

2
Shared/Importers/DefaultFeedsImporter.swift
View File

@@ -15,7 +15,7 @@ import Account
let defaultFeedsURL = Bundle.main.url(forResource: "DefaultFeeds", withExtension: "opml")!
Task { @MainActor in
Task {
try? await AccountManager.shared.defaultAccount.importOPML(defaultFeedsURL)
}
}

8
Shared/ShareExtension/ExtensionContainersFile.swift
View File

@@ -22,7 +22,7 @@ import Core
return containerURL!.appendingPathComponent("extension_containers.plist").path
}()
@MainActor private var isDirty = false {
private var isDirty = false {
didSet {
queueSaveToDiskIfNeeded()
}
@@ -65,15 +65,15 @@ import Core
private extension ExtensionContainersFile {
@MainActor @objc func markAsDirty() {
@objc func markAsDirty() {
isDirty = true
}
@MainActor func queueSaveToDiskIfNeeded() {
func queueSaveToDiskIfNeeded() {
saveQueue.add(self, #selector(saveToDiskIfNeeded))
}
@MainActor @objc func saveToDiskIfNeeded() {
@objc func saveToDiskIfNeeded() {
if isDirty {
isDirty = false
save()

6
Shared/Timer/AccountRefreshTimer.swift
View File

@@ -64,8 +64,8 @@ import Account
}
@objc @MainActor func timedRefresh(_ sender: Timer?) {
@objc func timedRefresh(_ sender: Timer?) {
guard !shuttingDown else {
return
}
@@ -73,7 +73,7 @@ import Account
lastTimedRefresh = Date()
update()
Task { @MainActor in
Task {
await AccountManager.shared.refreshAll()
}
}

2
Shared/Timer/ArticleStatusSyncTimer.swift
View File

@@ -68,7 +68,7 @@ import Account
lastTimedRefresh = Date()
update()
Task { @MainActor in
Task {
await AccountManager.shared.syncArticleStatusAll()
}
}