Skip to content

Add a permanent deletion option when uninstalling Xcode #853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davdroman wants to merge 1 commit into
base: main
Choose a base branch
from
+495 −35
Open

Add a permanent deletion option when uninstalling Xcode #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions Xcodes/Backend/AppState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,14 +706,13 @@ class AppState: ObservableObject {
}

// MARK: - Uninstall
func uninstall(xcode: Xcode) {
func uninstall(xcode: Xcode, permanently: Bool = false) {
guard let installedXcodePath = xcode.installedPath else { return }

if let index = allXcodes.firstIndex(where: { $0.id == xcode.id }) {
allXcodes[index].installState = .uninstalling(installedXcodePath)
}

uninstallTask?.cancel()
let taskID = UUID()
uninstallTaskID = taskID
uninstallTask = Task { @MainActor in
Expand All @@ -725,7 +724,7 @@ class AppState: ObservableObject {
}
do {
try Task.checkCancellation()
try await uninstallXcodeAsync(path: installedXcodePath)
try await uninstallXcodeAsync(path: installedXcodePath, permanently: permanently)
try Task.checkCancellation()
await updateSelectedXcodePathAsync()
await updateInstalledXcodesAsync()
Expand Down Expand Up @@ -955,7 +954,7 @@ class AppState: ObservableObject {

// MARK: - Private

private func uninstallXcodeAsync(path: Path) async throws {
private func uninstallXcodeAsync(path: Path, permanently: Bool) async throws {
guard let xcode = InstalledXcode(
path: path,
contentsAtPath: { path in Current.files.contents(atPath: path) },
Expand All @@ -964,14 +963,17 @@ class AppState: ObservableObject {
throw FileError.fileNotFound(path.string)
}

if Current.helper.usePrivilegedHelperForFileOperations {
if permanently && Current.helper.usePrivilegedHelperForFileOperations {
try await installHelperIfNecessaryAsync()
try await Current.helper.removeAsync(xcode.path.string)
} else {
_ = try XcodeUninstallService(
removeItem: { url in try Current.files.removeItem(at: url) },
trashItem: { url in try Current.files.trashItem(at: url) }
).uninstall(xcode, emptyTrash: false)
let files = Current.files
try await Task.detached(priority: .userInitiated) {
_ = try XcodeUninstallService(
removeItem: files.removeItem,
trashItem: files.trashItem
).uninstall(xcode, emptyTrash: permanently)
}.value
}
}

Expand Down
23 changes: 18 additions & 5 deletions Xcodes/Frontend/MainWindow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ struct MainWindow: View {
@EnvironmentObject var appState: AppState
@State private var selectedXcodeID: Xcode.ID?
@State private var searchText: String = ""
@State private var deletePermanently = false
@AppStorage("lastUpdated") private var lastUpdated: Double?
// These two properties should be per-scene state managed by @SceneStorage property wrappers.
// There's currently a bug with @SceneStorage on macOS, though, where quitting the app will discard the values, which removes a lot of its utility.
Expand All @@ -22,11 +23,23 @@ struct MainWindow: View {
NavigationSplitViewWrapper {
XcodeListView(selectedXcodeID: $selectedXcodeID, searchText: searchText, category: category, isInstalledOnly: isInstalledOnly, architecture: architecture)
.layoutPriority(1)
.alert(item: $appState.xcodeBeingConfirmedForUninstallation) { xcode in
Alert(title: Text(String(format: localizeString("Alert.Uninstall.Title"), xcode.description)),
message: Text("Alert.Uninstall.Message"),
primaryButton: .destructive(Text("Uninstall"), action: { self.appState.uninstall(xcode: xcode) }),
secondaryButton: .cancel(Text("Cancel")))
.alert(
String(format: localizeString("Alert.Uninstall.Title"), appState.xcodeBeingConfirmedForUninstallation?.description ?? ""),
isPresented: $appState.xcodeBeingConfirmedForUninstallation.isNotNil,
presenting: appState.xcodeBeingConfirmedForUninstallation
) { xcode in
Button("Uninstall", role: .destructive) {
appState.uninstall(xcode: xcode, permanently: deletePermanently)
}
Button("Cancel", role: .cancel) {}
} message: { _ in
Text("Alert.Uninstall.Message")
}
.dialogSuppressionToggle("Alert.Uninstall.DeletePermanently", isSuppressed: $deletePermanently)
.onChange(of: appState.xcodeBeingConfirmedForUninstallation?.id) { _, id in
if id != nil {
deletePermanently = false
}
}
.searchable(text: $searchText, placement: .sidebar)
.mainToolbar(
Expand Down
176 changes: 155 additions & 21 deletions Xcodes/Resources/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3890,6 +3890,138 @@
}
}
},
"Alert.Uninstall.DeletePermanently" : {
"comment" : "Checkbox in the uninstall dialog that deletes Xcode permanently instead of moving it to the Trash.",
"extractionState" : "manual",
"localizations" : {
"ar" : {
"stringUnit" : {
"state" : "translated",
"value" : "حذف نهائي"
}
},
"ca" : {
"stringUnit" : {
"state" : "translated",
"value" : "Suprimeix permanentment"
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Endgültig löschen"
}
},
"el" : {
"stringUnit" : {
"state" : "translated",
"value" : "Οριστική διαγραφή"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Delete permanently"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "Eliminar permanentemente"
}
},
"fi" : {
"stringUnit" : {
"state" : "translated",
"value" : "Poista pysyvästi"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Supprimer définitivement"
}
},
"hi" : {
"stringUnit" : {
"state" : "translated",
"value" : "स्थायी रूप से डिलीट करें"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "Elimina definitivamente"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "完全に削除"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "영구적으로 삭제"
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Definitief verwijderen"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Usuń trwale"
}
},
"pt-BR" : {
"stringUnit" : {
"state" : "translated",
"value" : "Excluir permanentemente"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Удалить безвозвратно"
}
},
"th" : {
"stringUnit" : {
"state" : "translated",
"value" : "ลบอย่างถาวร"
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Kalıcı olarak sil"
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
"value" : "Видалити назавжди"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "永久删除"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
"value" : "永久刪除"
}
}
}
},
"Alert.Uninstall.Error.Message.FileNotFound" : {
"extractionState" : "manual",
"localizations" : {
Expand Down Expand Up @@ -4153,131 +4285,133 @@
}
},
"Alert.Uninstall.Message" : {
"comment" : "Explains the default Trash behavior and warns that choosing permanent deletion cannot be undone.",
"extractionState" : "manual",
"localizations" : {
"ar" : {
"stringUnit" : {
"state" : "translated",
"value" : "سيتم نقله إلى سلة المهملات، ولكن لن يتم إفراغه."
"value" : "سيتم نقل Xcode إلى سلة المهملات ما لم تختر حذفه نهائيًا. لا يمكن التراجع عن الحذف النهائي."
}
},
"ca" : {
"stringUnit" : {
"state" : "translated",
"value" : "Es mourà a la paperera, però no es buidarà."
"value" : "Xcode es mourà a la paperera tret que decidiu suprimir-lo permanentment. La supressió permanent no es pot desfer."
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Die Anwendung wird in den Papierkorb verschoben, dieser wird aber nicht geleert."
"value" : "Xcode wird in den Papierkorb verschoben, sofern Sie es nicht endgültig löschen möchten. Das endgültige Löschen kann nicht rückgängig gemacht werden."
}
},
"el" : {
"stringUnit" : {
"state" : "translated",
"value" : "Θα μετακινηθεί στον Κάδο, αλλά δεν θα γίνει άδειασμα."
"value" : "Το Xcode θα μετακινηθεί στον Κάδο, εκτός αν επιλέξετε να το διαγράψετε οριστικά. Η οριστική διαγραφή δεν μπορεί να αναιρεθεί."
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "It will be moved to the Trash, but won't be emptied."
"value" : "Xcode will be moved to the Trash unless you choose to delete it permanently. Permanent deletion cannot be undone."
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "Se moverá a la Papelera, pero no se vaciará."
"value" : "Xcode se moverá a la Papelera a menos que elijas eliminarlo permanentemente. La eliminación permanente no se puede deshacer."
}
},
"fi" : {
"stringUnit" : {
"state" : "translated",
"value" : "Se siirretään roskakoriin, mutta sitä ei tyhjennetä."
"value" : "Xcode siirretään roskakoriin, ellet valitse sen poistamista pysyvästi. Pysyvää poistoa ei voi kumota."
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Xcodes sera déplacé vers la corbeille, mais la corbeille ne sera pas vidée."
"value" : "Xcode sera déplacé vers la corbeille, sauf si vous choisissez de le supprimer définitivement. La suppression définitive est irréversible."
}
},
"hi" : {
"stringUnit" : {
"state" : "translated",
"value" : "इसे ट्रैश में ले जाया जाएगा, लेकिन खाली नहीं किया जाएगा।"
"value" : "Xcode को ट्रैश में ले जाया जाएगा, जब तक कि आप इसे स्थायी रूप से डिलीट करने का विकल्प नहीं चुनते। स्थायी रूप से डिलीट करने के बाद इस कार्रवाई को पूर्ववत नहीं किया जा सकता।"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sarà spostato nel cestino, ma non svuotato."
"value" : "Xcode verrà spostato nel Cestino, a meno che tu non scelga di eliminarlo definitivamente. L’eliminazione definitiva non può essere annullata."
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "ゴミ箱に移動されますが、ゴミ箱を自動的に空にすることはありません。"
"value" : "完全に削除することを選択しない限り、Xcodeはゴミ箱に移動されます。完全に削除すると元に戻すことはできません。"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "휴지통으로 이동되지만 비워지지는 않습니다."
"value" : "영구적으로 삭제하도록 선택하지 않으면 Xcode가 휴지통으로 이동됩니다. 영구 삭제는 되돌릴 수 없습니다."
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Het zal worden verplaatst naar de Prullenbak, maar deze zal niet geleegd worden."
"value" : "Xcode wordt naar de prullenmand verplaatst, tenzij je ervoor kiest om het definitief te verwijderen. Definitief verwijderen kan niet ongedaan worden gemaakt."
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Zostanie przeniesiony do kosza, ale nie zostanie opróżniony."
"value" : "Xcode zostanie przeniesiony do Kosza, chyba że wybierzesz trwałe usunięcie. Trwałego usunięcia nie można cofnąć."
}
},
"pt-BR" : {
"stringUnit" : {
"state" : "translated",
"value" : "Será movido para a lixeira, mas não será esvaziada."
"value" : "O Xcode será movido para o Lixo, a menos que você escolha excluí-lo permanentemente. A exclusão permanente não pode ser desfeita."
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Файлы будут перемещены в корзину, но не будут очищены из неё автоматически."
"value" : "Xcode будет перемещён в Корзину, если вы не выберете безвозвратное удаление. Безвозвратное удаление нельзя отменить."
}
},
"th" : {
"stringUnit" : {
"state" : "translated",
"value" : "มันจะถูกย้ายไปที่ถังขยะ แต่จะไม่ถูกลบอย่างถาวร"
"value" : "Xcode จะถูกย้ายไปที่ถังขยะ เว้นแต่คุณจะเลือกที่จะลบอย่างถาวร การลบอย่างถาวรไม่สามารถเลิกทำได้"
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Uygulama Çöp Kutusuna taşınacaktır, fakat silinmeyecektir."
"value" : "Kalıcı olarak silmeyi seçmediğiniz sürece Xcode Çöp Sepeti’ne taşınacaktır. Kalıcı silme işlemi geri alınamaz."
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
"value" : "Xcode буде просто переміщено до Кошика, без повного видалення."
"value" : "Xcode буде переміщено до Смітника, якщо ви не виберете видалення назавжди. Видалення назавжди не можна скасувати."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "它会被移动到废纸篓，但废纸篓不会清空。"
"value" : "除非您选择永久删除，否则 Xcode 将被移到废纸篓。永久删除无法撤销。"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
"value" : "將移到垃圾桶，但垃圾桶不會清空。"
"value" : "除非您選擇永久刪除，否則 Xcode 將移到垃圾桶。永久刪除無法復原。"
}
}
}
Expand Down
Loading