Pass application to each action's initializer

Author: luosheng

OpenSim/ActionMenu.swift

@@ -12,16 +12,16 @@ final class ActionMenu: NSMenu {
 
     private weak var application: Application!
 
-    private static let standardActions: [ApplicationActionable] = [
-        RevealInFinderAction(),
-        CopyToPasteboardAction(),
-        OpenInTerminalAction(),
-        UninstallAction()
+    private static let standardActions: [ApplicationActionable.Type] = [
+        RevealInFinderAction.self,
+        CopyToPasteboardAction.self,
+        OpenInTerminalAction.self,
+        UninstallAction.self
     ]
 
-    private static let extraActions: [ApplicationActionable] = [
-        OpenInItermAction(),
-        OpenRealmAction()
+    private static let extraActions: [ApplicationActionable.Type] = [
+        OpenInItermAction.self,
+        OpenRealmAction.self
     ]
 
     private var appInfoItem: NSMenuItem {
@@ -43,8 +43,10 @@ final class ActionMenu: NSMenu {
     }
 
     private func buildMenuItems() {
-        self.buildMenuSection(title: NSLocalizedString("Actions", comment: ""), actions: ActionMenu.standardActions)
-        self.buildMenuSection(title: NSLocalizedString("Extensions", comment: ""), actions: ActionMenu.extraActions)
+        let createAction: (ApplicationActionable.Type) -> ApplicationActionable = { $0.init(application: self.application) }
+        
+        self.buildMenuSection(title: NSLocalizedString("Actions", comment: ""), actions: ActionMenu.standardActions.map(createAction))
+        self.buildMenuSection(title: NSLocalizedString("Extensions", comment: ""), actions: ActionMenu.extraActions.map(createAction))
         self.addItem(self.buildSectionTitle(title: NSLocalizedString("App Information", comment: "")))
         self.addItem(appInfoItem)
     }
@@ -79,7 +81,7 @@ final class ActionMenu: NSMenu {
     }
 
     @objc private func actionMenuItemClicked(_ sender: NSMenuItem) {
-        (sender.representedObject as? ApplicationActionable)?.perform(with: application)
+        (sender.representedObject as? ApplicationActionable)?.perform()
     }
 
 }

OpenSim/ApplicationActionable.swift

@@ -10,12 +10,16 @@ import Cocoa
 
 protocol ApplicationActionable {
 
+    init(application: Application)
+    
+    var application: Application? { get set }
+    
     var title: String { get }
 
     var icon: NSImage? { get }
 
     var isAvailable: Bool { get }
 
-    func perform(with application: Application)
+    func perform()
 
 }

OpenSim/CopyToPasteboardAction.swift

@@ -10,14 +10,20 @@ import Cocoa
 
 final class CopyToPasteboardAction: ApplicationActionable {
 
+    var application: Application?
+    
     let title = NSLocalizedString("Copy Sandbox Path to Pasteboard", comment: "")
 
     let icon = templatize(#imageLiteral(resourceName: "share"))
 
     let isAvailable: Bool = true
 
-    func perform(with application: Application) {
-        if let url = application.sandboxUrl {
+    init(application: Application) {
+        self.application = application
+    }
+    
+    func perform() {
+        if let url = application?.sandboxUrl {
             NSPasteboard.general().setString(url.path, forType: NSPasteboardTypeString)
         }
     }

OpenSim/OpenInItermAction.swift

@@ -10,12 +10,18 @@ import Cocoa
 
 class OpenInItermAction: ExtraApplicationActionable {
 
+    var application: Application?
+    
     let appBundleIdentifier = "com.googlecode.iterm2"
 
     let title = NSLocalizedString("Open Sandbox in iTerm", comment: "")
 
-    func perform(with application: Application) {
-        if let url = application.sandboxUrl {
+    required init(application: Application) {
+        self.application = application
+    }
+    
+    func perform() {
+        if let url = application?.sandboxUrl {
             NSWorkspace.shared().openFile(url.path, withApplication: "iTerm")
         }
     }

OpenSim/OpenInTerminalAction.swift

@@ -10,14 +10,20 @@ import Cocoa
 
 final class OpenInTerminalAction: ApplicationActionable {
 
+    var application: Application?
+    
     let title = NSLocalizedString("Open Sandbox in Terminal", comment: "")
 
     let icon = templatize(#imageLiteral(resourceName: "terminal"))
 
     let isAvailable = true
 
-    func perform(with application: Application) {
-        if let url = application.sandboxUrl {
+    init(application: Application) {
+        self.application = application
+    }
+    
+    func perform() {
+        if let url = application?.sandboxUrl {
             NSWorkspace.shared().openFile(url.path, withApplication: "Terminal")
         }
     }

OpenSim/OpenRealmAction.swift

@@ -8,13 +8,19 @@
 
 import Cocoa
 
-class OpenRealmAction: ExtraApplicationActionable {
+final class OpenRealmAction: ExtraApplicationActionable {
+    
+    var application: Application?
 
     let appBundleIdentifier = "io.realm.Realm-Browser"
 
     let title = "Open Realm Database"
 
-    func perform(with application: Application) {
+    init(application: Application) {
+        self.application = application
+    }
+    
+    func perform() {
 
     }
 

OpenSim/RevealInFinderAction.swift

@@ -10,14 +10,20 @@ import Cocoa
 
 final class RevealInFinderAction: ApplicationActionable {
 
+    var application: Application?
+    
     let title = NSLocalizedString("Reveal Sandbox in Finder", comment: "")
 
     let icon = templatize(#imageLiteral(resourceName: "reveal"))
 
     let isAvailable: Bool = true
 
-    func perform(with application: Application) {
-        if let url = application.sandboxUrl {
+    init(application: Application) {
+        self.application = application
+    }
+    
+    func perform() {
+        if let url = application?.sandboxUrl {
             NSWorkspace.shared().open(url)
         }
     }

OpenSim/UninstallAction.swift

@@ -10,13 +10,22 @@ import Cocoa
 
 final class UninstallAction: ApplicationActionable {
 
+    var application: Application?
+    
     let title = NSLocalizedString("Uninstall…", comment: "")
 
     let icon = templatize(#imageLiteral(resourceName: "uninstall"))
 
     let isAvailable = true
 
-    func perform(with application: Application) {
+    init(application: Application) {
+        self.application = application
+    }
+    
+    func perform() {
+        guard let application = application else {
+            return
+        }
         let alert: NSAlert = NSAlert()
         let alertFormat = "Are you sure you want to uninstall %1$@ from %1$@?"
         alert.messageText = String(format: NSLocalizedString(alertFormat, comment: ""), application.bundleDisplayName, application.device.name)