feat: allow custom commands to boot devices

okwasniewski · Jul 12, 2023 · de0eddf · de0eddf
1 parent 8db3798
commit de0eddf
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 10 deletions.
diff --git a/MiniSim/Menu.swift b/MiniSim/Menu.swift
@@ -164,10 +164,12 @@ class Menu: NSMenu {
             case .customCommand:
                 let iosCommands = getAdditionalCommands(platform: .ios)
                 guard let command = iosCommands.first(where: {$0.name == sender.title}) else { return }
-                do {
-                    try deviceService.runCustomCommand(device, command: command)
-                } catch {
-                    NSAlert.showError(message: error.localizedDescription)
+                DispatchQueue.global().async { [self] in
+                    do {
+                        try deviceService.runCustomCommand(device, command: command)
+                    } catch {
+                        NSAlert.showError(message: error.localizedDescription)
+                    }
                 }
             default:
                 break
@@ -305,6 +307,9 @@ class Menu: NSMenu {
             if item.needBootedDevice && !booted {
                 continue
             }
+            if item.bootsDevice ?? false && booted {
+                continue
+            }
             menuItem.image = NSImage(systemSymbolName: item.icon, accessibilityDescription: item.name)
             menuItem.title = item.name
             subMenu.addItem(menuItem)
@@ -331,6 +336,9 @@ class Menu: NSMenu {
             if item.needBootedDevice && !booted {
                 continue
             }
+            if item.bootsDevice ?? false && booted {
+                continue
+            }
             menuItem.image = NSImage(systemSymbolName: item.icon, accessibilityDescription: item.name)
             menuItem.title = item.name
             subMenu.addItem(menuItem)

diff --git a/MiniSim/MiniSim.swift b/MiniSim/MiniSim.swift
@@ -28,7 +28,7 @@ class MiniSim: NSObject {
         settingsController.window?.delegate = self
 
         appendMenu()
-        self.menu.getDevices()
+        menu.getDevices()
         initObservers()
     }
 

diff --git a/MiniSim/Model/Command.swift b/MiniSim/Model/Command.swift
@@ -9,9 +9,34 @@ import Foundation
 
 struct Command: Identifiable, Codable, Hashable {
     var id = UUID()
+    /**
+     Name of the command shown in the menubar.
+     */
     let name: String
+
+    /**
+     Actual command to execute for eg: `adb devices`.
+     */
     let command: String
+
+    /**
+     SFSymbol name - shown in the menu bar.
+     */
     let icon: String
+
+    /**
+     Platform on which command will be executed.
+     */
     let platform: Platform
-    let needBootedDevice: Bool
+
+    /**
+     Determines if command will need a booted device to execute.
+     */
+    var needBootedDevice: Bool
+
+    /**
+     Determines if command boots device.
+     Needs to be optional to preserve backwards compatibility with data stored in UserDefaults.
+     */
+    var bootsDevice: Bool?
 }
diff --git a/MiniSim/Service/DeviceService.swift b/MiniSim/Service/DeviceService.swift
@@ -61,6 +61,9 @@ class DeviceService: DeviceServiceProtocol {
 
         do {
             try shellOut(to: commandToExecute)
+            if (command.bootsDevice ?? false && command.platform == .ios) {
+                try? launchSimulatorApp(uuid: deviceID)
+            }
             NotificationCenter.default.post(name: .commandDidSucceed, object: nil)
         } catch {
             throw CustomCommandError.commandError(errorMessage: error.localizedDescription)

diff --git a/MiniSim/Views/CustomCommands/CustomCommandForm.swift b/MiniSim/Views/CustomCommands/CustomCommandForm.swift
@@ -74,9 +74,18 @@ struct CustomCommandForm: View {
             }
 
             Toggle(isOn: $viewModel.needsBootedDevice, label: {
-                Text("Booted device")
+                Text("Needs booted device")
             })
+            .help("Determines if command will need a booted device to execute.")
             .toggleStyle(.switch)
+            .disabled(viewModel.bootsDevice)
+
+            Toggle(isOn: $viewModel.bootsDevice, label: {
+                Text("Boots device")
+            })
+            .help("Determines if executed command boots device. This command will be hidden on booted devices.")
+            .toggleStyle(.switch)
+            .disabled(viewModel.needsBootedDevice)
 
             HStack {
                 HStack {
@@ -87,7 +96,17 @@ struct CustomCommandForm: View {
                 }
                 Spacer()
                 Button(command != nil ? "Update" : "Add") {
-                    onSubmit(Command(name: viewModel.commandName, command: viewModel.command, icon: viewModel.icon, platform: viewModel.platform, needBootedDevice: viewModel.needsBootedDevice), command)
+                    onSubmit(
+                        Command(
+                            name: viewModel.commandName,
+                            command: viewModel.command,
+                            icon: viewModel.icon,
+                            platform: viewModel.platform,
+                            needBootedDevice: viewModel.needsBootedDevice,
+                            bootsDevice: viewModel.bootsDevice
+                        ),
+                        command
+                    )
                     viewModel.clearForm()
                 }
                 .buttonStyle(.borderedProminent)
@@ -103,7 +122,14 @@ struct CustomCommandForm: View {
         }
         .onAppear {
             if let command {
-                viewModel.onAppear(commandName: command.name, command: command.command, needsBootedDevice: command.needBootedDevice, platform: command.platform, icon: command.icon)
+                viewModel.onAppear(
+                    commandName: command.name,
+                    command: command.command,
+                    needsBootedDevice: command.needBootedDevice,
+                    bootsDevice: command.bootsDevice ?? false,
+                    platform: command.platform,
+                    icon: command.icon
+                )
             }
             viewModel.onAppear(allCommands: allCommands, isUpdating: command != nil)
         }

diff --git a/MiniSim/Views/CustomCommands/CustomCommandFormViewModel.swift b/MiniSim/Views/CustomCommands/CustomCommandFormViewModel.swift
@@ -13,6 +13,7 @@ extension CustomCommandForm {
         @Published var commandName = ""
         @Published var command = ""
         @Published var needsBootedDevice = false
+        @Published var bootsDevice = false
         @Published var platform: Platform = Platform.android
         @Published var icon = "info"
 
@@ -21,10 +22,11 @@ extension CustomCommandForm {
         var allCommands: [Command] = []
         var isUpdating: Bool = false
 
-        func onAppear(commandName: String = "", command: String = "", needsBootedDevice: Bool = false, platform: Platform = Platform.android, icon: String = "info", iconPickerPresented: Bool = false) {
+        func onAppear(commandName: String = "", command: String = "", needsBootedDevice: Bool = false, bootsDevice: Bool = false, platform: Platform = Platform.android, icon: String = "info", iconPickerPresented: Bool = false) {
             self.commandName = commandName
             self.command = command
             self.needsBootedDevice = needsBootedDevice
+            self.bootsDevice = bootsDevice
             self.platform = platform
             self.icon = icon
             self.iconPickerPresented = iconPickerPresented