Add context menu option to delete download

Author: insidegui

VirtualUI/Source/Installer/Steps/Restore Image Selection/Components/RestoreImageBrowser.swift

@@ -110,7 +110,7 @@ struct RestoreImageBrowser: View {
             } else if controller.isLoading {
                 /// Placeholders are only displayed when controller is loading to avoid jumps when loading happens quickly (or not at all).
                 ForEach(0...12, id: \.self) { _ in
-                    RestoreImageButton(image: .placeholder, isSelected: false, action: { })
+                    RestoreImageButton(image: .placeholder, isSelected: false, action: { }, deleteDownload: { })
                 }
             }
         }
@@ -124,6 +124,8 @@ struct RestoreImageBrowser: View {
             ForEach(group.images) { image in
                 RestoreImageButton(image: image, isSelected: image.id == selection?.id) {
                     selection = image
+                } deleteDownload: {
+                    controller.deleteLocalDownload(for: image)
                 }
                 .tag(image)
             }
@@ -134,7 +136,8 @@ struct RestoreImageBrowser: View {
 private struct RestoreImageButton: View {
     var image: ResolvedRestoreImage
     var isSelected: Bool
-    var action: () -> Void
+    var action: () -> ()
+    var deleteDownload: () -> ()
 
     var body: some View {
         Button {
@@ -165,6 +168,16 @@ private struct RestoreImageButton: View {
             Button("Copy Build Number") {
                 Pasteboard.general.string = image.build
             }
+
+            if image.isDownloaded {
+                Divider()
+
+                Button(role: .destructive) {
+                    deleteDownload()
+                } label: {
+                    Text("Delete Download…")
+                }
+            }
         }
     }
 

VirtualUI/Source/Installer/Steps/Restore Image Selection/RestoreImageSelectionController.swift

@@ -76,9 +76,14 @@ final class RestoreImageSelectionController: ObservableObject {
         }
     }
 
+    private var inputCatalog: SoftwareCatalog?
+    private var guestType = VBGuestType.mac
+
     func loadRestoreImageOptions(for guest: VBGuestType) {
         logger.debug("Loading restore image options.")
 
+        guestType = guest
+
         deferredStartLoading()
 
         Task {
@@ -99,13 +104,9 @@ final class RestoreImageSelectionController: ObservableObject {
                 #endif
 
                 let catalog = try await api.fetchRestoreImages(for: guest)
-                let platform: CatalogGuestPlatform = guest == .linux ? .linux : .mac
-                let resolved = ResolvedCatalog(environment: .current.guest(platform: platform), catalog: catalog)
+                inputCatalog = catalog
 
-                await MainActor.run {
-                    self.selectedGroup = resolved.groups.first
-                    self.catalog = resolved
-                }
+                await refreshResolvedCatalog(with: catalog)
             } catch {
                 logger.error("Loading restore images failed - \(error, privacy: .public)")
 
@@ -116,6 +117,47 @@ final class RestoreImageSelectionController: ObservableObject {
             }
         }
     }
+
+    private func refreshResolvedCatalog(with catalog: SoftwareCatalog) async {
+        logger.debug(#function)
+
+        let platform: CatalogGuestPlatform = guestType == .linux ? .linux : .mac
+        let resolved = ResolvedCatalog(environment: .current.guest(platform: platform), catalog: catalog)
+
+        await MainActor.run {
+            self.selectedGroup = resolved.groups.first(where: { $0.id == selectedGroup?.id }) ?? resolved.groups.first
+            self.selectedRestoreImage = selectedGroup?.restoreImages.first(where: { $0.id == self.selectedRestoreImage?.id })
+            self.catalog = resolved
+        }
+    }
+
+    func deleteLocalDownload(for image: ResolvedRestoreImage) {
+        logger.debug("Delete download requested for \(image.id)")
+
+        /// Remove selection to force refresh of image browser.
+        selectedRestoreImage = nil
+
+        do {
+            let fileURL = try image.localFileURL.require("File not found.")
+            Task {
+                do {
+                    try await NSWorkspace.shared.recycle([fileURL])
+
+                    if let inputCatalog {
+                        await refreshResolvedCatalog(with: inputCatalog)
+                    }
+                } catch {
+                    logger.error("Recycle failed for \(fileURL.path) - \(error, privacy: .public)")
+
+                    NSApp.presentError(error)
+                }
+            }
+        } catch {
+            logger.error("Delete download failed for \(image.id) - \(error, privacy: .public)")
+
+            NSApp.presentError(error)
+        }
+    }
 }
 
 extension ChannelGroup {