Cleanup

src/AeroSpaceApp.swift

@@ -3,7 +3,6 @@ import SwiftUI
 
 @main
 struct AeroSpaceApp: App {
-    var hotKeys: [HotKey] = [] // Keep hotkeys in memory
     @StateObject var viewModel = TrayMenuModel.shared
 
     init() {
@@ -26,9 +25,9 @@ struct AeroSpaceApp: App {
             refreshSession {
                 var focused = CommandSubject.focused
                 if startedAtLogin {
-                    config.afterLoginCommand.run(&focused)
+                    _ = config.afterLoginCommand.run(&focused)
                 }
-                config.afterStartupCommand.run(&focused)
+                _ = config.afterStartupCommand.run(&focused)
             }
         }
     }

src/command/Command.swift

@@ -9,15 +9,11 @@ extension Command {
         return [self].run(&subject, &stdout)
     }
 
-    func run(_ subject: inout CommandSubject) -> Bool {
-        check(Thread.current.isMainThread)
-        var devNull = ""
-        return run(&subject, &devNull)
-    }
-
     func runOnFocusedSubject() {
+        check(Thread.current.isMainThread)
         var focused = CommandSubject.focused
-        _ = run(&focused)
+        var devNull = ""
+        _ = run(&focused, &devNull)
     }
 
     var isExec: Bool { self is ExecAndWaitCommand || self is ExecAndForgetCommand }

src/command/parse/parseCmdArgsUtils.swift

@@ -56,6 +56,21 @@ enum ParsedCmd<T> {
             return .failure(fail)
         }
     }
+
+    func unwrap() -> (T?, String?, String?) {
+        var command: T? = nil
+        var error: String? = nil
+        var help: String? = nil
+        switch self {
+        case .cmd(let _command):
+            command = _command
+        case .help(let _help):
+            help = _help
+        case .failure(let _error):
+            error = _error
+        }
+        return (command, help, error)
+    }
 }
 
 func parseRawCmdArgs<T : RawCmdArgs>(_ raw: T, _ args: [String]) -> ParsedCmd<T> {

src/server.swift

@@ -35,23 +35,7 @@ private func newConnection(_ socket: Socket) async { // todo add exit codes
     while true {
         _ = try? Socket.wait(for: [socket], timeout: 0, waitForever: true)
         guard let string = (try? socket.readString()) else { return }
-        let command: Command?
-        let err: String?
-        let help: String?
-        switch parseCommand(string) {
-        case .cmd(let _command):
-            command = _command
-            help = nil
-            err = nil
-        case .help(let _help):
-            command = nil
-            help = _help
-            err = nil
-        case .failure(let _error):
-            command = nil
-            help = nil
-            err = _error
-        }
+        let (command, help, err) = parseCommand(string).unwrap()
         guard let isEnabled = await Task(operation: { @MainActor in TrayMenuModel.shared.isEnabled }).result.getOrNil() else {
             _ = try? socket.write(from: "1Unknown failure during isEnabled server state access")
             continue