From 2e778e3c67f17fbfb5a5f43f51dfd91ce7e61db5 Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Fri, 23 Feb 2024 10:14:37 +0700 Subject: [PATCH] Update main.swift --- Sources/ActiveWinCLI/main.swift | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/Sources/ActiveWinCLI/main.swift b/Sources/ActiveWinCLI/main.swift index 33104e7..59b10d4 100644 --- a/Sources/ActiveWinCLI/main.swift +++ b/Sources/ActiveWinCLI/main.swift @@ -71,14 +71,14 @@ func getWindowInformation(window: [String: Any], windowOwnerPID: pid_t) -> [Stri "memoryUsage": window[kCGWindowMemoryUsage as String] as? Int ?? 0 ] - // Run the AppleScript to get the URL if active window is a compatible browser and accessibility permissions are enabled. - if !disableAccessibilityPermission { - if let bundleIdentifier = app.bundleIdentifier, - let script = getActiveBrowserTabURLAppleScriptCommand(bundleIdentifier), - let url = runAppleScript(source: script) - { - output["url"] = url - } + // Run the AppleScript to get the URL if the active window is a compatible browser and accessibility permissions are enabled. + if + !disableAccessibilityPermission, + let bundleIdentifier = app.bundleIdentifier, + let script = getActiveBrowserTabURLAppleScriptCommand(bundleIdentifier), + let url = runAppleScript(source: script) + { + output["url"] = url } return output @@ -89,13 +89,19 @@ let disableScreenRecordingPermission = CommandLine.arguments.contains("--no-scre let enableOpenWindowsList = CommandLine.arguments.contains("--open-windows-list") // Show accessibility permission prompt if needed. Required to get the URL of the active tab in browsers. -if !disableAccessibilityPermission && !AXIsProcessTrustedWithOptions(["AXTrustedCheckOptionPrompt": true] as CFDictionary) { +if + !disableAccessibilityPermission, + !AXIsProcessTrustedWithOptions(["AXTrustedCheckOptionPrompt": true] as CFDictionary) +{ print("active-win requires the accessibility permission in “System Settings › Privacy & Security › Accessibility”.") exit(1) } // Show screen recording permission prompt if needed. Required to get the complete window title. -if !disableScreenRecordingPermission && !hasScreenRecordingPermission() { +if + !disableScreenRecordingPermission, + !hasScreenRecordingPermission() +{ print("active-win requires the screen recording permission in “System Settings › Privacy & Security › Screen Recording”.") exit(1) }