Change "Open Home Assistant" menu item to check for existing of the Home Assistant Companion App and launch that instead if found, otherwise fall back to opening website.

Author: andrew-codechimp

HA Menu.xcodeproj/project.pbxproj

@@ -619,15 +619,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 23;
 				DEVELOPMENT_TEAM = VZ3Z8BPWPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "HA Menu/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.4.0;
 				OTHER_SWIFT_FLAGS = "-D DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -643,15 +643,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 23;
 				DEVELOPMENT_TEAM = VZ3Z8BPWPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "HA Menu/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -748,15 +748,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 23;
 				DEVELOPMENT_TEAM = VZ3Z8BPWPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "HA Menu Launcher/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu-Launcher";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -772,15 +772,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 23;
 				DEVELOPMENT_TEAM = VZ3Z8BPWPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "HA Menu Launcher/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu-Launcher";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

HA Menu/MenuItemController.swift

@@ -38,10 +38,10 @@ final class MenuItemController: NSObject, NSMenuDelegate {
 
         if let statusButton = statusItem.button {
             #if DEBUG
-                let icon = NSImage(named: "StatusBarButtonImageDebug")
+            let icon = NSImage(named: "StatusBarButtonImageDebug")
             #else
-                let icon = NSImage(named: "StatusBarButtonImage")
-                icon?.isTemplate = true // best for dark mode
+            let icon = NSImage(named: "StatusBarButtonImage")
+            icon?.isTemplate = true // best for dark mode
             #endif
 
             statusButton.image = icon
@@ -103,8 +103,35 @@ final class MenuItemController: NSObject, NSMenuDelegate {
     }
 
     @objc func openHA(sender: NSMenuItem) {
-        NSWorkspace.shared.open(NSURL(string: prefs.server)! as URL)
+
+        if #available(OSX 10.15, *) {
+            let url = NSURL(fileURLWithPath: "/Applications/Home Assistant.app", isDirectory: true) as URL
+
+            let path = "/bin"
+            let configuration = NSWorkspace.OpenConfiguration()
+            configuration.arguments = [path]
+            configuration.promptsUserIfNeeded = false
+
+            NSWorkspace.shared.openApplication(at: url,
+                                               configuration: configuration) { (app, error) in
+                                                if error != nil {
+                                                    // Fallback to opening website
+                                                    NSWorkspace.shared.open(NSURL(string: self.prefs.server)! as URL)
+                                                }
+            }
+
+        } else {
+            // Fallback on earlier versions
+            if !NSWorkspace.shared.launchApplication("Home Assistant") {
+                // Fallback to opening website
+                NSWorkspace.shared.open(NSURL(string: self.prefs.server)! as URL)
+            }
+
+        }
+
     }
+
+
 
     @objc func openAbout(sender: NSMenuItem) {
         let options = [String: Any]()
@@ -209,7 +236,7 @@ final class MenuItemController: NSObject, NSMenuDelegate {
                         case "scene":
                             itemType = EntityTypes.sceneType
                         case "script":
-                           itemType = EntityTypes.scriptType
+                            itemType = EntityTypes.scriptType
 
                         default:
                             itemType = nil