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

Make Micro.blog and MarsEdit extension points always active. Fixes #2631

This commit is contained in:
Maurice Parker 2020-12-06 01:24:10 -06:00
parent ebe5f02127
commit 7eca28a170
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Shared/ExtensionPoints/ExtensionPointManager.swift
View File

@ -54,7 +54,13 @@ final class ExtensionPointManager: FeedProviderManagerDelegate {
} }
var activeSendToCommands: [SendToCommand] { var activeSendToCommands: [SendToCommand] {
return activeExtensionPoints.values.compactMap({ return $0 as? SendToCommand }) var commands = activeExtensionPoints.values.compactMap({ return $0 as? SendToCommand })
// These two SendToCommands don't need logins and are always active
commands.append(SendToMarsEditCommand())
commands.append(SendToMicroBlogCommand())
return commands
} }
var activeFeedProviders: [FeedProvider] { var activeFeedProviders: [FeedProvider] {
@ -70,19 +76,7 @@ final class ExtensionPointManager: FeedProviderManagerDelegate {
} }
init() { init() {
#if os(macOS)
#if DEBUG
possibleExtensionPointTypes = [SendToMarsEditCommand.self, SendToMicroBlogCommand.self, TwitterFeedProvider.self, RedditFeedProvider.self]
#else
possibleExtensionPointTypes = [SendToMarsEditCommand.self, SendToMicroBlogCommand.self, TwitterFeedProvider.self, RedditFeedProvider.self]
#endif
#else
#if DEBUG
possibleExtensionPointTypes = [TwitterFeedProvider.self, RedditFeedProvider.self] possibleExtensionPointTypes = [TwitterFeedProvider.self, RedditFeedProvider.self]
#else
possibleExtensionPointTypes = [TwitterFeedProvider.self, RedditFeedProvider.self]
#endif
#endif
loadExtensionPoints() loadExtensionPoints()
} }
@ -125,12 +119,6 @@ private extension ExtensionPointManager {
func extensionPoint(for extensionPointType: ExtensionPoint.Type, tokenSuccess: OAuthSwift.TokenSuccess?, completion: @escaping (Result<ExtensionPoint, Error>) -> Void) { func extensionPoint(for extensionPointType: ExtensionPoint.Type, tokenSuccess: OAuthSwift.TokenSuccess?, completion: @escaping (Result<ExtensionPoint, Error>) -> Void) {
switch extensionPointType { switch extensionPointType {
#if os(macOS)
case is SendToMarsEditCommand.Type:
completion(.success(SendToMarsEditCommand()))
case is SendToMicroBlogCommand.Type:
completion(.success(SendToMicroBlogCommand()))
#endif
case is TwitterFeedProvider.Type: case is TwitterFeedProvider.Type:
if let tokenSuccess = tokenSuccess, let twitter = TwitterFeedProvider(tokenSuccess: tokenSuccess) { if let tokenSuccess = tokenSuccess, let twitter = TwitterFeedProvider(tokenSuccess: tokenSuccess) {
completion(.success(twitter)) completion(.success(twitter))
@ -151,22 +139,18 @@ private extension ExtensionPointManager {
completion(.failure(ExtensionPointManagerError.unableToCreate)) completion(.failure(ExtensionPointManagerError.unableToCreate))
} }
default: default:
assertionFailure("Unrecognized Extension Point Type.") break
} }
} }
func extensionPoint(for extensionPointID: ExtensionPointIdentifer) -> ExtensionPoint? { func extensionPoint(for extensionPointID: ExtensionPointIdentifer) -> ExtensionPoint? {
switch extensionPointID { switch extensionPointID {
#if os(macOS)
case .marsEdit:
return SendToMarsEditCommand()
case .microblog:
return SendToMicroBlogCommand()
#endif
case .twitter(let screenName): case .twitter(let screenName):
return TwitterFeedProvider(screenName: screenName) return TwitterFeedProvider(screenName: screenName)
case .reddit(let username): case .reddit(let username):
return RedditFeedProvider(username: username) return RedditFeedProvider(username: username)
default:
return nil
} }
} }