From a8a8831c922134864ae0afcd856da72800a0ac71 Mon Sep 17 00:00:00 2001 From: Mark Gregory Date: Fri, 23 Oct 2026 09:51:58 +0100 Subject: [PATCH] updates to launcer --- .../OrionMenuView.swift.bak-20261023-083234 | 162 -------- .../OrionMenuView.swift.bak-20261023-093051 | 217 ----------- .../OrionMenuView.swift.bak-20261023-094430 | 319 ---------------- .../OrionMenuView.swift.bak-20261023-094858 | 326 ---------------- ...rionVMController.swift.bak-20261023-083234 | 337 ----------------- ...rionVMController.swift.bak-20261023-094430 | 358 ------------------ .../SettingsView.swift.bak-20261023-083234 | 78 ---- scripts/build.sh.bak-20261023-094858 | 49 --- scripts/test.sh.bak-20261023-094858 | 41 -- 9 files changed, 1887 deletions(-) delete mode 100644 OrionToolbar/OrionMenuView.swift.bak-20261023-083234 delete mode 100644 OrionToolbar/OrionMenuView.swift.bak-20261023-093051 delete mode 100644 OrionToolbar/OrionMenuView.swift.bak-20261023-094430 delete mode 100644 OrionToolbar/OrionMenuView.swift.bak-20261023-094858 delete mode 100644 OrionToolbar/OrionVMController.swift.bak-20261023-083234 delete mode 100644 OrionToolbar/OrionVMController.swift.bak-20261023-094430 delete mode 100644 OrionToolbar/SettingsView.swift.bak-20261023-083234 delete mode 100755 scripts/build.sh.bak-20261023-094858 delete mode 100755 scripts/test.sh.bak-20261023-094858 diff --git a/OrionToolbar/OrionMenuView.swift.bak-20261023-083234 b/OrionToolbar/OrionMenuView.swift.bak-20261023-083234 deleted file mode 100644 index f058f2d..0000000 --- a/OrionToolbar/OrionMenuView.swift.bak-20261023-083234 +++ /dev/null @@ -1,162 +0,0 @@ -import AppKit -import SwiftUI - -struct OrionMenuView: View { - @EnvironmentObject private var vm: OrionVMController - @Environment(\.openSettings) private var openSettings - @State private var expanded: Set = [] - @State private var expandedServers: Set = [] - - private var groups: [String] { - let order = ["Windows", "Ubuntu", "Debian", "Fedora", "CentOS", "Alpine", "Oracle Linux", "Rocky Linux", "AlmaLinux", "Arch Linux", "Gentoo", "FreeBSD", "Other"] - return order.filter { os in vm.discoveredVMs.contains { $0.operatingSystem == os } } - } - - var body: some View { - VStack(spacing: 0) { - HStack { - Label("OrionToolbar", systemImage: "server.rack").font(.headline) - Spacer() - if vm.discovering { ProgressView().controlSize(.small) } - Button { Task { await vm.discoverVMs() } } label: { Image(systemName: "arrow.clockwise") } - .buttonStyle(.borderless).help("Refresh virtual machines") - }.padding(14) - Divider() - ScrollView { - VStack(alignment: .leading, spacing: 10) { - Text("PARALLELS VIRTUAL MACHINES").font(.caption.bold()).foregroundStyle(.secondary) - if vm.discoveredVMs.isEmpty { - Text(vm.discovering ? "Discovering virtual machines…" : "No VMs found. Use Refresh to try again.") - .foregroundStyle(.secondary).padding(.vertical, 18) - } - ForEach(groups, id: \.self) { os in - VStack(alignment: .leading, spacing: 4) { - Button { - if !expanded.insert(os).inserted { expanded.remove(os) } - } label: { - HStack { - Image(systemName: expanded.contains(os) ? "chevron.down" : "chevron.right") - .frame(width: 14) - Text(os).fontWeight(.semibold) - Spacer() - Text("\(vm.discoveredVMs.filter { $0.operatingSystem == os }.count)") - .foregroundStyle(.secondary) - }.contentShape(Rectangle()).padding(.vertical, 5) - }.buttonStyle(.plain) - if expanded.contains(os) { - ForEach(vm.discoveredVMs.filter { $0.operatingSystem == os }) { machine in - vmRow(machine) - } - } - } - } - if !vm.discoveredVMs.isEmpty { - HStack { - Button("Select All") { vm.selectAllVMs() } - Button("Clear") { vm.clearVMSelection() } - Spacer() - Button("Integrate Selected") { vm.integrateSelectedVMs() } - .disabled(vm.selectedVMIDs.isEmpty) - }.font(.caption) - } - Divider() - Text("INTEGRATED SERVERS").font(.caption.bold()).foregroundStyle(.secondary) - ForEach(vm.servers) { server in serverRow(server) } - }.padding(14) - }.frame(height: 490) - Divider() - HStack { - Button("Parallels") { vm.openParallels() } - Spacer() - Button("Settings…") { - openSettings() - NSApplication.shared.activate(ignoringOtherApps: true) - } - Button("Quit") { NSApplication.shared.terminate(nil) } - }.padding(14) - } - .frame(width: 460) - .task { await vm.discoverVMs() } - .alert("OrionToolbar", isPresented: Binding( - get: { vm.lastError != nil }, - set: { if !$0 { vm.lastError = nil } } - )) { Button("OK") { vm.lastError = nil } } - message: { Text(vm.lastError ?? "") } - } - - private func vmRow(_ machine: ParallelsVM) -> some View { - HStack(spacing: 9) { - Toggle("", isOn: Binding( - get: { vm.selectedVMIDs.contains(machine.id) }, - set: { selected in - if selected { vm.selectedVMIDs.insert(machine.id) } - else { vm.selectedVMIDs.remove(machine.id) } - } - )).labelsHidden().toggleStyle(.checkbox) - vmIcon(machine) - VStack(alignment: .leading, spacing: 2) { - Text(machine.name).lineLimit(1) - Text(machine.status.capitalized).font(.caption) - .foregroundStyle(machine.status == "running" ? Color.green : Color.secondary) - } - Spacer(minLength: 4) - if vm.busyVMIDs.contains(machine.id) { ProgressView().controlSize(.small) } - else if machine.status == "stopped" { - Button("Start") { vm.operate(machine, action: "start") } - } else if machine.status == "running" { - Button("Stop") { vm.operate(machine, action: "stop") } - } else if machine.status == "suspended" { - Button("Resume") { vm.operate(machine, action: "resume") } - } - if vm.isIntegrated(machine) { - Image(systemName: "checkmark.circle.fill").foregroundStyle(.green).help("Integrated") - } else { - Button { vm.integrate(machine) } label: { Image(systemName: "plus.circle") } - .help("Integrate VM") - } - }.padding(.leading, 20).padding(.vertical, 4) - } - - private func vmIcon(_ machine: ParallelsVM) -> some View { - Group { - if let icon = vm.icon(for: machine) { - Image(nsImage: icon).resizable().scaledToFit() - } else { - Image(systemName: machine.symbol).resizable().scaledToFit().padding(4) - } - }.frame(width: 30, height: 30) - } - - private func serverRow(_ server: ServerDefinition) -> some View { - let status = vm.status(for: server) - return VStack(alignment: .leading, spacing: 6) { - Button { - if !expandedServers.insert(server.id).inserted { expandedServers.remove(server.id) } - } label: { - HStack { - Image(systemName: expandedServers.contains(server.id) ? "chevron.down" : "chevron.right") - if let icon = vm.icon(for: server) { - Image(nsImage: icon).resizable().scaledToFit().frame(width: 25, height: 25) - } else { Image(systemName: "server.rack") } - Text(server.name) - Spacer() - Text(status.title).foregroundStyle(.secondary) - }.contentShape(Rectangle()) - }.buttonStyle(.plain) - if expandedServers.contains(server.id) { - HStack { - if status == .stopped { - Button("Start") { vm.start(server) } - } else if status == .running { - Button("Stop") { vm.stop(server) } - Button("Restart") { vm.restart(server) } - } - Button("SSH") { vm.openSSH(server) } - .disabled(status != .running || server.host.isEmpty || server.sshUser.isEmpty) - Button("Mailpit") { vm.openMailpit(server) } - .disabled(status != .running || server.host.isEmpty || server.mailpitPort == nil) - }.padding(.leading, 30) - } - }.padding(.vertical, 4) - } -} diff --git a/OrionToolbar/OrionMenuView.swift.bak-20261023-093051 b/OrionToolbar/OrionMenuView.swift.bak-20261023-093051 deleted file mode 100644 index 870392f..0000000 --- a/OrionToolbar/OrionMenuView.swift.bak-20261023-093051 +++ /dev/null @@ -1,217 +0,0 @@ -import AppKit -import SwiftUI - -struct OrionMenuView: View { - @EnvironmentObject private var vm: OrionVMController - @Environment(\.openSettings) private var openSettings - @State private var expanded: Set = [] - @State private var expandedServers: Set = [] - - private var groups: [String] { - let order = ["Windows", "Ubuntu", "Debian", "Fedora", "CentOS", "Alpine", "Oracle Linux", "Rocky Linux", "AlmaLinux", "Arch Linux", "Gentoo", "FreeBSD", "Other"] - return order.filter { os in vm.discoveredVMs.contains { $0.operatingSystem == os } } - } - - var body: some View { - VStack(spacing: 0) { - HStack { - Label("OrionToolbar", systemImage: "server.rack").font(.headline) - Spacer() - if vm.discovering { ProgressView().controlSize(.small) } - Button { Task { await vm.discoverVMs() } } label: { Image(systemName: "arrow.clockwise") } - .buttonStyle(.borderless).help("Refresh virtual machines") - }.padding(14) - Divider() - ScrollView { - VStack(alignment: .leading, spacing: 10) { - runningSection - Divider() - Text("PARALLELS VIRTUAL MACHINES").font(.caption.bold()).foregroundStyle(.secondary) - if vm.discoveredVMs.isEmpty { - Text(vm.discovering ? "Discovering virtual machines…" : "No VMs found. Use Refresh to try again.") - .foregroundStyle(.secondary).padding(.vertical, 18) - } - ForEach(groups, id: \.self) { os in - VStack(alignment: .leading, spacing: 4) { - Button { - if !expanded.insert(os).inserted { expanded.remove(os) } - } label: { - HStack { - Image(systemName: expanded.contains(os) ? "chevron.down" : "chevron.right") - .frame(width: 14) - Text(os).fontWeight(.semibold) - Spacer() - Text("\(vm.discoveredVMs.filter { $0.operatingSystem == os }.count)") - .foregroundStyle(.secondary) - }.contentShape(Rectangle()).padding(.vertical, 5) - }.buttonStyle(.plain) - if expanded.contains(os) { - ForEach(vm.discoveredVMs.filter { $0.operatingSystem == os }) { machine in - vmRow(machine) - } - } - } - } - if !vm.discoveredVMs.isEmpty { - HStack { - Button("Select All") { vm.selectAllVMs() } - Button("Clear") { vm.clearVMSelection() } - Spacer() - Button("Integrate Selected") { vm.integrateSelectedVMs() } - .disabled(vm.selectedVMIDs.isEmpty) - }.font(.caption) - } - Divider() - Text("INTEGRATED SERVERS").font(.caption.bold()).foregroundStyle(.secondary) - ForEach(vm.servers) { server in serverRow(server) } - }.padding(14) - }.frame(height: 490) - Divider() - HStack { - Button("Parallels") { vm.openParallels() } - Spacer() - Button("Settings…") { - openSettings() - NSApplication.shared.activate(ignoringOtherApps: true) - } - Button("Quit") { NSApplication.shared.terminate(nil) } - }.padding(14) - } - .frame(width: 460) - .task { await vm.discoverVMs() } - .alert("OrionToolbar", isPresented: Binding( - get: { vm.lastError != nil }, - set: { if !$0 { vm.lastError = nil } } - )) { Button("OK") { vm.lastError = nil } } - message: { Text(vm.lastError ?? "") } - } - - private var runningSection: some View { - VStack(alignment: .leading, spacing: 8) { - HStack { - Label("RUNNING VIRTUAL MACHINES", systemImage: "play.circle.fill") - .font(.caption.bold()) - Spacer() - Text("\(vm.runningVMs.count) running") - .font(.caption) - .foregroundStyle(.secondary) - } - if vm.runningVMs.isEmpty { - Text("No running VMs detected") - .font(.caption) - .foregroundStyle(.secondary) - .padding(.vertical, 8) - } - ForEach(vm.runningVMs) { machine in - VStack(alignment: .leading, spacing: 6) { - HStack { - vmIcon(machine) - VStack(alignment: .leading, spacing: 2) { - Text(machine.name).fontWeight(.medium) - Text("Running").font(.caption).foregroundStyle(.green) - } - Spacer() - if vm.busyVMIDs.contains(machine.id) { - ProgressView().controlSize(.small) - } - } - HStack { - Button("Stop") { vm.operate(machine, action: "stop") } - Button("Restart") { vm.operate(machine, action: "restart") } - Button("Force Stop", role: .destructive) { - vm.operate(machine, action: "force-stop") - } - } - .controlSize(.small) - .disabled(vm.busyVMIDs.contains(machine.id)) - } - .padding(9) - .background(.quaternary.opacity(0.3), in: RoundedRectangle(cornerRadius: 8)) - } - } - } - - private func vmRow(_ machine: ParallelsVM) -> some View { - HStack(spacing: 9) { - Toggle("", isOn: Binding( - get: { vm.selectedVMIDs.contains(machine.id) }, - set: { selected in - if selected { vm.selectedVMIDs.insert(machine.id) } - else { vm.selectedVMIDs.remove(machine.id) } - } - )).labelsHidden().toggleStyle(.checkbox) - vmIcon(machine) - VStack(alignment: .leading, spacing: 2) { - Text(machine.name).lineLimit(1) - Text(machine.status.capitalized).font(.caption) - .foregroundStyle(machine.status == "running" ? Color.green : Color.secondary) - } - Spacer(minLength: 4) - if vm.busyVMIDs.contains(machine.id) { ProgressView().controlSize(.small) } - else if machine.status == "stopped" { - Button("Start") { vm.operate(machine, action: "start") } - } else if machine.status == "running" { - Button("Stop") { vm.operate(machine, action: "stop") } - } else if machine.status == "suspended" { - Button("Resume") { vm.operate(machine, action: "resume") } - } else { - Button("Start") { vm.operate(machine, action: "start") } - .help("Try starting VM (Parallels reports: \(machine.status))") - } - if vm.isIntegrated(machine) { - Image(systemName: "checkmark.circle.fill").foregroundStyle(.green).help("Integrated") - } else { - Button { vm.integrate(machine) } label: { Image(systemName: "plus.circle") } - .help("Integrate VM") - } - }.padding(.leading, 20).padding(.vertical, 4) - } - - private func vmIcon(_ machine: ParallelsVM) -> some View { - Group { - if let icon = vm.icon(for: machine) { - Image(nsImage: icon).resizable().scaledToFit() - } else { - Image(systemName: machine.symbol).resizable().scaledToFit().padding(4) - } - }.frame(width: 30, height: 30) - } - - private func serverRow(_ server: ServerDefinition) -> some View { - let status = vm.status(for: server) - return VStack(alignment: .leading, spacing: 6) { - Button { - if !expandedServers.insert(server.id).inserted { expandedServers.remove(server.id) } - } label: { - HStack { - Image(systemName: expandedServers.contains(server.id) ? "chevron.down" : "chevron.right") - if let icon = vm.icon(for: server) { - Image(nsImage: icon).resizable().scaledToFit().frame(width: 25, height: 25) - } else { Image(systemName: "server.rack") } - Text(server.name) - Spacer() - Text(status.title).foregroundStyle(.secondary) - }.contentShape(Rectangle()) - }.buttonStyle(.plain) - if expandedServers.contains(server.id) { - HStack { - if status == .stopped { - Button("Start") { vm.start(server) } - } else if status == .running { - Button("Stop") { vm.stop(server) } - Button("Restart") { vm.restart(server) } - } - Button("SSH") { vm.openSSH(server) } - .disabled(status != .running || server.host.isEmpty || server.sshUser.isEmpty) - Button("Mailpit") { vm.openMailpit(server) } - .disabled(status != .running || server.host.isEmpty || server.mailpitPort == nil) - Button("Remove", role: .destructive) { - expandedServers.remove(server.id) - vm.removeDefinition(server) - } - .help("Remove integration only; the VM is not deleted") - }.padding(.leading, 30) - } - }.padding(.vertical, 4) - } -} diff --git a/OrionToolbar/OrionMenuView.swift.bak-20261023-094430 b/OrionToolbar/OrionMenuView.swift.bak-20261023-094430 deleted file mode 100644 index 1dd9579..0000000 --- a/OrionToolbar/OrionMenuView.swift.bak-20261023-094430 +++ /dev/null @@ -1,319 +0,0 @@ -import AppKit -import SwiftUI - -private enum OrionStyle { - static let panel = Color(red: 0.105, green: 0.14, blue: 0.20) - static let card = Color(red: 0.15, green: 0.19, blue: 0.25) - static let blue = Color(red: 0.08, green: 0.39, blue: 0.91) - static let green = Color(red: 0.05, green: 0.88, blue: 0.49) - static let red = Color(red: 0.91, green: 0.19, blue: 0.23) - static let muted = Color(red: 0.62, green: 0.73, blue: 0.86) -} - -struct OrionMenuView: View { - @EnvironmentObject private var vm: OrionVMController - @Environment(\.openSettings) private var openSettings - @State private var showRunning = true - @State private var showAll = true - @State private var showIntegrated = true - @State private var pendingRemoval: ServerDefinition? - @State private var pendingForceStop: ParallelsVM? - - private var running: [ParallelsVM] { - vm.discoveredVMs.filter { $0.status.lowercased() == "running" } - } - - var body: some View { - VStack(spacing: 0) { - header - Divider().overlay(.white.opacity(0.10)) - ScrollView { - VStack(alignment: .leading, spacing: 15) { - section(icon: "play.fill", title: "Running Virtual Machines", count: "\(running.count) running", accent: OrionStyle.green, expanded: $showRunning) { - if running.isEmpty { - emptyState("No running virtual machines", icon: "moon.zzz") - } else { - ForEach(running) { machine in - runningRow(machine) - } - } - } - section(icon: "desktopcomputer", title: "All Virtual Machines", count: "\(vm.discoveredVMs.count) VMs", accent: .cyan, expanded: $showAll) { - if vm.discoveredVMs.isEmpty { - emptyState(vm.discovering ? "Discovering Parallels VMs…" : "No virtual machines found", icon: "desktopcomputer.trianglebadge.exclamationmark") - } else { - ForEach(vm.discoveredVMs) { machine in - machineRow(machine) - } - } - } - section(icon: "server.rack", title: "Integrated Servers", count: "\(vm.servers.count) servers", accent: OrionStyle.blue, expanded: $showIntegrated) { - if vm.servers.isEmpty { - emptyState("No integrations. Add a VM using + above.", icon: "plus.circle") - } else { - ForEach(vm.servers) { server in - integratedRow(server) - } - } - } - } - .padding(14) - } - .frame(height: 570) - Divider().overlay(.white.opacity(0.10)) - footer - } - .frame(width: 790) - .background( - LinearGradient(colors: [Color(red: 0.10, green: 0.15, blue: 0.23), Color(red: 0.075, green: 0.09, blue: 0.13)], startPoint: .topTrailing, endPoint: .bottomLeading) - ) - .preferredColorScheme(.dark) - .task { await vm.discoverVMs(); await vm.refreshAll() } - .alert("OrionToolbar", isPresented: Binding(get: { vm.lastError != nil }, set: { if !$0 { vm.lastError = nil } })) { - Button("OK") { vm.lastError = nil } - } message: { Text(vm.lastError ?? "") } - .confirmationDialog("Remove server integration?", isPresented: Binding(get: { pendingRemoval != nil }, set: { if !$0 { pendingRemoval = nil } }), titleVisibility: .visible) { - Button("Remove Integration", role: .destructive) { - if let server = pendingRemoval { vm.removeDefinition(server) } - pendingRemoval = nil - } - Button("Cancel", role: .cancel) { pendingRemoval = nil } - } message: { - Text("The Parallels virtual machine will not be deleted.") - } - .confirmationDialog("Force stop virtual machine?", isPresented: Binding(get: { pendingForceStop != nil }, set: { if !$0 { pendingForceStop = nil } }), titleVisibility: .visible) { - Button("Force Stop", role: .destructive) { - if let machine = pendingForceStop { vm.operate(machine, action: "force-stop") } - pendingForceStop = nil - } - Button("Cancel", role: .cancel) { pendingForceStop = nil } - } message: { Text("Force Stop immediately powers off the VM and can cause data loss.") } - } - - private var header: some View { - HStack(spacing: 12) { - Image(systemName: "server.rack") - .font(.system(size: 22, weight: .bold)) - .foregroundStyle(.cyan) - .frame(width: 37, height: 37) - .background(OrionStyle.blue.opacity(0.24), in: RoundedRectangle(cornerRadius: 10)) - Text("OrionToolbar").font(.system(size: 21, weight: .bold)) - Circle().fill(vm.discoveredVMs.isEmpty ? Color.orange : OrionStyle.green).frame(width: 8, height: 8) - Text(vm.discoveredVMs.isEmpty ? "Waiting for Parallels" : "Parallels Connected") - .foregroundStyle(OrionStyle.muted).font(.subheadline) - Spacer() - if vm.discovering { ProgressView().controlSize(.small) } - Button { Task { await vm.discoverVMs(); await vm.refreshAll() } } label: { - Image(systemName: "arrow.clockwise").font(.system(size: 16, weight: .semibold)) - }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Refresh virtual machines") - Button { showSettings() } label: { - Image(systemName: "gearshape.fill").font(.system(size: 16)) - }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Settings") - }.padding(.horizontal, 17).padding(.vertical, 13) - } - - private func section(icon: String, title: String, count: String, accent: Color, expanded: Binding, @ViewBuilder content: () -> Content) -> some View { - VStack(spacing: 4) { - Button { expanded.wrappedValue.toggle() } label: { - HStack(spacing: 10) { - Image(systemName: icon).font(.system(size: 17, weight: .bold)) - .foregroundStyle(accent).frame(width: 27) - Text(title).font(.system(size: 16, weight: .semibold)) - Spacer() - Text(count).font(.caption.weight(.medium)) - .foregroundStyle(accent) - .padding(.horizontal, 10).padding(.vertical, 5) - .background(accent.opacity(0.13), in: RoundedRectangle(cornerRadius: 8)) - Image(systemName: expanded.wrappedValue ? "chevron.up" : "chevron.down") - .font(.caption.weight(.bold)).foregroundStyle(OrionStyle.muted) - } - .contentShape(Rectangle()) - .padding(.horizontal, 11).padding(.vertical, 10) - }.buttonStyle(.plain) - if expanded.wrappedValue { - VStack(spacing: 3) { content() } - .padding(.horizontal, 5).padding(.bottom, 7) - } - } - .background(OrionStyle.panel.opacity(0.92), in: RoundedRectangle(cornerRadius: 16)) - .overlay(RoundedRectangle(cornerRadius: 16).strokeBorder(.white.opacity(0.09))) - } - - private func emptyState(_ title: String, icon: String) -> some View { - Label(title, systemImage: icon) - .font(.subheadline).foregroundStyle(OrionStyle.muted) - .frame(maxWidth: .infinity, alignment: .leading) - .padding(15) - } - - private func icon(_ machine: ParallelsVM) -> some View { - Group { - if let image = vm.icon(for: machine) { - Image(nsImage: image).resizable().scaledToFit() - } else { - Image(systemName: machine.operatingSystem == "Windows" ? "desktopcomputer" : "server.rack") - .font(.system(size: 21, weight: .medium)) - .foregroundStyle(.white) - .frame(maxWidth: .infinity, maxHeight: .infinity) - .background(osColor(machine.operatingSystem), in: Circle()) - } - }.frame(width: 36, height: 36) - } - - private func osColor(_ os: String) -> Color { - switch os { - case "Ubuntu": return .orange - case "Debian": return .pink - case "Fedora": return .blue - case "CentOS": return .purple - case "Alpine": return .teal - case "Windows": return .cyan - default: return OrionStyle.blue - } - } - - private func state(_ status: String) -> some View { - let s = status.lowercased() - let color: Color = s == "running" ? OrionStyle.green : (s == "stopped" ? OrionStyle.muted : .orange) - return HStack(spacing: 6) { - Circle().fill(color).frame(width: 8, height: 8) - Text(status.capitalized).font(.system(size: 12, weight: .medium)) - .foregroundStyle(color) - }.frame(width: 103, alignment: .leading) - } - - private func integrated(_ machine: ParallelsVM) -> ServerDefinition? { - vm.servers.first { $0.vmUUID == machine.id || $0.vmName == machine.name } - } - - private func runningRow(_ machine: ParallelsVM) -> some View { - HStack(spacing: 10) { - icon(machine) - Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 150, alignment: .leading) - state(machine.status) - Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress) - .font(.system(size: 11, design: .monospaced)) - .foregroundStyle(OrionStyle.muted).lineLimit(1).frame(width: 100, alignment: .leading) - Spacer(minLength: 0) - if let server = integrated(machine) { - action("SSH", "terminal", tint: OrionStyle.blue) { vm.openSSH(server) } - .disabled(server.host.isEmpty || server.sshUser.isEmpty) - action("Mailpit", "globe", tint: OrionStyle.blue) { vm.openMailpit(server) } - .disabled(server.host.isEmpty || server.mailpitPort == nil) - } - action("Restart", "arrow.clockwise", tint: OrionStyle.card) { vm.operate(machine, action: "restart") } - action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } - Menu { - Button("Force Stop", role: .destructive) { pendingForceStop = machine } - } label: { - Image(systemName: "ellipsis").frame(width: 16) - }.menuStyle(.borderlessButton).frame(width: 22) - .help("More VM actions") - } - .disabled(vm.busyVMIDs.contains(machine.id)) - .padding(.horizontal, 10).padding(.vertical, 7) - .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) - } - - private func machineRow(_ machine: ParallelsVM) -> some View { - HStack(spacing: 10) { - icon(machine) - Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 180, alignment: .leading) - state(machine.status) - Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress) - .font(.system(size: 11, design: .monospaced)) - .foregroundStyle(OrionStyle.muted).lineLimit(1) - Spacer(minLength: 2) - if vm.busyVMIDs.contains(machine.id) { ProgressView().controlSize(.small) } - else if machine.status.lowercased() == "running" { - action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } - } else if ["suspended", "paused"].contains(machine.status.lowercased()) { - action("Resume", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "resume") } - } else { - action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") } - } - if vm.isIntegrated(machine) { - Image(systemName: "checkmark.circle.fill").foregroundStyle(OrionStyle.green) - .frame(width: 28).help("Integrated") - } else { - Button { vm.integrate(machine) } label: { - Image(systemName: "plus.circle").font(.system(size: 20)) - }.buttonStyle(.plain).foregroundStyle(OrionStyle.muted) - .frame(width: 28).help("Integrate VM") - } - Menu { - Button("Open in Parallels") { vm.openParallels() } - if machine.status.lowercased() == "running" { - Button("Restart") { vm.operate(machine, action: "restart") } - Button("Force Stop", role: .destructive) { pendingForceStop = machine } - } - } label: { Image(systemName: "chevron.right").foregroundStyle(OrionStyle.muted) } - .menuStyle(.borderlessButton).frame(width: 22) - } - .padding(.horizontal, 10).padding(.vertical, 7) - .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) - } - - private func integratedRow(_ server: ServerDefinition) -> some View { - let machine = vm.discoveredVMs.first { $0.id == server.vmUUID || $0.name == server.vmName } - let status = machine?.status ?? "unavailable" - return HStack(spacing: 10) { - if let machine { icon(machine) } - else { Image(systemName: "server.rack").frame(width: 36, height: 36).foregroundStyle(.cyan) } - Text(server.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 125, alignment: .leading) - state(status) - Text(server.host.isEmpty ? "—" : server.host) - .font(.system(size: 11, design: .monospaced)).foregroundStyle(OrionStyle.muted) - .lineLimit(1).frame(width: 98, alignment: .leading) - Spacer(minLength: 0) - if let machine { - if status.lowercased() == "running" { - action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } - } else { - action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") } - } - } - action("SSH", "terminal", tint: OrionStyle.card) { vm.openSSH(server) } - .disabled(status.lowercased() != "running" || server.host.isEmpty || server.sshUser.isEmpty) - action("Mailpit", "globe", tint: OrionStyle.card) { vm.openMailpit(server) } - .disabled(status.lowercased() != "running" || server.host.isEmpty || server.mailpitPort == nil) - action("Remove", "trash", tint: OrionStyle.card) { pendingRemoval = server } - } - .padding(.horizontal, 10).padding(.vertical, 7) - .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) - } - - private func action(_ title: String, _ symbol: String, tint: Color, perform: @escaping () -> Void) -> some View { - Button(action: perform) { - Label(title, systemImage: symbol) - .font(.system(size: 11, weight: .semibold)) - .lineLimit(1) - .frame(minWidth: 56) - }.buttonStyle(OrionActionStyle(tint: tint)) - } - - private var footer: some View { - HStack { - action("Open Parallels", "macwindow", tint: OrionStyle.card) { vm.openParallels() } - Spacer() - action("Settings…", "gearshape", tint: OrionStyle.card) { showSettings() } - action("Quit", "power", tint: OrionStyle.card) { NSApplication.shared.terminate(nil) } - }.padding(.horizontal, 17).padding(.vertical, 12) - } - - private func showSettings() { - openSettings() - NSApplication.shared.activate(ignoringOtherApps: true) - } -} - -private struct OrionActionStyle: ButtonStyle { - let tint: Color - func makeBody(configuration: Configuration) -> some View { - configuration.label - .foregroundStyle(.white) - .padding(.horizontal, 10).padding(.vertical, 8) - .background(tint.opacity(configuration.isPressed ? 0.65 : 1), in: RoundedRectangle(cornerRadius: 8)) - .opacity(configuration.isPressed ? 0.8 : 1) - } -} diff --git a/OrionToolbar/OrionMenuView.swift.bak-20261023-094858 b/OrionToolbar/OrionMenuView.swift.bak-20261023-094858 deleted file mode 100644 index 30b33c9..0000000 --- a/OrionToolbar/OrionMenuView.swift.bak-20261023-094858 +++ /dev/null @@ -1,326 +0,0 @@ -import AppKit -import SwiftUI - -private enum OrionStyle { - static let panel = Color(red: 0.105, green: 0.14, blue: 0.20) - static let card = Color(red: 0.15, green: 0.19, blue: 0.25) - static let blue = Color(red: 0.08, green: 0.39, blue: 0.91) - static let green = Color(red: 0.05, green: 0.88, blue: 0.49) - static let red = Color(red: 0.91, green: 0.19, blue: 0.23) - static let muted = Color(red: 0.62, green: 0.73, blue: 0.86) -} - -struct OrionMenuView: View { - @EnvironmentObject private var vm: OrionVMController - @Environment(\.openSettings) private var openSettings - @State private var showRunning = true - @State private var showAll = true - @State private var showIntegrated = true - @State private var pendingRemoval: ServerDefinition? - @State private var pendingForceStop: ParallelsVM? - - private var running: [ParallelsVM] { - vm.discoveredVMs.filter { $0.status.lowercased() == "running" } - } - - var body: some View { - VStack(spacing: 0) { - header - Divider().overlay(.white.opacity(0.10)) - ScrollView { - VStack(alignment: .leading, spacing: 15) { - section(icon: "play.fill", title: "Running Virtual Machines", count: "\(running.count) running", accent: OrionStyle.green, expanded: $showRunning) { - if running.isEmpty { - emptyState("No running virtual machines", icon: "moon.zzz") - } else { - ForEach(running) { machine in - runningRow(machine) - } - } - } - section(icon: "desktopcomputer", title: "All Virtual Machines", count: "\(vm.discoveredVMs.count) VMs", accent: .cyan, expanded: $showAll) { - if vm.discoveredVMs.isEmpty { - emptyState(vm.discovering ? "Discovering Parallels VMs…" : "No virtual machines found", icon: "desktopcomputer.trianglebadge.exclamationmark") - } else { - ForEach(vm.discoveredVMs) { machine in - machineRow(machine) - } - } - } - section(icon: "server.rack", title: "Integrated Servers", count: "\(vm.servers.count) servers", accent: OrionStyle.blue, expanded: $showIntegrated) { - if vm.servers.isEmpty { - emptyState("No integrations. Add a VM using + above.", icon: "plus.circle") - } else { - ForEach(vm.servers) { server in - integratedRow(server) - } - } - } - } - .padding(14) - } - .frame(height: 610) - Divider().overlay(.white.opacity(0.10)) - footer - } - .frame(width: 960) - .background( - LinearGradient(colors: [Color(red: 0.10, green: 0.15, blue: 0.23), Color(red: 0.075, green: 0.09, blue: 0.13)], startPoint: .topTrailing, endPoint: .bottomLeading) - ) - .preferredColorScheme(.dark) - .task { await vm.discoverVMs(); await vm.refreshAll() } - .alert("OrionToolbar", isPresented: Binding(get: { vm.lastError != nil }, set: { if !$0 { vm.lastError = nil } })) { - Button("OK") { vm.lastError = nil } - } message: { Text(vm.lastError ?? "") } - .confirmationDialog("Remove server integration?", isPresented: Binding(get: { pendingRemoval != nil }, set: { if !$0 { pendingRemoval = nil } }), titleVisibility: .visible) { - Button("Remove Integration", role: .destructive) { - if let server = pendingRemoval { vm.removeDefinition(server) } - pendingRemoval = nil - } - Button("Cancel", role: .cancel) { pendingRemoval = nil } - } message: { - Text("The Parallels virtual machine will not be deleted.") - } - .confirmationDialog("Force stop virtual machine?", isPresented: Binding(get: { pendingForceStop != nil }, set: { if !$0 { pendingForceStop = nil } }), titleVisibility: .visible) { - Button("Force Stop", role: .destructive) { - if let machine = pendingForceStop { vm.operate(machine, action: "force-stop") } - pendingForceStop = nil - } - Button("Cancel", role: .cancel) { pendingForceStop = nil } - } message: { Text("Force Stop immediately powers off the VM and can cause data loss.") } - } - - private var header: some View { - HStack(spacing: 12) { - Image(systemName: "server.rack") - .font(.system(size: 22, weight: .bold)) - .foregroundStyle(.cyan) - .frame(width: 37, height: 37) - .background(OrionStyle.blue.opacity(0.24), in: RoundedRectangle(cornerRadius: 10)) - Text("OrionToolbar").font(.system(size: 21, weight: .bold)) - Circle().fill(vm.discoveredVMs.isEmpty ? Color.orange : OrionStyle.green).frame(width: 8, height: 8) - Text(vm.discoveredVMs.isEmpty ? "Waiting for Parallels" : "Parallels Connected") - .foregroundStyle(OrionStyle.muted).font(.subheadline) - Spacer() - if vm.discovering { ProgressView().controlSize(.small) } - Button { Task { await vm.discoverVMs(); await vm.refreshAll() } } label: { - Image(systemName: "arrow.clockwise").font(.system(size: 16, weight: .semibold)) - }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Refresh virtual machines") - Button { showSettings() } label: { - Image(systemName: "gearshape.fill").font(.system(size: 16)) - }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Settings") - }.padding(.horizontal, 17).padding(.vertical, 13) - } - - private func section(icon: String, title: String, count: String, accent: Color, expanded: Binding, @ViewBuilder content: () -> Content) -> some View { - VStack(spacing: 4) { - Button { expanded.wrappedValue.toggle() } label: { - HStack(spacing: 10) { - Image(systemName: icon).font(.system(size: 17, weight: .bold)) - .foregroundStyle(accent).frame(width: 27) - Text(title).font(.system(size: 16, weight: .semibold)) - Spacer() - Text(count).font(.caption.weight(.medium)) - .foregroundStyle(accent) - .padding(.horizontal, 10).padding(.vertical, 5) - .background(accent.opacity(0.13), in: RoundedRectangle(cornerRadius: 8)) - Image(systemName: expanded.wrappedValue ? "chevron.up" : "chevron.down") - .font(.caption.weight(.bold)).foregroundStyle(OrionStyle.muted) - } - .contentShape(Rectangle()) - .padding(.horizontal, 11).padding(.vertical, 10) - }.buttonStyle(.plain) - if expanded.wrappedValue { - VStack(spacing: 3) { content() } - .padding(.horizontal, 5).padding(.bottom, 7) - } - } - .background(OrionStyle.panel.opacity(0.92), in: RoundedRectangle(cornerRadius: 16)) - .overlay(RoundedRectangle(cornerRadius: 16).strokeBorder(.white.opacity(0.09))) - } - - private func emptyState(_ title: String, icon: String) -> some View { - Label(title, systemImage: icon) - .font(.subheadline).foregroundStyle(OrionStyle.muted) - .frame(maxWidth: .infinity, alignment: .leading) - .padding(15) - } - - private func icon(_ machine: ParallelsVM) -> some View { - Group { - if let image = vm.icon(for: machine) { - Image(nsImage: image).resizable().scaledToFit() - } else { - Image(systemName: machine.operatingSystem == "Windows" ? "desktopcomputer" : "server.rack") - .font(.system(size: 21, weight: .medium)) - .foregroundStyle(.white) - .frame(maxWidth: .infinity, maxHeight: .infinity) - .background(osColor(machine.operatingSystem), in: Circle()) - } - }.frame(width: 36, height: 36) - } - - private func osColor(_ os: String) -> Color { - switch os { - case "Ubuntu": return .orange - case "Debian": return .pink - case "Fedora": return .blue - case "CentOS": return .purple - case "Alpine": return .teal - case "Windows": return .cyan - default: return OrionStyle.blue - } - } - - private func state(_ status: String) -> some View { - let s = status.lowercased() - let color: Color = s == "running" ? OrionStyle.green : (s == "stopped" ? OrionStyle.muted : .orange) - return HStack(spacing: 6) { - Circle().fill(color).frame(width: 8, height: 8) - Text(status.capitalized).font(.system(size: 12, weight: .medium)) - .foregroundStyle(color) - }.frame(width: 90, alignment: .leading) - } - - private func integrated(_ machine: ParallelsVM) -> ServerDefinition? { - vm.servers.first { $0.vmUUID == machine.id || $0.vmName == machine.name } - } - - private func runningRow(_ machine: ParallelsVM) -> some View { - HStack(spacing: 10) { - icon(machine) - Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 210, alignment: .leading) - state(machine.status) - Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress) - .font(.system(size: 11, design: .monospaced)) - .foregroundStyle(OrionStyle.muted).lineLimit(1).frame(width: 125, alignment: .leading) - Spacer(minLength: 0) - if let server = integrated(machine) { - action("SSH", "terminal", tint: OrionStyle.blue) { vm.openSSH(server) } - .disabled(server.host.isEmpty || server.sshUser.isEmpty) - action("Mailpit", "globe", tint: OrionStyle.blue) { vm.openMailpit(server) } - .disabled(server.host.isEmpty || server.mailpitPort == nil) - } - if vm.busyVMIDs.contains(machine.id) { - ProgressView().controlSize(.small) - .frame(width: 70) - .help("Waiting for Parallels to complete the operation") - } else { - action("Restart", "arrow.clockwise", tint: OrionStyle.card) { vm.operate(machine, action: "restart") } - action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } - } - Menu { - Button("Force Stop", role: .destructive) { pendingForceStop = machine } - } label: { - Image(systemName: "ellipsis").frame(width: 16) - }.menuStyle(.borderlessButton).frame(width: 22) - .help("More VM actions") - } - .disabled(vm.busyVMIDs.contains(machine.id)) - .padding(.horizontal, 10).padding(.vertical, 7) - .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) - } - - private func machineRow(_ machine: ParallelsVM) -> some View { - HStack(spacing: 10) { - icon(machine) - Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 230, alignment: .leading) - state(machine.status) - Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress) - .font(.system(size: 11, design: .monospaced)) - .foregroundStyle(OrionStyle.muted).lineLimit(1) - Spacer(minLength: 2) - if vm.busyVMIDs.contains(machine.id) { ProgressView().controlSize(.small) } - else if machine.status.lowercased() == "running" { - action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } - } else if ["suspended", "paused"].contains(machine.status.lowercased()) { - action("Resume", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "resume") } - } else { - action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") } - } - if vm.isIntegrated(machine) { - Image(systemName: "checkmark.circle.fill").foregroundStyle(OrionStyle.green) - .frame(width: 28).help("Integrated") - } else { - Button { vm.integrate(machine) } label: { - Image(systemName: "plus.circle").font(.system(size: 20)) - }.buttonStyle(.plain).foregroundStyle(OrionStyle.muted) - .frame(width: 28).help("Integrate VM") - } - Menu { - Button("Open in Parallels") { vm.openParallels() } - if machine.status.lowercased() == "running" { - Button("Restart") { vm.operate(machine, action: "restart") } - Button("Force Stop", role: .destructive) { pendingForceStop = machine } - } - } label: { Image(systemName: "chevron.right").foregroundStyle(OrionStyle.muted) } - .menuStyle(.borderlessButton).frame(width: 22) - } - .padding(.horizontal, 10).padding(.vertical, 7) - .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) - } - - private func integratedRow(_ server: ServerDefinition) -> some View { - let machine = vm.discoveredVMs.first { $0.id == server.vmUUID || $0.name == server.vmName } - let status = machine?.status ?? "unavailable" - return HStack(spacing: 10) { - if let machine { icon(machine) } - else { Image(systemName: "server.rack").frame(width: 36, height: 36).foregroundStyle(.cyan) } - Text(server.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 185, alignment: .leading) - state(status) - Text(server.host.isEmpty ? "—" : server.host) - .font(.system(size: 11, design: .monospaced)).foregroundStyle(OrionStyle.muted) - .lineLimit(1).frame(width: 125, alignment: .leading) - Spacer(minLength: 0) - if let machine { - if status.lowercased() == "running" { - action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } - } else { - action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") } - } - } - action("SSH", "terminal", tint: OrionStyle.card) { vm.openSSH(server) } - .disabled(status.lowercased() != "running" || server.host.isEmpty || server.sshUser.isEmpty) - action("Mailpit", "globe", tint: OrionStyle.card) { vm.openMailpit(server) } - .disabled(status.lowercased() != "running" || server.host.isEmpty || server.mailpitPort == nil) - action("Remove", "trash", tint: OrionStyle.card) { pendingRemoval = server } - } - .disabled(machine.map { vm.busyVMIDs.contains($0.id) } ?? false) - .padding(.horizontal, 10).padding(.vertical, 7) - .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) - } - - private func action(_ title: String, _ symbol: String, tint: Color, perform: @escaping () -> Void) -> some View { - Button(action: perform) { - Label(title, systemImage: symbol) - .font(.system(size: 11, weight: .semibold)) - .lineLimit(1) - .frame(minWidth: 48) - }.buttonStyle(OrionActionStyle(tint: tint)) - } - - private var footer: some View { - HStack { - action("Open Parallels", "macwindow", tint: OrionStyle.card) { vm.openParallels() } - Spacer() - action("Settings…", "gearshape", tint: OrionStyle.card) { showSettings() } - action("Quit", "power", tint: OrionStyle.card) { NSApplication.shared.terminate(nil) } - }.padding(.horizontal, 17).padding(.vertical, 12) - } - - private func showSettings() { - openSettings() - NSApplication.shared.activate(ignoringOtherApps: true) - } -} - -private struct OrionActionStyle: ButtonStyle { - let tint: Color - func makeBody(configuration: Configuration) -> some View { - configuration.label - .foregroundStyle(.white) - .padding(.horizontal, 8).padding(.vertical, 7) - .background(tint.opacity(configuration.isPressed ? 0.65 : 1), in: RoundedRectangle(cornerRadius: 8)) - .opacity(configuration.isPressed ? 0.8 : 1) - } -} diff --git a/OrionToolbar/OrionVMController.swift.bak-20261023-083234 b/OrionToolbar/OrionVMController.swift.bak-20261023-083234 deleted file mode 100644 index 617c5c5..0000000 --- a/OrionToolbar/OrionVMController.swift.bak-20261023-083234 +++ /dev/null @@ -1,337 +0,0 @@ -import AppKit -import Foundation - -struct ServerDefinition: Identifiable, Codable, Hashable { - var id = UUID() - var name: String - var vmName: String - var vmUUID: String? = nil - var host: String - var sshUser: String - var sshPort: Int = 22 - var sshIdentityFile: String = "" - var mailpitPort: Int? - - static let orion = ServerDefinition(name: "Orion", vmName: "Ubuntu Linux Server", host: "10.211.55.100", sshUser: "sysadmin", sshPort: 22, sshIdentityFile: "", mailpitPort: 8025) -} - - -struct ParallelsVM: Identifiable, Hashable { - let id: String - let name: String - let status: String - let ipAddress: String - let operatingSystem: String - var bundlePath: String? - - var symbol: String { - switch operatingSystem { - case "Windows": return "desktopcomputer" - case "Ubuntu": return "server.rack" - case "Debian": return "server.rack" - case "Fedora": return "server.rack" - case "CentOS": return "server.rack" - case "Alpine": return "server.rack" - case "Oracle Linux": return "server.rack" - default: return "desktopcomputer" - } - } - - static func detectOS(_ name: String) -> String { - let value = name.lowercased() - - if value.contains("windows") { return "Windows" } - if value.contains("ubuntu") { return "Ubuntu" } - if value.contains("debian") { return "Debian" } - if value.contains("fedora") { return "Fedora" } - if value.contains("centos") { return "CentOS" } - if value.contains("alpine") { return "Alpine" } - if value.contains("oracle") { return "Oracle Linux" } - if value.contains("rocky") { return "Rocky Linux" } - if value.contains("alma") { return "AlmaLinux" } - if value.contains("arch") { return "Arch Linux" } - if value.contains("gentoo") { return "Gentoo" } - if value.contains("freebsd") { return "FreeBSD" } - - return "Other" - } -} - -@MainActor -final class OrionVMController: ObservableObject { - enum VMStatus: Equatable { - case checking, running, stopped, suspended, transitioning, unavailable(String) - var title: String { switch self { case .checking: "Checking…"; case .running: "Running"; case .stopped: "Stopped"; case .suspended: "Suspended"; case .transitioning: "Working…"; case .unavailable: "Unavailable" } } - var symbolName: String { switch self { case .running: "server.rack"; case .stopped: "power"; case .suspended: "pause.circle"; case .transitioning, .checking: "arrow.triangle.2.circlepath"; case .unavailable: "exclamationmark.triangle" } } - } - - @Published var servers: [ServerDefinition] { didSet { saveServers() } } - @Published var statuses: [UUID: VMStatus] = [:] - @Published var busyServers: Set = [] - @Published var lastError: String? - @Published var discoveredVMs: [ParallelsVM] = [] - @Published var selectedVMIDs: Set = [] - @Published var discovering = false - @Published var busyVMIDs: Set = [] - private var timer: Timer? - private let defaultsKey = "serverDefinitions.v2" - - init() { - if let data = UserDefaults.standard.data(forKey: defaultsKey), let saved = try? JSONDecoder().decode([ServerDefinition].self, from: data), !saved.isEmpty { servers = saved } - else { servers = [.orion] } - Task { - await discoverVMs() - await refreshAll() - } - timer = Timer.scheduledTimer(withTimeInterval: 5, repeats: true) { [weak self] _ in Task { @MainActor in guard let self else { return }; await self.discoverVMs(); await self.refreshAll() } } - } - deinit { timer?.invalidate() } - - - func discoverVMs() async { - guard !discovering else { return } - - discovering = true - defer { discovering = false } - - do { - let output = try await runPrlctl(["list", "-a", "-j"]) - - guard let data = output.data(using: .utf8), - let records = try JSONSerialization.jsonObject( - with: data - ) as? [[String: Any]] else { - throw OrionError.commandFailed( - "Invalid Parallels VM discovery response." - ) - } - - discoveredVMs = records.compactMap { record in - guard let uuid = record["uuid"] as? String, - let name = record["name"] as? String else { - return nil - } - - let status = record["status"] as? String ?? "unknown" - let ip = record["ip_configured"] as? String ?? "" - - return ParallelsVM( - id: uuid, - name: name, - status: status, - ipAddress: ip == "-" ? "" : ip, - operatingSystem: ParallelsVM.detectOS(name), - bundlePath: nil - ) - } - .sorted { - $0.name.localizedStandardCompare($1.name) - == .orderedAscending - } - - // Resolve Parallels VM bundles without requiring the guest to run. - for i in discoveredVMs.indices { - if let detail = try? await runPrlctl(["list", "-i", discoveredVMs[i].id]) { - let pattern = #"(?m)^\s*Home:\s*(.+?\.pvm)\s*$"# - if let range = detail.range(of: pattern, options: .regularExpression) { - let line = String(detail[range.lowerBound.. Bool { - servers.contains { - $0.vmUUID == machine.id || - ($0.vmUUID == nil && $0.vmName == machine.name) - } - } - - func toggleSelection(_ machine: ParallelsVM) { - if selectedVMIDs.contains(machine.id) { - selectedVMIDs.remove(machine.id) - } else { - selectedVMIDs.insert(machine.id) - } - } - - func selectAllVMs() { - selectedVMIDs = Set(discoveredVMs.map(\.id)) - } - - func clearVMSelection() { - selectedVMIDs.removeAll() - } - - func integrateSelectedVMs() { - let selected = discoveredVMs.filter { - selectedVMIDs.contains($0.id) - } - - for machine in selected { - guard !isIntegrated(machine) else { continue } - - let server = ServerDefinition( - name: machine.name, - vmName: machine.name, - vmUUID: machine.id, - host: machine.ipAddress, - sshUser: "sysadmin", - sshPort: 22, - sshIdentityFile: "", - mailpitPort: nil - ) - - add(server) - } - - selectedVMIDs.removeAll() - } - - func icon(for machine: ParallelsVM) -> NSImage? { - guard let path = machine.bundlePath, - FileManager.default.fileExists(atPath: path) else { - return nil - } - - return NSWorkspace.shared.icon(forFile: path) - } - - func status(for server: ServerDefinition) -> VMStatus { statuses[server.id] ?? .checking } - func isBusy(_ server: ServerDefinition) -> Bool { busyServers.contains(server.id) } - func add(_ server: ServerDefinition) { servers.append(server); Task { await refreshStatus(server) } } - func update(_ server: ServerDefinition) { if let i = servers.firstIndex(where: { $0.id == server.id }) { servers[i] = server; Task { await refreshStatus(server) } } } - func delete(at offsets: IndexSet) { for i in offsets { statuses[servers[i].id] = nil }; servers.remove(atOffsets: offsets) } - - func refreshAll() async { for server in servers { await refreshStatus(server) } } - func refreshStatus(_ server: ServerDefinition) async { - guard !isBusy(server) else { return } - do { - let output = try await runPrlctl(["status", server.vmUUID ?? server.vmName]); let value = output.lowercased() - if value.contains("running") { statuses[server.id] = .running } - else if value.contains("stopped") { statuses[server.id] = .stopped } - else if value.contains("suspended") || value.contains("paused") { statuses[server.id] = .suspended } - else { statuses[server.id] = .unavailable(output.trimmingCharacters(in: .whitespacesAndNewlines)) } - } catch { statuses[server.id] = .unavailable(error.localizedDescription) } - } - - func start(_ s: ServerDefinition) { perform(["start", s.vmUUID ?? s.vmName], server: s) } - func stop(_ s: ServerDefinition) { perform(["stop", s.vmUUID ?? s.vmName], server: s) } - func restart(_ s: ServerDefinition) { perform(["restart", s.vmUUID ?? s.vmName], server: s) } - func forceStop(_ s: ServerDefinition) { perform(["stop", s.vmUUID ?? s.vmName, "--kill"], server: s) } - - private func perform(_ arguments: [String], server: ServerDefinition) { - guard !isBusy(server) else { return }; busyServers.insert(server.id); statuses[server.id] = .transitioning; lastError = nil - Task { do { _ = try await runPrlctl(arguments) } catch { lastError = error.localizedDescription }; busyServers.remove(server.id); try? await Task.sleep(for: .seconds(1)); await refreshStatus(server) } - } - - func operate(_ machine: ParallelsVM, action: String) { - guard !busyVMIDs.contains(machine.id) else { return } - busyVMIDs.insert(machine.id) - lastError = nil - Task { - do { _ = try await runPrlctl([action, machine.id]) } - catch { lastError = error.localizedDescription } - busyVMIDs.remove(machine.id) - await discoverVMs() - await refreshAll() - } - } - - func integrate(_ machine: ParallelsVM) { - guard !isIntegrated(machine) else { return } - add(ServerDefinition(name: machine.name, vmName: machine.name, - vmUUID: machine.id, host: machine.ipAddress, sshUser: "", - sshPort: 22, sshIdentityFile: "", mailpitPort: nil)) - } - - func icon(for server: ServerDefinition) -> NSImage? { - guard let machine = discoveredVMs.first(where: { - $0.id == server.vmUUID || $0.name == server.vmName - }) else { return nil } - return icon(for: machine) - } - - func openSSH(_ s: ServerDefinition) { - let userHost = "\(s.sshUser)@\(s.host)" - var command = "/usr/bin/ssh -p \(s.sshPort)" - let identity = s.sshIdentityFile.trimmingCharacters(in: .whitespacesAndNewlines) - if !identity.isEmpty { - command += " -i \(shellQuote((identity as NSString).expandingTildeInPath))" - } - command += " \(shellQuote(userHost))" - - do { - // Terminal reliably opens executable .command files without requiring - // Apple Events/Automation permission from this menu-bar application. - let directory = FileManager.default.temporaryDirectory - .appendingPathComponent("OrionToolbar", isDirectory: true) - try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true) - - let safeName = s.name.replacingOccurrences(of: "/", with: "-") - let scriptURL = directory.appendingPathComponent("SSH-\(safeName).command") - let script = """ - #!/bin/zsh - clear - echo "Connecting to \(s.name) (\(userHost))..." - exec \(command) - """ - try script.write(to: scriptURL, atomically: true, encoding: .utf8) - try FileManager.default.setAttributes([.posixPermissions: 0o700], ofItemAtPath: scriptURL.path) - - guard let terminalURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: "com.apple.Terminal") else { - lastError = "Terminal.app could not be found." - return - } - - let configuration = NSWorkspace.OpenConfiguration() - configuration.activates = true - NSWorkspace.shared.open([scriptURL], withApplicationAt: terminalURL, configuration: configuration) { _, error in - Task { @MainActor in - if let error { self.lastError = "Could not open Terminal: \(error.localizedDescription)" } - } - } - } catch { - lastError = "Could not create SSH launcher: \(error.localizedDescription)" - } - } - - private func shellQuote(_ value: String) -> String { - "'" + value.replacingOccurrences(of: "'", with: "'\"'\"'") + "'" - } - func openMailpit(_ s: ServerDefinition) { if let p = s.mailpitPort, let url = URL(string: "http://\(s.host):\(p)") { NSWorkspace.shared.open(url) } } - func openParallels() { NSWorkspace.shared.openApplication(at: URL(fileURLWithPath: "/Applications/Parallels Desktop.app"), configuration: .init()) } - - private func saveServers() { if let data = try? JSONEncoder().encode(servers) { UserDefaults.standard.set(data, forKey: defaultsKey) } } - private func prlctlURL() -> URL? { ["/usr/local/bin/prlctl", "/Applications/Parallels Desktop.app/Contents/MacOS/prlctl"].map(URL.init(fileURLWithPath:)).first { FileManager.default.isExecutableFile(atPath: $0.path) } } - private func runPrlctl(_ arguments: [String]) async throws -> String { - guard let executable = prlctlURL() else { throw OrionError.prlctlNotFound } - return try await Task.detached(priority: .userInitiated) { let p = Process(); let pipe = Pipe(); p.executableURL = executable; p.arguments = arguments; p.standardOutput = pipe; p.standardError = pipe; try p.run(); let data = pipe.fileHandleForReading.readDataToEndOfFile(); p.waitUntilExit(); let out = String(decoding: data, as: UTF8.self); guard p.terminationStatus == 0 else { throw OrionError.commandFailed(out) }; return out }.value - } -} - -enum OrionError: LocalizedError { case prlctlNotFound, commandFailed(String); var errorDescription: String? { switch self { case .prlctlNotFound: "Parallels prlctl was not found."; case .commandFailed(let o): o.trimmingCharacters(in: .whitespacesAndNewlines) } } } diff --git a/OrionToolbar/OrionVMController.swift.bak-20261023-094430 b/OrionToolbar/OrionVMController.swift.bak-20261023-094430 deleted file mode 100644 index 9ac15a0..0000000 --- a/OrionToolbar/OrionVMController.swift.bak-20261023-094430 +++ /dev/null @@ -1,358 +0,0 @@ -import AppKit -import Foundation - -struct ServerDefinition: Identifiable, Codable, Hashable { - var id = UUID() - var name: String - var vmName: String - var vmUUID: String? = nil - var host: String - var sshUser: String - var sshPort: Int = 22 - var sshIdentityFile: String = "" - var mailpitPort: Int? - - static let orion = ServerDefinition(name: "Orion", vmName: "Ubuntu Linux Server", host: "10.211.55.100", sshUser: "sysadmin", sshPort: 22, sshIdentityFile: "", mailpitPort: 8025) -} - - -struct ParallelsVM: Identifiable, Hashable { - let id: String - let name: String - let status: String - let ipAddress: String - let operatingSystem: String - var bundlePath: String? - - var symbol: String { - switch operatingSystem { - case "Windows": return "desktopcomputer" - case "Ubuntu": return "server.rack" - case "Debian": return "server.rack" - case "Fedora": return "server.rack" - case "CentOS": return "server.rack" - case "Alpine": return "server.rack" - case "Oracle Linux": return "server.rack" - default: return "desktopcomputer" - } - } - - static func detectOS(_ name: String) -> String { - let value = name.lowercased() - - if value.contains("windows") { return "Windows" } - if value.contains("ubuntu") { return "Ubuntu" } - if value.contains("debian") { return "Debian" } - if value.contains("fedora") { return "Fedora" } - if value.contains("centos") { return "CentOS" } - if value.contains("alpine") { return "Alpine" } - if value.contains("oracle") { return "Oracle Linux" } - if value.contains("rocky") { return "Rocky Linux" } - if value.contains("alma") { return "AlmaLinux" } - if value.contains("arch") { return "Arch Linux" } - if value.contains("gentoo") { return "Gentoo" } - if value.contains("freebsd") { return "FreeBSD" } - - return "Other" - } -} - -@MainActor -final class OrionVMController: ObservableObject { - enum VMStatus: Equatable { - case checking, running, stopped, suspended, transitioning, unavailable(String) - var title: String { switch self { case .checking: "Checking…"; case .running: "Running"; case .stopped: "Stopped"; case .suspended: "Suspended"; case .transitioning: "Working…"; case .unavailable: "Unavailable" } } - var symbolName: String { switch self { case .running: "server.rack"; case .stopped: "power"; case .suspended: "pause.circle"; case .transitioning, .checking: "arrow.triangle.2.circlepath"; case .unavailable: "exclamationmark.triangle" } } - } - - @Published var servers: [ServerDefinition] { didSet { saveServers() } } - @Published var statuses: [UUID: VMStatus] = [:] - @Published var busyServers: Set = [] - @Published var lastError: String? - @Published var discoveredVMs: [ParallelsVM] = [] - @Published var selectedVMIDs: Set = [] - @Published var discovering = false - @Published var busyVMIDs: Set = [] - private var timer: Timer? - private let defaultsKey = "serverDefinitions.v2" - - init() { - if let data = UserDefaults.standard.data(forKey: defaultsKey), let saved = try? JSONDecoder().decode([ServerDefinition].self, from: data) { servers = saved } - else { servers = [.orion] } - Task { - await discoverVMs() - await refreshAll() - } - timer = Timer.scheduledTimer(withTimeInterval: 5, repeats: true) { [weak self] _ in Task { @MainActor in guard let self else { return }; await self.discoverVMs(); await self.refreshAll() } } - } - deinit { timer?.invalidate() } - - - func discoverVMs() async { - guard !discovering else { return } - - discovering = true - defer { discovering = false } - - do { - let output = try await runPrlctl(["list", "-a", "-j"]) - - guard let data = output.data(using: .utf8), - let records = try JSONSerialization.jsonObject( - with: data - ) as? [[String: Any]] else { - throw OrionError.commandFailed( - "Invalid Parallels VM discovery response." - ) - } - - discoveredVMs = records.compactMap { record in - guard let uuid = record["uuid"] as? String, - let name = record["name"] as? String else { - return nil - } - - let status = record["status"] as? String ?? "unknown" - let ip = record["ip_configured"] as? String ?? "" - - return ParallelsVM( - id: uuid, - name: name, - status: status, - ipAddress: ip == "-" ? "" : ip, - operatingSystem: ParallelsVM.detectOS(name), - bundlePath: nil - ) - } - .sorted { - $0.name.localizedStandardCompare($1.name) - == .orderedAscending - } - - // Resolve Parallels VM bundles without requiring the guest to run. - for i in discoveredVMs.indices { - if let detail = try? await runPrlctl(["list", "-i", discoveredVMs[i].id]) { - let pattern = #"(?m)^\s*Home:\s*(.+?\.pvm)\s*$"# - if let range = detail.range(of: pattern, options: .regularExpression) { - let line = String(detail[range.lowerBound.. Bool { - servers.contains { - $0.vmUUID == machine.id || - ($0.vmUUID == nil && $0.vmName == machine.name) - } - } - - func toggleSelection(_ machine: ParallelsVM) { - if selectedVMIDs.contains(machine.id) { - selectedVMIDs.remove(machine.id) - } else { - selectedVMIDs.insert(machine.id) - } - } - - func selectAllVMs() { - selectedVMIDs = Set(discoveredVMs.map(\.id)) - } - - func clearVMSelection() { - selectedVMIDs.removeAll() - } - - func integrateSelectedVMs() { - let selected = discoveredVMs.filter { - selectedVMIDs.contains($0.id) - } - - for machine in selected { - guard !isIntegrated(machine) else { continue } - - let server = ServerDefinition( - name: machine.name, - vmName: machine.name, - vmUUID: machine.id, - host: machine.ipAddress, - sshUser: "sysadmin", - sshPort: 22, - sshIdentityFile: "", - mailpitPort: nil - ) - - add(server) - } - - selectedVMIDs.removeAll() - } - - func icon(for machine: ParallelsVM) -> NSImage? { - guard let path = machine.bundlePath, - FileManager.default.fileExists(atPath: path) else { - return nil - } - - return NSWorkspace.shared.icon(forFile: path) - } - - func status(for server: ServerDefinition) -> VMStatus { statuses[server.id] ?? .checking } - func isBusy(_ server: ServerDefinition) -> Bool { busyServers.contains(server.id) } - func add(_ server: ServerDefinition) { servers.append(server); Task { await refreshStatus(server) } } - func update(_ server: ServerDefinition) { if let i = servers.firstIndex(where: { $0.id == server.id }) { servers[i] = server; Task { await refreshStatus(server) } } } - func delete(at offsets: IndexSet) { for i in offsets { statuses[servers[i].id] = nil }; servers.remove(atOffsets: offsets) } - - func refreshAll() async { - for server in servers { await refreshStatus(server) } - } - - func refreshStatus(_ server: ServerDefinition) async { - guard !isBusy(server) else { return } - guard let machine = discoveredVMs.first(where: { - $0.id == server.vmUUID || $0.name == server.vmName - }) else { - statuses[server.id] = .unavailable("VM not found in Parallels") - return - } - switch machine.status.lowercased() { - case "running": statuses[server.id] = .running - case "stopped": statuses[server.id] = .stopped - case "suspended", "paused": statuses[server.id] = .suspended - default: statuses[server.id] = .unavailable(machine.status) - } - } - - func removeDefinition(_ server: ServerDefinition) { - servers.removeAll { $0.id == server.id } - statuses.removeValue(forKey: server.id) - busyServers.remove(server.id) - } - - var runningVMs: [ParallelsVM] { - discoveredVMs.filter { $0.status.lowercased() == "running" } - } - - func start(_ s: ServerDefinition) { perform(["start", s.vmUUID ?? s.vmName], server: s) } - func stop(_ s: ServerDefinition) { perform(["stop", s.vmUUID ?? s.vmName], server: s) } - func restart(_ s: ServerDefinition) { perform(["restart", s.vmUUID ?? s.vmName], server: s) } - func forceStop(_ s: ServerDefinition) { perform(["stop", s.vmUUID ?? s.vmName, "--kill"], server: s) } - - private func perform(_ arguments: [String], server: ServerDefinition) { - guard !isBusy(server) else { return }; busyServers.insert(server.id); statuses[server.id] = .transitioning; lastError = nil - Task { do { _ = try await runPrlctl(arguments) } catch { lastError = error.localizedDescription }; busyServers.remove(server.id); try? await Task.sleep(for: .seconds(1)); await refreshStatus(server) } - } - - func operate(_ machine: ParallelsVM, action: String) { - guard !busyVMIDs.contains(machine.id) else { return } - busyVMIDs.insert(machine.id) - lastError = nil - Task { - let arguments = action == "force-stop" - ? ["stop", machine.id, "--kill"] - : [action, machine.id] - do { _ = try await runPrlctl(arguments) } - catch { lastError = error.localizedDescription } - busyVMIDs.remove(machine.id) - await discoverVMs() - await refreshAll() - } - } - - func integrate(_ machine: ParallelsVM) { - guard !isIntegrated(machine) else { return } - add(ServerDefinition(name: machine.name, vmName: machine.name, - vmUUID: machine.id, host: machine.ipAddress, sshUser: "", - sshPort: 22, sshIdentityFile: "", mailpitPort: nil)) - } - - func icon(for server: ServerDefinition) -> NSImage? { - guard let machine = discoveredVMs.first(where: { - $0.id == server.vmUUID || $0.name == server.vmName - }) else { return nil } - return icon(for: machine) - } - - func openSSH(_ s: ServerDefinition) { - let userHost = "\(s.sshUser)@\(s.host)" - var command = "/usr/bin/ssh -p \(s.sshPort)" - let identity = s.sshIdentityFile.trimmingCharacters(in: .whitespacesAndNewlines) - if !identity.isEmpty { - command += " -i \(shellQuote((identity as NSString).expandingTildeInPath))" - } - command += " \(shellQuote(userHost))" - - do { - // Terminal reliably opens executable .command files without requiring - // Apple Events/Automation permission from this menu-bar application. - let directory = FileManager.default.temporaryDirectory - .appendingPathComponent("OrionToolbar", isDirectory: true) - try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true) - - let safeName = s.name.replacingOccurrences(of: "/", with: "-") - let scriptURL = directory.appendingPathComponent("SSH-\(safeName).command") - let script = """ - #!/bin/zsh - clear - echo "Connecting to \(s.name) (\(userHost))..." - exec \(command) - """ - try script.write(to: scriptURL, atomically: true, encoding: .utf8) - try FileManager.default.setAttributes([.posixPermissions: 0o700], ofItemAtPath: scriptURL.path) - - guard let terminalURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: "com.apple.Terminal") else { - lastError = "Terminal.app could not be found." - return - } - - let configuration = NSWorkspace.OpenConfiguration() - configuration.activates = true - NSWorkspace.shared.open([scriptURL], withApplicationAt: terminalURL, configuration: configuration) { _, error in - Task { @MainActor in - if let error { self.lastError = "Could not open Terminal: \(error.localizedDescription)" } - } - } - } catch { - lastError = "Could not create SSH launcher: \(error.localizedDescription)" - } - } - - private func shellQuote(_ value: String) -> String { - "'" + value.replacingOccurrences(of: "'", with: "'\"'\"'") + "'" - } - func openMailpit(_ s: ServerDefinition) { if let p = s.mailpitPort, let url = URL(string: "http://\(s.host):\(p)") { NSWorkspace.shared.open(url) } } - func openParallels() { NSWorkspace.shared.openApplication(at: URL(fileURLWithPath: "/Applications/Parallels Desktop.app"), configuration: .init()) } - - private func saveServers() { if let data = try? JSONEncoder().encode(servers) { UserDefaults.standard.set(data, forKey: defaultsKey) } } - private func prlctlURL() -> URL? { ["/usr/local/bin/prlctl", "/Applications/Parallels Desktop.app/Contents/MacOS/prlctl"].map(URL.init(fileURLWithPath:)).first { FileManager.default.isExecutableFile(atPath: $0.path) } } - private func runPrlctl(_ arguments: [String]) async throws -> String { - guard let executable = prlctlURL() else { throw OrionError.prlctlNotFound } - return try await Task.detached(priority: .userInitiated) { let p = Process(); let pipe = Pipe(); p.executableURL = executable; p.arguments = arguments; p.standardOutput = pipe; p.standardError = pipe; try p.run(); let data = pipe.fileHandleForReading.readDataToEndOfFile(); p.waitUntilExit(); let out = String(decoding: data, as: UTF8.self); guard p.terminationStatus == 0 else { throw OrionError.commandFailed(out) }; return out }.value - } -} - -enum OrionError: LocalizedError { case prlctlNotFound, commandFailed(String); var errorDescription: String? { switch self { case .prlctlNotFound: "Parallels prlctl was not found."; case .commandFailed(let o): o.trimmingCharacters(in: .whitespacesAndNewlines) } } } diff --git a/OrionToolbar/SettingsView.swift.bak-20261023-083234 b/OrionToolbar/SettingsView.swift.bak-20261023-083234 deleted file mode 100644 index 6479cb5..0000000 --- a/OrionToolbar/SettingsView.swift.bak-20261023-083234 +++ /dev/null @@ -1,78 +0,0 @@ -import SwiftUI - -struct SettingsView: View { - @EnvironmentObject var vm: OrionVMController - @State private var selection: UUID? - @State private var editing: ServerDefinition? - @State private var addingVMs = false - var body: some View { - HStack(spacing: 0) { - List(selection: $selection) { ForEach(vm.servers) { s in HStack { - if let icon = vm.icon(for: s) { Image(nsImage: icon).resizable().scaledToFit().frame(width: 22, height: 22) } - else { Image(systemName: vm.status(for: s).symbolName) } - Text(s.name) - }.tag(s.id) } } - .frame(width: 190) - Divider() - VStack(alignment: .leading, spacing: 14) { - if let id = selection, let server = vm.servers.first(where: { $0.id == id }) { - Text(server.name).font(.title2).fontWeight(.semibold) - LabeledContent("Parallels VM", value: server.vmName); LabeledContent("Host", value: server.host); LabeledContent("SSH user", value: server.sshUser); LabeledContent("SSH port", value: String(server.sshPort)); LabeledContent("SSH key", value: server.sshIdentityFile.isEmpty ? "Default SSH configuration" : server.sshIdentityFile); LabeledContent("Mailpit", value: server.mailpitPort.map(String.init) ?? "Disabled") - HStack { Button("Edit…") { editing = server }; Button("Force Stop", role: .destructive) { vm.forceStop(server) }.disabled(vm.status(for: server) == .stopped) } - Spacer() - } else { ContentUnavailableView("Select a Server", systemImage: "server.rack") } - Divider() - HStack { Button("Add Server…", systemImage: "plus") { addingVMs = true }; Spacer(); Button("Delete", role: .destructive) { if let id = selection, let i = vm.servers.firstIndex(where: {$0.id == id}) { vm.delete(at: IndexSet(integer: i)); selection = nil } }.disabled(selection == nil) } - }.padding(20) - }.frame(width: 650, height: 380) - .sheet(isPresented: $addingVMs) { - VStack(alignment: .leading, spacing: 12) { - Text("Add Parallels Virtual Machines").font(.title2.bold()) - List(vm.discoveredVMs) { machine in - HStack { - Toggle(machine.name, isOn: Binding( - get: { vm.selectedVMIDs.contains(machine.id) }, - set: { value in - if value { vm.selectedVMIDs.insert(machine.id) } - else { vm.selectedVMIDs.remove(machine.id) } - } - )) - Spacer() - if vm.isIntegrated(machine) { Text("Integrated").foregroundStyle(.secondary) } - } - } - HStack { - Button("Refresh") { Task { await vm.discoverVMs() } } - Spacer() - Button("Cancel") { addingVMs = false } - Button("Integrate Selected") { vm.integrateSelectedVMs(); addingVMs = false } - .disabled(vm.selectedVMIDs.isEmpty) - } - }.padding(20).frame(width: 530, height: 420) - .task { await vm.discoverVMs() } - } - .sheet(item: $editing) { server in ServerEditor(server: server, isNew: !vm.servers.contains(where: {$0.id == server.id})) { value, isNew in if isNew { vm.add(value) } else { vm.update(value) }; selection = value.id } } - } -} - -struct ServerEditor: View { - @Environment(\.dismiss) private var dismiss - @State var server: ServerDefinition - let isNew: Bool - let save: (ServerDefinition, Bool) -> Void - var body: some View { - VStack(alignment: .leading, spacing: 14) { - Text(isNew ? "Add Server" : "Edit Server").font(.title2).fontWeight(.semibold) - Form { - TextField("Display name", text: $server.name) - TextField("Parallels VM name", text: $server.vmName) - TextField("IP address / host", text: $server.host) - TextField("SSH user", text: $server.sshUser) - TextField("SSH port", value: $server.sshPort, format: .number) - TextField("SSH identity file (optional)", text: $server.sshIdentityFile, prompt: Text("~/.ssh/id_ed25519")) - TextField("Mailpit port (optional)", text: Binding(get: { server.mailpitPort.map(String.init) ?? "" }, set: { server.mailpitPort = Int($0) })) - } - HStack { Spacer(); Button("Cancel") { dismiss() }; Button("Save") { save(server, isNew); dismiss() }.keyboardShortcut(.defaultAction).disabled(server.name.isEmpty || server.vmName.isEmpty || server.sshPort < 1 || server.sshPort > 65535) } - }.padding(20).frame(width: 470) - } -} diff --git a/scripts/build.sh.bak-20261023-094858 b/scripts/build.sh.bak-20261023-094858 deleted file mode 100755 index 718cdf4..0000000 --- a/scripts/build.sh.bak-20261023-094858 +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/zsh -set -euo pipefail - -echo "=== CLION LAUNCH DIAGNOSTICS ===" -echo "Script: $0" -echo "Argument count: $#" -echo "Arguments: $*" -echo "Working directory: $PWD" -echo "Parent process: $PPID" -echo "================================" - -ROOT="$(cd "$(dirname "$0")/.." && pwd)" -cd "$ROOT" -APP_NAME=OrionToolbar -DERIVED="$ROOT/.build" -CONFIGURATION="${CONFIGURATION:-Debug}" -[[ "$CONFIGURATION" == Debug || "$CONFIGURATION" == Release ]] || { echo 'CONFIGURATION must be Debug or Release' >&2; exit 2; } -mkdir -p "$ROOT/build-logs" -LOG="$ROOT/build-logs/build-${CONFIGURATION}-$(date +%Y%m%d-%H%M%S).log" -echo "Building $APP_NAME ($CONFIGURATION)" -set -o pipefail -xcodebuild -project "$ROOT/OrionToolbar.xcodeproj" -scheme "$APP_NAME" -configuration "$CONFIGURATION" -derivedDataPath "$DERIVED" CODE_SIGNING_ALLOWED=NO build 2>&1 | tee "$LOG" -APP="$DERIVED/Build/Products/$CONFIGURATION/$APP_NAME.app" -[[ -d "$APP" ]] || { echo "Missing application: $APP" >&2; exit 1; } -plutil -lint "$APP/Contents/Info.plist" -EXE=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleExecutable' "$APP/Contents/Info.plist") -[[ -x "$APP/Contents/MacOS/$EXE" ]] || { echo 'Application executable missing' >&2; exit 1; } -echo "Build complete: $APP" -echo "Log: $LOG" - - -if [[ "${1:-}" == "--launch" ]]; then - echo "=== LAUNCHING ORIONTOOLBAR ===" - - pkill -x "$APP_NAME" 2>/dev/null || true - sleep 2 - - # Launch independently through macOS Launch Services. - /usr/bin/open -n -a "$APP" - - sleep 3 - - if /usr/bin/pgrep -x "$APP_NAME" >/dev/null; then - echo "SUCCESS: OrionToolbar launched." - else - echo "ERROR: OrionToolbar is not running." - exit 1 - fi -fi diff --git a/scripts/test.sh.bak-20261023-094858 b/scripts/test.sh.bak-20261023-094858 deleted file mode 100755 index 04a3ed9..0000000 --- a/scripts/test.sh.bak-20261023-094858 +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/zsh -set -euo pipefail -ROOT="$(cd "$(dirname "$0")/.." && pwd)" -cd "$ROOT" -mkdir -p "$ROOT/build-logs" -LOG="$ROOT/build-logs/test-$(date +%Y%m%d-%H%M%S).log" -exec > >(tee "$LOG") 2>&1 -print '=== OrionToolbar tests ===' -# A successful compile is the minimum regression check. -"$ROOT/Scripts/build.sh" -APP="$ROOT/.build/Build/Products/Debug/OrionToolbar.app" -plutil -lint "$APP/Contents/Info.plist" -# Verify that the Parallels executable and JSON discovery work independently of SwiftUI. -PRLCTL='' -for candidate in /usr/local/bin/prlctl '/Applications/Parallels Desktop.app/Contents/MacOS/prlctl'; do - if [[ -x "$candidate" ]]; then PRLCTL="$candidate"; break; fi -done -if [[ -n "$PRLCTL" ]]; then - "$PRLCTL" list -a -j | python3 -c ' -import json,sys -v=json.load(sys.stdin) -assert isinstance(v,list), "Expected Parallels JSON array" -for item in v: - assert isinstance(item,dict), "Invalid VM record" - assert item.get("name"), "VM without name" - assert item.get("uuid"), "VM without UUID" -print("Parallels discovery OK: {} VM(s)".format(len(v))) -' -else - echo 'SKIP: Parallels CLI not installed' -fi -if [[ -d "$ROOT/tests" ]] && find "$ROOT/tests" -name 'test_*.py' -print -quit | grep -q .; then - python3 -m unittest discover -s "$ROOT/tests" -v -fi -# Run Xcode tests only if a test plan is configured for this scheme. -if [[ "${RUN_XCODE_TESTS:-0}" == 1 ]]; then - xcodebuild -project "$ROOT/OrionToolbar.xcodeproj" -scheme OrionToolbar -configuration Debug -destination 'platform=macOS' -derivedDataPath "$ROOT/.build" CODE_SIGNING_ALLOWED=NO test -else - echo 'XCTest not run (set RUN_XCODE_TESTS=1 if the scheme has a test target).' -fi -print "Tests complete. Log: $LOG"