Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Forgetting a receipt keeps its page busy until History has it

Țugui Dragoșe38f873719bd
diff --git a/Peel/Model/PackageLibrary.swift b/Peel/Model/PackageLibrary.swift
index 08427cf1..412f445a 100644
--- a/Peel/Model/PackageLibrary.swift
+++ b/Peel/Model/PackageLibrary.swift
@@ -41,9 +41,12 @@ final class PackageLibrary {
return result
}
- func forget(_ receipt: PackageReceipt) async -> TrashResult {
+ func forget(_ receipt: PackageReceipt, recording record: (TrashResult) async -> Void) async -> TrashResult {
isWorking = true
defer { isWorking = false }
- return await PackageActions.forget(receipt, exclusions: ExclusionsStore.shared.exclusions)
+ let result = await PackageActions.forget(receipt, exclusions: ExclusionsStore.shared.exclusions)
+ await record(result)
+ await refresh()
+ return result
}
}
diff --git a/Peel/Views/Packages/ForgetReceiptDialog.swift b/Peel/Views/Packages/ForgetReceiptDialog.swift
index add00ad4..4b4c73d0 100644
--- a/Peel/Views/Packages/ForgetReceiptDialog.swift
+++ b/Peel/Views/Packages/ForgetReceiptDialog.swift
@@ -6,10 +6,10 @@ import SwiftUI
struct ForgetReceiptDialog: ViewModifier {
@Environment(RemovalHistoryStore.self) private var history
@Binding var receipt: PackageReceipt?
- let forget: (PackageReceipt) async -> TrashResult
- /// Scans the receipts again. It runs after History has the record, because a scan can take a while and
- /// History is how the user puts the receipt back.
- let rescan: () async -> Void
+ /// Forgets the receipt, records it with the closure it is given, then scans the receipts again, keeping its page
+ /// busy until all three are done. History is written first, because a scan can take a while and History is how
+ /// the user puts the receipt back.
+ let forget: (PackageReceipt, _ record: (TrashResult) async -> Void) async -> TrashResult
@State private var failure: String?
func body(content: Content) -> some View {
@@ -17,16 +17,16 @@ struct ForgetReceiptDialog: ViewModifier {
.confirmationDialog(Text("Forget the receipt of \(receipt?.identifier ?? "")?"), isPresented: isAsking, presenting: receipt) { receipt in
Button("Forget Receipt") {
Task {
- let result = await forget(receipt)
+ let result = await forget(receipt) { result in
+ var sizes: [URL: Int64] = [:]
+ for item in result.trashed {
+ sizes[item.originalURL] = await FileSize.allocatedSize(of: item.trashedURL)
+ }
+ await history.record(result, tool: .packages, source: receipt.identifier, sizes: sizes)
+ }
if !result.failures.isEmpty {
failure = result.failures.map { $0.url.abbreviatedPath }.joined(separator: "\n")
}
- var sizes: [URL: Int64] = [:]
- for item in result.trashed {
- sizes[item.originalURL] = await FileSize.allocatedSize(of: item.trashedURL)
- }
- await history.record(result, tool: .packages, source: receipt.identifier, sizes: sizes)
- await rescan()
}
}
Button("Cancel", role: .cancel) {}
@@ -58,9 +58,8 @@ struct ForgetReceiptDialog: ViewModifier {
extension View {
func forgetReceiptDialog(
for receipt: Binding<PackageReceipt?>,
- forget: @escaping (PackageReceipt) async -> TrashResult,
- rescan: @escaping () async -> Void
+ forget: @escaping (PackageReceipt, _ record: (TrashResult) async -> Void) async -> TrashResult
) -> some View {
- modifier(ForgetReceiptDialog(receipt: receipt, forget: forget, rescan: rescan))
+ modifier(ForgetReceiptDialog(receipt: receipt, forget: forget))
}
}
diff --git a/Peel/Views/Packages/PackageDetailView.swift b/Peel/Views/Packages/PackageDetailView.swift
index 8880cd82..fd60ef48 100644
--- a/Peel/Views/Packages/PackageDetailView.swift
+++ b/Peel/Views/Packages/PackageDetailView.swift
@@ -101,7 +101,7 @@ struct PackageDetailView: View {
}
Button("Cancel", role: .cancel) {}
}
- .forgetReceiptDialog(for: $receiptToForget, forget: packages.forget, rescan: packages.refresh)
+ .forgetReceiptDialog(for: $receiptToForget, forget: packages.forget)
}
/// Explains why the list is empty. An unknown file list is checked first: it means `pkgutil` gave none,
diff --git a/Peel/Views/VendorNotes.swift b/Peel/Views/VendorNotes.swift
index bb2bc8f8..df82f891 100644
--- a/Peel/Views/VendorNotes.swift
+++ b/Peel/Views/VendorNotes.swift
@@ -63,7 +63,7 @@ struct PackageReceiptSection: View {
}
.task(id: app.id) { await load() }
.rescanOnExclusionChange("VendorNotes") { await load() }
- .forgetReceiptDialog(for: $receiptToForget, forget: forget) { await load() }
+ .forgetReceiptDialog(for: $receiptToForget, forget: forget)
}
private func load() async {
@@ -129,9 +129,12 @@ struct PackageReceiptSection: View {
.padding(.vertical, 4)
}
- private func forget(_ receipt: PackageReceipt) async -> TrashResult {
+ private func forget(_ receipt: PackageReceipt, recording record: (TrashResult) async -> Void) async -> TrashResult {
isForgetting = true
defer { isForgetting = false }
- return await PackageActions.forget(receipt, exclusions: ExclusionsStore.shared.exclusions)
+ let result = await PackageActions.forget(receipt, exclusions: ExclusionsStore.shared.exclusions)
+ await record(result)
+ await load()
+ return result
}
}