From: Ruben Beltran del Rio Date: Wed, 2 Aug 2023 16:01:42 +0000 (+0200) Subject: Attempt more AppleScript support X-Git-Tag: 1.0.0~5 X-Git-Url: https://git.r.bdr.sh/rbdr/captura/commitdiff_plain/153f3309127a4f9d898310224a467d11eef0f2ff?ds=sidebyside;hp=377442f2f1f0f08bc525393c9bd1c84f159c5159 Attempt more AppleScript support --- diff --git a/Captura/CapturaApp.swift b/Captura/CapturaApp.swift index c6ec9f0..d954b9f 100644 --- a/Captura/CapturaApp.swift +++ b/Captura/CapturaApp.swift @@ -6,7 +6,7 @@ import AVFoundation @main struct CapturaApp: App { - + @NSApplicationDelegateAdaptor(CapturaAppDelegate.self) var appDelegate var body: some Scene { @@ -20,7 +20,7 @@ struct CapturaApp: App { } } -class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate { +@objc(CapturaAppDelegate) class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate { @Environment(\.openURL) var openURL var statusItem: NSStatusItem! @@ -39,7 +39,7 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate { var remoteFiles: [CapturaRemoteFile] = [] var captureSessionConfiguration: CaptureSessionConfiguration = CaptureSessionConfiguration() - @objc var scriptedPreferences: ScriptedPreferences? + @objc dynamic var scriptedPreferences: ScriptedPreferences = ScriptedPreferences() func applicationDidFinishLaunching(_ notification: Notification) { setupStatusBar() @@ -50,8 +50,6 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate { object: nil) closeWindow() fetchRemoteItems() - - scriptedPreferences = ScriptedPreferences() } // MARK: - Setup Functions @@ -101,7 +99,7 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate { window.close() } } - + // MARK: - URL Event Handler func application(_ application: NSApplication, open urls: [URL]) { @@ -112,11 +110,10 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate { case let .configure(config): CapturaSettings.apply(config) case let .record(config): - let config = CaptureSessionConfiguration(from: config) - NotificationCenter.default.post(name: .startAreaSelection, object: nil, userInfo: [ + NotificationCenter.default.post(name: .setCaptureSessionConfiguration, object: nil, userInfo: [ "config": config ]) - NotificationCenter.default.post(name: .startAreaSelection, object: nil, userInfo: nil) + NotificationCenter.default.post(name: .startAreaSelection, object: nil, userInfo: nil) } } } diff --git a/Captura/Scripting/Captura.sdef b/Captura/Scripting/Captura.sdef index 82cf06f..ca49d17 100644 --- a/Captura/Scripting/Captura.sdef +++ b/Captura/Scripting/Captura.sdef @@ -1,19 +1,24 @@ - + + + + + + - - - + + + - - - - - + + + + + @@ -24,7 +29,7 @@ - + diff --git a/Captura/Scripting/RecordCommand.swift b/Captura/Scripting/RecordCommand.swift index 8db2656..9d25b59 100644 --- a/Captura/Scripting/RecordCommand.swift +++ b/Captura/Scripting/RecordCommand.swift @@ -3,13 +3,8 @@ import Foundation @objc(RecordCommand) class RecordCommand: NSScriptCommand { override func performDefaultImplementation() -> Any? { - print("AAAH \(self.directParameter)") - guard let args = self.directParameter as? [String: Any] else { - return nil - } - - print("AAH COMMANDS \(args)") + let args = self.directParameter as? [String: Any] ?? [:] // Here you can extract the parameters from the args dictionary and configure your settings let x = args["x"] as? Int @@ -26,8 +21,6 @@ class RecordCommand: NSScriptCommand { let autoStart = args["auto_start"] as? Bool let maxLength = args["max_length"] as? Int - print("AAH WIDTH \(width)") - var skipBackend = false if let backendString = args["backend"] as? String { if backendString == "" { diff --git a/Captura/Scripting/ScriptedPreferences.swift b/Captura/Scripting/ScriptedPreferences.swift index b6aa719..2606ff7 100644 --- a/Captura/Scripting/ScriptedPreferences.swift +++ b/Captura/Scripting/ScriptedPreferences.swift @@ -1,5 +1,6 @@ import Foundation +@objc(ScriptedPreferences) class ScriptedPreferences: NSObject { @objc dynamic var fps: Int { get {