Merge pull request #17 from ohaiibuzzle/fix/pretty-paths

feat: make bottle paths look pretty
ohaiibuzzle · Jun 15, 2023 · 021c076 · 021c076
2 parents eb25afe + 30c6f30
commit 021c076
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/Harbor/Extensions/URLExtensions.swift b/Harbor/Extensions/URLExtensions.swift
@@ -0,0 +1,27 @@
+//
+//  URLExtensions.swift
+//  Harbor
+//
+//  Created by Venti on 15/06/2023.
+//
+
+import Foundation
+
+extension URL {
+    var prettyFileUrl: String {
+        if !self.isFileURL {
+            return self.absoluteString
+        }
+        guard var prettyPath = self.path.removingPercentEncoding else {
+            return self.path
+        }
+
+        if path.hasPrefix("/Users") {
+            // Remove /Users/<username> and replace with ~
+            prettyPath = prettyPath.replacingOccurrences(of: #"/Users/[^/]+/"#,
+                                                         with: "~/", options: .regularExpression)
+        }
+
+        return prettyPath
+    }
+}
diff --git a/Harbor/Views/BottleManagementView.swift b/Harbor/Views/BottleManagementView.swift
@@ -30,7 +30,7 @@ struct BottleManagementView: View {
 
             Table(bottles, selection: $selectedBottle, sortOrder: $sortOrder) {
                 TableColumn("home.table.name", value: \.name)
-                TableColumn("home.table.path", value: \.path.relativeString)
+                TableColumn("home.table.path", value: \.path.prettyFileUrl)
                 TableColumn("home.table.primaryApp", value: \.primaryApplicationPath)
             }
             .padding()
@@ -100,7 +100,7 @@ struct BottleManagementView: View {
                         alert.alertStyle = .critical
                         let checkbox = NSButton(checkboxWithTitle:
                                                     String(format: String(localized: "home.alert.deletePath %@"),
-                                                           thisBottle.path.absoluteString), target: nil, action: nil)
+                                                           thisBottle.path.prettyFileUrl), target: nil, action: nil)
                         checkbox.state = .on
                         alert.accessoryView = checkbox
                         alert.addButton(withTitle: String(localized: "btn.delete"))