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

Change extension point so that multiple of the same type can exist.

Browse Source
This commit is contained in:
Maurice Parker 2020-04-08 10:12:06 -05:00
parent b0781c6df4
commit 14189b19e9
7 changed files with 87 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Frameworks/FeedProvider/Twitter/TwitterFeedProvider.swift
View File

@ -10,8 +10,10 @@ import Foundation
public struct TwitterFeedProvider: FeedProvider { public struct TwitterFeedProvider: FeedProvider {
public init() { public var username: String
public init(username: String) {
self.username = username
} }
} }

12
Mac/Preferences/ExtensionPoints/ExtensionPointAddViewController.swift
View File

@ -13,7 +13,7 @@ class ExtensionPointAddViewController: NSViewController {
@IBOutlet weak var tableView: NSTableView! @IBOutlet weak var tableView: NSTableView!
private var availableExtensionPoints = [ExtensionPoint]() private var availableExtensionPointTypes = [ExtensionPointType]()
private var extensionPointAddWindowController: NSWindowController? private var extensionPointAddWindowController: NSWindowController?
init() { init() {
@ -28,7 +28,7 @@ class ExtensionPointAddViewController: NSViewController {
super.viewDidLoad() super.viewDidLoad()
tableView.dataSource = self tableView.dataSource = self
tableView.delegate = self tableView.delegate = self
availableExtensionPoints = ExtensionPointManager.shared.availableExtensionPoints availableExtensionPointTypes = ExtensionPointManager.shared.availableExtensionPointTypes
} }
} }
@ -38,7 +38,7 @@ class ExtensionPointAddViewController: NSViewController {
extension ExtensionPointAddViewController: NSTableViewDataSource { extension ExtensionPointAddViewController: NSTableViewDataSource {
func numberOfRows(in tableView: NSTableView) -> Int { func numberOfRows(in tableView: NSTableView) -> Int {
return availableExtensionPoints.count return availableExtensionPointTypes.count
} }
func tableView(_ tableView: NSTableView, objectValueFor tableColumn: NSTableColumn?, row: Int) -> Any? { func tableView(_ tableView: NSTableView, objectValueFor tableColumn: NSTableColumn?, row: Int) -> Any? {
@ -55,9 +55,9 @@ extension ExtensionPointAddViewController: NSTableViewDelegate {
func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? { func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
if let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "Cell"), owner: nil) as? ExtensionPointAddTableCellView { if let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "Cell"), owner: nil) as? ExtensionPointAddTableCellView {
let extensionPoint = availableExtensionPoints[row] let extensionPointType = availableExtensionPointTypes[row]
cell.titleLabel?.stringValue = extensionPoint.title cell.titleLabel?.stringValue = extensionPointType.title
cell.imageView?.image = extensionPoint.templateImage cell.imageView?.image = extensionPointType.templateImage
return cell return cell
} }
return nil return nil

63
Shared/ExtensionPoints/ExtensionPoint.swift
View File

@ -9,12 +9,65 @@
import Foundation import Foundation
import RSCore import RSCore
protocol ExtensionPoint { enum ExtensionPointType {
case marsEdit
case microblog
case twitter
/// The title of the command. var title: String {
var title: String { get } switch self {
case .marsEdit:
return NSLocalizedString("MarsEdit", comment: "MarsEdit")
case .microblog:
return NSLocalizedString("Micro.blog", comment: "Micro.blog")
case .twitter:
return NSLocalizedString("Twitter", comment: "Twitter")
}
/// The template image for the command. }
var templateImage: RSImage { get }
var templateImage: RSImage {
switch self {
case .marsEdit:
return AppAssets.extensionPointMarsEdit
case .microblog:
return AppAssets.extensionPointMicroblog
case .twitter:
return AppAssets.extensionPointTwitter
}
}
}
enum ExtensionPointIdentifer {
case marsEdit
case microblog
case twitter(String)
var title: String {
switch self {
case .marsEdit:
return ExtensionPointType.marsEdit.title
case .microblog:
return ExtensionPointType.microblog.title
case .twitter(let username):
return "\(ExtensionPointType.microblog.title) (\(username))"
}
}
}
protocol ExtensionPoint {
var extensionPointType: ExtensionPointType { get }
var extensionPointID: ExtensionPointIdentifer { get }
}
extension ExtensionPoint {
var title: String {
return extensionPointID.title
}
} }

26
Shared/ExtensionPoints/ExtensionPointManager.swift
View File

@ -14,34 +14,22 @@ struct ExtensionPointManager {
static let shared = ExtensionPointManager() static let shared = ExtensionPointManager()
let marsEdit = SendToMarsEditCommand() let availableExtensionPointTypes: [ExtensionPointType]
let microblog = SendToMicroBlogCommand() // let activeSendToCommands: [SendToCommand]
let twitter = TwitterFeedProvider() // let activeFeedProviders: [FeedProvider]
let availableExtensionPoints: [ExtensionPoint]
let activeSendToCommands: [SendToCommand]
let activeFeedProviders: [FeedProvider]
init() { init() {
#if os(macOS) #if os(macOS)
#if DEBUG #if DEBUG
availableExtensionPoints = [marsEdit, microblog, twitter] availableExtensionPointTypes = [.marsEdit, .microblog, .twitter]
activeSendToCommands = [marsEdit, microblog]
activeFeedProviders = [twitter]
#else #else
availableExtensionPoints = [marsEdit, microblog, twitter] availableExtensionPointTypes = [.marsEdit, .microblog, .twitter]
activeSendToCommands = [marsEdit, microblog]
activeFeedProviders = [twitter]
#endif #endif
#else #else
#if DEBUG #if DEBUG
availableExtensionPoints = [twitter] availableExtensionPoints = [.twitter]
activeSendToCommands = []()
activeFeedProviders = [twitter]
#else #else
availableExtensionPoints = [twitter] availableExtensionPoints = [.twitter]
activeSendToCommands = []()
activeFeedProviders = [twitter]
#endif #endif
#endif #endif
} }

4
Shared/ExtensionPoints/SendToMarsEditCommand.swift
View File

@ -12,8 +12,8 @@ import Articles
final class SendToMarsEditCommand: ExtensionPoint, SendToCommand { final class SendToMarsEditCommand: ExtensionPoint, SendToCommand {
let title = NSLocalizedString("MarsEdit", comment: "MarsEdit") let extensionPointType = ExtensionPointType.marsEdit
let templateImage = AppAssets.extensionPointMarsEdit let extensionPointID = ExtensionPointIdentifer.marsEdit
var image: NSImage? { var image: NSImage? {
return appToUse()?.icon ?? nil return appToUse()?.icon ?? nil

4
Shared/ExtensionPoints/SendToMicroBlogCommand.swift
View File

@ -14,8 +14,8 @@ import RSCore
final class SendToMicroBlogCommand: ExtensionPoint, SendToCommand { final class SendToMicroBlogCommand: ExtensionPoint, SendToCommand {
let title = NSLocalizedString("Micro.blog", comment: "Micro.blog") let extensionPointType = ExtensionPointType.microblog
let templateImage = AppAssets.extensionPointMicroblog let extensionPointID = ExtensionPointIdentifer.microblog
var image: NSImage? { var image: NSImage? {
return microBlogApp.icon return microBlogApp.icon

9
Shared/ExtensionPoints/TwitterFeedProvider+Extensions.swift
View File

@ -12,12 +12,13 @@ import RSCore
extension TwitterFeedProvider: ExtensionPoint { extension TwitterFeedProvider: ExtensionPoint {
var title: String { var extensionPointType: ExtensionPointType {
return NSLocalizedString("Twitter", comment: "Twitter") return ExtensionPointType.twitter
} }
var templateImage: RSImage { var extensionPointID: ExtensionPointIdentifer {
return AppAssets.extensionPointTwitter return ExtensionPointIdentifer.twitter(username)
} }
} }