feat: add wezterm support

Author: okwasniewski

MiniSim/Service/DeviceService.swift

@@ -412,12 +412,10 @@ extension DeviceService {
     guard let deviceId = device.identifier else {
       throw DeviceError.deviceNotFound
     }
-    guard let preferedTerminal = Terminal(
-      rawValue: UserDefaults.standard.preferedTerminal ?? Terminal.terminal.rawValue
-    )
-    else { return  }
-    let terminal = TerminalService.getTerminal(type: preferedTerminal)
-    try TerminalService.launchTerminal(terminal: terminal, deviceId: deviceId)
+
+    guard let adbPath = try? ADB.getAdbPath() else { return }
+    let logcatCommand = "\(adbPath) -s \(deviceId) logcat -v color"
+    try TerminalService.launchTerminal(command: logcatCommand)
   }
 
   static func handleAndroidAction(device: Device, commandTag: SubMenuItems.Tags, itemName: String) {

MiniSim/Service/Terminal/Terminal.swift

@@ -10,7 +10,7 @@ import ShellOut
 
 protocol TerminalServiceProtocol {
     static func getTerminal(type: Terminal) -> TerminalApp
-    static func launchTerminal(terminal: TerminalApp, deviceId: String) throws
+    static func launchTerminal(command: String, terminal: TerminalApp) throws
 }
 
 class TerminalService: TerminalServiceProtocol {
@@ -20,12 +20,22 @@ class TerminalService: TerminalServiceProtocol {
             return AppleTerminal()
         case .iterm:
             return ITermTerminal()
+        case .wezterm:
+            return WezTermTerminal()
         }
     }
 
-    static func launchTerminal(terminal: TerminalApp, deviceId: String) throws {
-        let logcatCommand = "adb -s \(deviceId) logcat -v color"
-        let terminalScript = terminal.getLaunchScript(deviceId: deviceId, logcatCommand: logcatCommand)
+    private static func getPrefferedTerminal() -> TerminalApp {
+        guard let preferedTerminal = Terminal(
+          rawValue: UserDefaults.standard.preferedTerminal ?? Terminal.terminal.rawValue
+        )
+        else { return getTerminal(type: Terminal.terminal) }
+
+        return getTerminal(type: preferedTerminal)
+    }
+
+    static func launchTerminal(command: String, terminal: TerminalApp = getPrefferedTerminal()) throws {
+        let terminalScript = terminal.getLaunchScript(logcatCommand: command)
         try shellOut(to: "osascript -e '\(terminalScript)'")
     }
 }

MiniSim/Service/Terminal/TerminalApps.swift

@@ -9,17 +9,18 @@ import Foundation
 
 protocol TerminalApp {
     var name: String { get }
-    func getLaunchScript(deviceId: String, logcatCommand: String) -> String
+    func getLaunchScript(logcatCommand: String) -> String
 }
 
 enum Terminal: String, CaseIterable {
     case terminal = "Terminal"
     case iterm = "iTerm"
+    case wezterm = "WezTerm"
 }
 
 struct AppleTerminal: TerminalApp {
     var name: String = "Terminal"
-    func getLaunchScript(deviceId: String, logcatCommand: String) -> String {
+    func getLaunchScript(logcatCommand: String) -> String {
         """
             tell app \"Terminal\"
                 activate
@@ -32,7 +33,7 @@ struct AppleTerminal: TerminalApp {
 struct ITermTerminal: TerminalApp {
     var name: String = "iTerm"
 
-    func getLaunchScript(deviceId: String, logcatCommand: String) -> String {
+    func getLaunchScript(logcatCommand: String) -> String {
         """
             tell app \"iTerm\"
                 set newWindow to (create window with default profile)
@@ -43,3 +44,14 @@ struct ITermTerminal: TerminalApp {
         """
     }
 }
+
+struct WezTermTerminal: TerminalApp {
+    var name: String = "WezTerm"
+
+    func getLaunchScript(logcatCommand: String) -> String {
+        """
+            tell application \"wezterm\" to activate
+            do shell script \"/Applications/WezTerm.app/Contents/MacOS/wezterm cli spawn \(logcatCommand)\"
+        """
+    }
+}