feat: add more fallback

mishamyrt · Aug 11, 2024 · e381738 · e381738
1 parent 588dcbf
commit e381738
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -123,7 +123,7 @@ The following event sources can be subscribed to:
 
 - `screen` — connected displays list change. declares `connected`, `disconnected`, `locked` and `unlocked` events. In `with` takes the display name.
 - `audio` — connected audio device list change. declares `connected` and `disconnected` events. In `with` takes the audio device name. Handles both input and output devices.
-- `app` — active application change. declares `activated` and `deactivated` events. In `with` takes the app bundle identifier (like `com.microsoft.VSCode`).
+- `app` — active application change. declares `activated`, `deactivated`, `launched` and `terminated` events. In `with` takes the app bundle identifier (like `com.microsoft.VSCode`). If the application does not have a bundleID, the name of the executable will be used as the fallback. To see which event the application emits, use the `runon print` command.
 
 ## Usage
 

diff --git a/Sources/Events/EventSources/ApplicationSource.swift b/Sources/Events/EventSources/ApplicationSource.swift
@@ -7,20 +7,36 @@ class ApplicationSource: EventSource {
 
     @objc
     func handleAppActivate(notification: Notification) {
-        guard let bundleId = bundleIdentifier(from: notification) else {
+        guard let bundleId = appIdentifier(from: notification) else {
             return
         }
         emit(kind: "activated", target: bundleId)
     }
 
     @objc
     func handleAppDeactivate(notification: Notification) {
-        guard let bundleId = bundleIdentifier(from: notification) else {
+        guard let bundleId = appIdentifier(from: notification) else {
             return
         }
         emit(kind: "deactivated", target: bundleId)
     }
 
+	@objc
+    func handleAppLaunch(notification: Notification) {
+        guard let bundleId = appIdentifier(from: notification) else {
+            return
+        }
+        emit(kind: "launched", target: bundleId)
+    }
+
+	@objc
+    func handleAppTerminate(notification: Notification) {
+        guard let bundleId = appIdentifier(from: notification) else {
+            return
+        }
+        emit(kind: "terminated", target: bundleId)
+    }
+
     func subscribe() {
         NSWorkspace.shared.notificationCenter.addObserver(
             self,
@@ -34,10 +50,24 @@ class ApplicationSource: EventSource {
             name: NSWorkspace.didDeactivateApplicationNotification,
             object: nil
         )
+		NSWorkspace.shared.notificationCenter.addObserver(
+            self,
+            selector: #selector(handleAppLaunch),
+            name: NSWorkspace.didLaunchApplicationNotification,
+            object: nil
+        )
+		NSWorkspace.shared.notificationCenter.addObserver(
+			self,
+			selector: #selector(handleAppTerminate),
+			name: NSWorkspace.didTerminateApplicationNotification,
+			object: nil
+		)
     }
 
-    private func bundleIdentifier(from: Notification) -> String? {
+    private func appIdentifier(from: Notification) -> String? {
         let app = from.userInfo?["NSWorkspaceApplicationKey"] as? NSRunningApplication
-        return app?.bundleIdentifier ?? app?.localizedName
+        return app?.bundleIdentifier
+			?? app?.localizedName
+			?? app?.executableURL?.lastPathComponent
     }
 }