Run Windows games on Apple Silicon — free, open source, with an open compatibility database that tells you what actually works.
Swift apple-silicond3dmetaldxmtdxvkfexgame-porting-toolkitgamingmac-gamingmacosmetalmoltenvksteamswiftuivkd3d-protonwhisky-alternativewindows-gameswinewine-wrapper
Bottles: a partial delete is a success with leftovers, not a failure (#38)
Gauthier Piarrettef2f7ffd9348e
diff --git a/Sources/HighballApp/AppState.swift b/Sources/HighballApp/AppState.swiftindex 2ac8dd1..60e58ed 100644--- a/Sources/HighballApp/AppState.swift+++ b/Sources/HighballApp/AppState.swift@@ -55,6 +55,9 @@ final class AppState {}var errorMessage: String?+ /// True when errorMessage describes an operation that SUCCEEDED with something left over,+ /// so the alert can say so instead of calling it a failure.+ var errorIsPartialSuccess = false// MARK: One Library (Phase 2)@@ -175,7 +178,7 @@ final class AppState {panel.message = String(format: L("Choose a cover image for %@"), item.title)guard panel.runModal() == .OK, let url = panel.url else { return }do { try coverStore.setCover(for: item.id, from: url); coverVersion += 1 }- catch { errorMessage = Self.message(for: error) }+ catch { errorIsPartialSuccess = false; errorMessage = Self.message(for: error) }}func resetCover(for item: LibraryItem) {@@ -278,7 +281,7 @@ final class AppState {do {try await work()doneState = done ?? DoneState(title: L("Done"), ctaTitle: nil, cta: nil)- } catch { showLog = false; errorMessage = Self.message(for: error) }+ } catch { showLog = false; errorIsPartialSuccess = false; errorMessage = Self.message(for: error) }cleanup?()busy = falserefresh()@@ -315,7 +318,7 @@ final class AppState {func acceptGPTK(engine: InstalledEngine) {do { _ = try engineStore.accept(license: "apple-gptk-license-2023-08-17", engine: engine); refresh() }- catch { errorMessage = Self.message(for: error) }+ catch { errorIsPartialSuccess = false; errorMessage = Self.message(for: error) }}func createBottle(name: String, recipeID: String?) {@@ -404,7 +407,7 @@ final class AppState {}func update(_ bottle: Bottle) {- do { try bottleStore.update(bottle); refresh() } catch { errorMessage = Self.message(for: error) }+ do { try bottleStore.update(bottle); refresh() } catch { errorIsPartialSuccess = false; errorMessage = Self.message(for: error) }}func deleteBottle(_ name: String) {@@ -430,6 +433,7 @@ final class AppState {await MainActor.run {if self.selectedBottle == name { self.selectedBottle = nil }guard let first = leftovers.first else { return }+ self.errorIsPartialSuccess = trueself.errorMessage = """'\(name)' is deleted and the name is free again. Some of its files are still \on disk because macOS refused to remove them, starting at \(first.path) \diff --git a/Sources/HighballApp/HighballApp.swift b/Sources/HighballApp/HighballApp.swiftindex 5888fdf..659bec4 100644--- a/Sources/HighballApp/HighballApp.swift+++ b/Sources/HighballApp/HighballApp.swift@@ -274,13 +274,19 @@ struct ContentView: View {Text(state.pendingHeavyFix?.recipe.steps.compactMap(\.slowHint).first?? L("This installs the dependencies the compatibility database verified."))}- .alert(L("Something went wrong"), isPresented: .init(+ // A partial delete succeeded — the bottle is gone and the name is free — so framing it as+ // a failure, with an invitation to file a bug, misreads what happened. Same alert, honest+ // title, and no Report button for something that is not a problem to report.+ .alert(state.errorIsPartialSuccess ? L("Some files couldn't be removed") : L("Something went wrong"),+ isPresented: .init(get: { state.errorMessage != nil },set: { if !$0 { state.errorMessage = nil } })) {Button("OK") { state.errorMessage = nil }- Button(L("Report this problem…")) {- state.errorMessage = nil- NSWorkspace.shared.open(BugReport.url(version: Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "dev"))+ if !state.errorIsPartialSuccess {+ Button(L("Report this problem…")) {+ state.errorMessage = nil+ NSWorkspace.shared.open(BugReport.url(version: Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "dev"))+ }}} message: { Text(state.errorMessage ?? "") }.alert(item: $state.crashSuggestion) { s in