feat: get commands command

okwasniewski · Aug 15, 2023 · 2948554 · 2948554
1 parent ba911ae
commit 2948554
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/MiniSim/AppleScript Commands/GetCommands.swift b/MiniSim/AppleScript Commands/GetCommands.swift
@@ -14,29 +14,31 @@ class GetCommands: NSScriptCommand {
             let argument = self.property(forKey: "platform") as? String,
             let platform = Platform(rawValue: argument)
         else {
-            return "Error: Unexpected argument passed"
+            scriptErrorNumber = NSRequiredArgumentsMissingScriptError;
+            return nil;
         }
 
         do {
             var commands: [Command] = []
             switch platform {
             case .android:
-                commands = AndroidSubMenuItem.allCases.map { item in
+                commands = AndroidSubMenuItem.allCases.compactMap { item in
                     item.CommandItem
                 }
             case .ios:
-                commands = IOSSubMenuItem.allCases.map { item in
+                commands = IOSSubMenuItem.allCases.compactMap { item in
                     item.CommandItem
                 }
             }
 
-            let customCommands = DeviceService.getCustomCommands(platform: platform)
-            commands.append(contentsOf: customCommands)
+//            let customCommands = DeviceService.getCustomCommands(platform: platform)
+//            commands.append(contentsOf: customCommands)
 
             return try self.encode(commands)
 
         } catch {
-            return "Error: failed to get commands"
+            scriptErrorNumber = NSInternalScriptError;
+            return nil
         }
 
     }

diff --git a/MiniSim/AppleScript Commands/LaunchDeviceCommand.swift b/MiniSim/AppleScript Commands/LaunchDeviceCommand.swift
@@ -26,20 +26,20 @@ class LaunchDeviceCommand: NSScriptCommand {
             }
 
             if device.booted {
-                DispatchQueue.global().async {
+                DispatchQueue.global(qos: .userInitiated).async {
                     DeviceService.focusDevice(device)
                 }
-                return true
+                return "OK"
             }
 
-            DispatchQueue.global().async {
+            DispatchQueue.global(qos: .userInitiated).async {
                 if device.platform == .android {
                     try? DeviceService.launchDevice(name: device.name, additionalArguments: [])
                 } else {
                     try? DeviceService.launchDevice(uuid: device.ID ?? "")
                 }
             }
-            return true
+            return "OK"
         } catch {
             scriptErrorNumber = NSInternalScriptError;
             return nil

diff --git a/MiniSim/AppleScript Commands/MiniSim.sdef b/MiniSim/AppleScript Commands/MiniSim.sdef
@@ -25,5 +25,14 @@
             </parameter>
             <result type="text" description="Response code"/>
         </command>
+
+        <command name="getCommands" code="MinSGetc">
+            <cocoa class="MiniSim.GetCommands"/>
+            <access-group identifier="*"/>
+            <parameter code="plat" name="platform" description="Platform to get. Can be either android | ios." type="text">
+                <cocoa key="platform"/>
+            </parameter>
+            <result type="text" description="Response code"/>
+        </command>
     </suite>
 </dictionary>
diff --git a/MiniSim/MenuItems/AndroidSubMenuItem.swift b/MiniSim/MenuItems/AndroidSubMenuItem.swift
@@ -83,7 +83,10 @@ enum AndroidSubMenuItem: Int, CaseIterable {
         }
     }
 
-    var CommandItem: Command {
+    var CommandItem: Command? {
+        if self == .separator || self == .customCommand {
+            return nil
+        }
         return Command(name: self.title, command: "", icon: "", platform: Platform.android, needBootedDevice: needBootedDevice)
     }
 }
diff --git a/MiniSim/MenuItems/IOSSubMenuItem.swift b/MiniSim/MenuItems/IOSSubMenuItem.swift
@@ -50,7 +50,10 @@ enum IOSSubMenuItem: Int, CaseIterable {
         }
     }
 
-    var CommandItem: Command {
+    var CommandItem: Command? {
+        if self == .separator || self == .customCommand {
+            return nil
+        }
         return Command(name: self.title, command: "", icon: "", platform: Platform.ios, needBootedDevice: false)
     }
 }