Use Windows Paths where possible

Whisky-App · Jun 21, 2023 · 08acc0b · 08acc0b
1 parent 49ab131
commit 08acc0b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/Whisky/Extensions/URLExtensions.swift b/Whisky/Extensions/URLExtensions.swift
@@ -15,4 +15,15 @@ extension URL {
             .replacingOccurrences(of: "/Users/\(NSUserName())", with: "~")
         return prettyPath
     }
+
+    func windowsPath() -> String {
+        var windowsPath = path
+        if let range = windowsPath.range(of: "drive_c") {
+            windowsPath = String(path[range.lowerBound...])
+        }
+
+        windowsPath = windowsPath.replacingOccurrences(of: "drive_c", with: "C:")
+        windowsPath = windowsPath.replacingOccurrences(of: "/", with: "\\")
+        return windowsPath
+    }
 }
diff --git a/Whisky/Utils/Wine.swift b/Whisky/Utils/Wine.swift
@@ -197,11 +197,17 @@ class Wine {
     @discardableResult
     static func runProgram(program: Program) async throws -> String {
         let arguments = program.settings.arguments.split { $0.isWhitespace }.map(String.init)
-        return try await run(["start", "/unix", program.url.path] + arguments,
+        return try await run(["start", program.url.windowsPath()] + arguments,
                              bottle: program.bottle,
                              environment: program.settings.environment)
     }
 
+    @discardableResult
+    static func runExternalProgram(url: URL, bottle: Bottle) async throws -> String {
+        return try await run(["start", "/unix", url.path],
+                             bottle: bottle)
+    }
+
     static func killBottle(bottle: Bottle) throws {
         return try runWineserver(["-k"], bottle: bottle)
     }

diff --git a/Whisky/Views/Bottle Views/BottleView.swift b/Whisky/Views/Bottle Views/BottleView.swift
@@ -99,10 +99,11 @@ struct BottleView: View {
                         Task(priority: .userInitiated) {
                             if result == .OK {
                                 if let url = panel.urls.first {
-                                    let program = Program(name: url.lastPathComponent,
-                                                          url: url,
-                                                          bottle: bottle)
-                                    await program.run()
+                                    do {
+                                        try await Wine.runExternalProgram(url: url, bottle: bottle)
+                                    } catch {
+                                        print("Failed to run external program: \(error)")
+                                    }
                                     programLoading = false
                                 }
                             } else {

diff --git a/Whisky/Views/ProgramView.swift b/Whisky/Views/ProgramView.swift
@@ -18,8 +18,13 @@ struct ProgramView: View {
             Form {
                 Section("info.title") {
                     HStack {
-                        InfoItem(label: String(localized: "info.path"), value: program.url.prettyPath())
+                        InfoItem(label: String(localized: "info.path"), value: program.url.windowsPath())
                         .contextMenu {
+                            Button("info.winPath.copy") {
+                                let pasteboard = NSPasteboard.general
+                                pasteboard.clearContents()
+                                pasteboard.setString(program.url.windowsPath(), forType: .string)
+                            }
                             Button("info.path.copy") {
                                 let pasteboard = NSPasteboard.general
                                 pasteboard.clearContents()

diff --git a/Whisky/en.lproj/Localizable.strings b/Whisky/en.lproj/Localizable.strings
@@ -38,6 +38,7 @@
 "info.title" = "Info";
 "info.path" = "Path";
 "info.path.copy" = "Copy Path";
+"info.winPath.copy" = "Copy Windows Path";
 "info.wine" = "Wine Version";
 "info.win" = "Windows Version";