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

Fix numerous concurrency warnings.

Browse Source
This commit is contained in:
Brent Simmons 2024-03-24 12:37:55 -07:00
parent 0f639085d6
commit c01e2d1682
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ public protocol ContainerIdentifiable {
var containerID: ContainerIdentifier? { get } var containerID: ContainerIdentifier? { get }
} }
public enum ContainerIdentifier: Hashable, Equatable { public enum ContainerIdentifier: Hashable, Equatable, Sendable {
case smartFeedController case smartFeedController
case account(String) // accountID case account(String) // accountID
case folder(String, String) // accountID, folderName case folder(String, String) // accountID, folderName

4
AppKitExtras/Sources/AppKitExtras/NSPasteboard+RSCore.swift
View File

@ -10,7 +10,7 @@ import AppKit
public extension NSPasteboard { public extension NSPasteboard {
func copyObjects(_ objects: [Any]) { @MainActor func copyObjects(_ objects: [Any]) {
guard let writers = writersFor(objects) else { guard let writers = writersFor(objects) else {
return return
@ -54,7 +54,7 @@ public extension NSPasteboard {
private extension NSPasteboard { private extension NSPasteboard {
func writersFor(_ objects: [Any]) -> [NSPasteboardWriting]? { @MainActor func writersFor(_ objects: [Any]) -> [NSPasteboardWriting]? {
let writers = objects.compactMap { ($0 as? PasteboardWriterOwner)?.pasteboardWriter } let writers = objects.compactMap { ($0 as? PasteboardWriterOwner)?.pasteboardWriter }
return writers.isEmpty ? nil : writers return writers.isEmpty ? nil : writers

2
AppKitExtras/Sources/AppKitExtras/PasteboardWriterOwner.swift
View File

@ -10,6 +10,6 @@ import AppKit
public protocol PasteboardWriterOwner { public protocol PasteboardWriterOwner {
var pasteboardWriter: NSPasteboardWriting { get } @MainActor var pasteboardWriter: NSPasteboardWriting { get }
} }
#endif #endif

5
Mac/Scriptability/MainWindowController+Scriptability.swift
View File

@ -10,7 +10,8 @@ import Foundation
import Articles import Articles
protocol ScriptingMainWindowController { protocol ScriptingMainWindowController {
var scriptingCurrentArticle: Article? { get }
var scriptingSelectedArticles: [Article] { get } @MainActor var scriptingCurrentArticle: Article? { get }
@MainActor var scriptingSelectedArticles: [Article] { get }
} }

8
Shared/SmartFeeds/SmartFeedsController.swift
View File

@ -10,16 +10,14 @@ import Foundation
import Account import Account
import Core import Core
final class SmartFeedsController: DisplayNameProvider, ContainerIdentifiable { @MainActor final class SmartFeedsController: DisplayNameProvider, ContainerIdentifiable {
var containerID: ContainerIdentifier? { let containerID: ContainerIdentifier? = ContainerIdentifier.smartFeedController
return ContainerIdentifier.smartFeedController
}
public static let shared = SmartFeedsController() public static let shared = SmartFeedsController()
let nameForDisplay = NSLocalizedString("Smart Feeds", comment: "Smart Feeds group title") let nameForDisplay = NSLocalizedString("Smart Feeds", comment: "Smart Feeds group title")
var smartFeeds = [SidebarItem]() let smartFeeds: [SidebarItem]
let todayFeed = SmartFeed(delegate: TodayFeedDelegate()) let todayFeed = SmartFeed(delegate: TodayFeedDelegate())
let unreadFeed = UnreadFeed() let unreadFeed = UnreadFeed()
let starredFeed = SmartFeed(delegate: StarredFeedDelegate()) let starredFeed = SmartFeed(delegate: StarredFeedDelegate())