Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.
Swift cache-cleanercleanerclideveloper-toolsdisk-cleanupdisk-spaceduplicate-finderhomebrewliquid-glassmac-cleanermacosmacos-appmacos-golden-gatemacos-tahoemacos-tweaksswiftswiftuiterminal-themesuninstalluninstaller
History groups its records off the main thread
Țugui Dragoș2497595cbf56
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/RemovalGrouping.swift b/Packages/PeelCore/Sources/PeelCore/Removal/RemovalGrouping.swiftindex 2860ed30..0832c61a 100644--- a/Packages/PeelCore/Sources/PeelCore/Removal/RemovalGrouping.swift+++ b/Packages/PeelCore/Sources/PeelCore/Removal/RemovalGrouping.swift@@ -17,10 +17,12 @@ extension RemovalRecord {public static func grouped(_ records: [RemovalRecord]) -> [RemovalGroup] {Dictionary(grouping: records, by: \.batch).map { batch, records in- let sorted = records.sorted {- let (lhs, rhs) = (SizeTotal([$0.size]), SizeTotal([$1.size]))- return lhs != rhs ? lhs > rhs : $0.originalURL.path(percentEncoded: false) < $1.originalURL.path(percentEncoded: false)- }+ // Each record's size and path are worked out once rather than at every comparison: History holds+ // up to `RemovalLog.maximumRecords` records, and one removal can hold thousands.+ let sorted = records+ .map { (size: SizeTotal([$0.size]), path: $0.originalURL.path(percentEncoded: false), record: $0) }+ .sorted { $0.size != $1.size ? $0.size > $1.size : $0.path < $1.path }+ .map(\.record)return RemovalGroup(id: batch,parts: RemovalPart.of(sorted.map { ($0.date, $0.part) }),@@ -45,7 +47,9 @@ extension RefusalRecord {public static func grouped(_ records: [RefusalRecord]) -> [RefusalGroup] {Dictionary(grouping: records, by: { $0.batch ?? $0.id }).map { batch, records in- let sorted = records.sorted { $0.url.path(percentEncoded: false) < $1.url.path(percentEncoded: false) }+ let sorted = records.map { (path: $0.url.path(percentEncoded: false), record: $0) }+ .sorted { $0.path < $1.path }+ .map(\.record)return RefusalGroup(id: batch,parts: RemovalPart.of(sorted.map { ($0.date, $0.part) }),diff --git a/Packages/PeelCore/Tests/PeelCoreTests/RemovalGroupingTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/RemovalGroupingTests.swiftindex d42c0b0e..ffa9a3fc 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/RemovalGroupingTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/RemovalGroupingTests.swift@@ -89,6 +89,19 @@ struct RemovalGroupingTests {#expect(groups.first?.size == SizeTotal(known: 110, isComplete: false))}+ @Test func itemsOfTheSameSizeAreListedByPath() {+ let now = Date(timeIntervalSince1970: 1_800_000_000)+ let batch = UUID()+ let groups = RemovalRecord.grouped([+ record(batch, "b.bin", size: 10, at: now),+ record(batch, "d.bin", size: nil, at: now),+ record(batch, "a.bin", size: 10, at: now),+ record(batch, "c.bin", size: nil, at: now),+ ])++ #expect(groups.first?.records.map(\.originalURL.lastPathComponent) == ["c.bin", "d.bin", "a.bin", "b.bin"])+ }+/// Two removals made at the same moment must keep their order from one render to the next.@Test func keepsTheOrderOfTwoRemovalsAtTheSameMoment() {let now = Date(timeIntervalSince1970: 1_800_000_000)diff --git a/Peel/Model/Inflection.swift b/Peel/Model/Inflection.swiftindex 24f8b484..e781e9bf 100644--- a/Peel/Model/Inflection.swift+++ b/Peel/Model/Inflection.swift@@ -1,6 +1,6 @@import Foundation-extension String {+nonisolated extension String {/// Builds a localized string with automatic grammar agreement applied.////// `String(localized:)` leaves inflection markup such as `^[2 app](inflect: true)` in the text as written.diff --git a/Peel/Model/InstallerLibrary.swift b/Peel/Model/InstallerLibrary.swiftindex 6bfb3cf9..c3810eaa 100644--- a/Peel/Model/InstallerLibrary.swift+++ b/Peel/Model/InstallerLibrary.swift@@ -72,7 +72,7 @@ extension InstallerLibrary: CarriesSelection {}}-extension InstallerItem.Kind {+nonisolated extension InstallerItem.Kind {var title: LocalizedStringResource {switch self {case .appInstaller: "App Installers"diff --git a/Peel/Model/RemovalHistoryStore.swift b/Peel/Model/RemovalHistoryStore.swiftindex 14c4bea4..8e6022b0 100644--- a/Peel/Model/RemovalHistoryStore.swift+++ b/Peel/Model/RemovalHistoryStore.swift@@ -3,7 +3,7 @@ import Foundationimport Observationimport PeelCore-struct RemovalBatch: Identifiable, Hashable {+nonisolated struct RemovalBatch: Identifiable, Hashable {let id: UUID/// Every tool the batch moved from, in the order they moved: one, or several for a batch that moved what was/// selected in more than one tool.@@ -56,6 +56,7 @@ struct RemovalBatch: Identifiable, Hashable {var size: SizeTotal { records.totalSize }+ @MainActorvar movedAnnouncement: AttributedString {size.isComplete && size.known > 0? AttributedString(localized: "Moved ^[\(records.count) item](inflect: true) to the Trash, \(size.known.byteCount).")@@ -74,7 +75,7 @@ struct RemovalInProgress {}/// What Peel was asked to move in one removal and did not.-struct RefusalBatch: Identifiable, Hashable {+nonisolated struct RefusalBatch: Identifiable, Hashable {let id: UUIDlet date: Datelet records: [RefusalRecord]@@ -125,13 +126,10 @@ final class RemovalHistoryStore {/// sits in many batches.var selectedIDs: Set<RemovalRecord.ID> = []var failures: [RemovalRecord.ID: RestoreFailure] = [:]-- /// Groups `records` into batches. The rule lives in `RemovalRecord.grouped`, where it is tested.- private static func batches(of records: [RemovalRecord]) -> [RemovalBatch] {- RemovalRecord.grouped(records).map { group in- RemovalBatch(id: group.id, parts: group.parts, date: group.date, records: group.records)- }- }+ /// Counts each change of what History lists. The lists are prepared off the main actor, and one prepared for an+ /// older change must never replace a newer one.+ private var listedChange = 0+ private var refusalChange = 0var selectedBatch: RemovalBatch? {batches.first { $0.id == selection }@@ -142,7 +140,7 @@ final class RemovalHistoryStore {}func load() async {- apply(await log.load())+ await apply(await log.load())await loadRefusals()hasLoaded = true}@@ -160,16 +158,18 @@ final class RemovalHistoryStore {/// Keeps a History that cannot be read beside a new one, and records again.func startOver() async {- apply(await log.startOver())+ await apply(await log.startOver())}private func loadRefusals() async {let read = await refusals.load()refusalProblem = read.problem- refusalBatches = RefusalRecord.grouped(read.records).map(RefusalBatch.init)- refusalSearchKeys = Dictionary(uniqueKeysWithValues: refusalBatches.map {- ($0.id, Self.searchKey(title: $0.title, names: $0.records.map(\.url.lastPathComponent)))- })+ refusalChange += 1+ let change = refusalChange+ let listed = await Self.listed(read.records)+ guard change == refusalChange else { return }+ refusalBatches = listed.batches+ refusalSearchKeys = listed.searchKeys}/// Records a removal from one place in History, as one entry. When Peel wrote the source itself, pass it in@@ -193,7 +193,7 @@ final class RemovalHistoryStore {if !result.trashed.isEmpty {let new = part.records(of: result, sizes: sizes, batch: removal.batch)removal.records += new- apply(await log.add(new))+ await apply(await log.add(new))}// Refusals are logged whether or not anything moved: a removal where nothing moved is the one most worth a// record.@@ -243,17 +243,46 @@ final class RemovalHistoryStore {await restore(undoable.records, canUseHelper: canUseHelper)}- /// Shows the log's records, or keeps what is already on screen when the log was left untouched.- private func apply(_ outcome: RemovalLogOutcome) {- if let records = outcome.records {- self.records = records- batches = Self.batches(of: records)- searchKeys = Dictionary(uniqueKeysWithValues: batches.map {- ($0.id, Self.searchKey(title: $0.title, names: $0.records.map(\.originalURL.lastPathComponent)))- })- }+ /// Shows the log's records, or keeps what is already on screen when the log was left untouched or holds the+ /// records listed already.+ private func apply(_ outcome: RemovalLogOutcome) async {problem = outcome.problemcheckReadability()+ guard let records = outcome.records else { return }+ listedChange += 1+ let change = listedChange+ guard let listed = await Self.listed(records, unless: self.records), change == listedChange else { return }+ self.records = records+ batches = listed.batches+ searchKeys = listed.searchKeys+ }++ /// History's batches, newest first, and what a search looks through, or nil when `records` are those listed+ /// already. Worked out off the main actor, since History keeps up to `RemovalLog.maximumRecords` records.+ @concurrent+ private static func listed(+ _ records: [RemovalRecord], unless shown: [RemovalRecord]+ ) async -> (batches: [RemovalBatch], searchKeys: [RemovalBatch.ID: String])? {+ guard records != shown else { return nil }+ let batches = RemovalRecord.grouped(records).map { group in+ RemovalBatch(id: group.id, parts: group.parts, date: group.date, records: group.records)+ }+ let searchKeys = Dictionary(uniqueKeysWithValues: batches.map {+ ($0.id, searchKey(title: $0.title, names: $0.records.map(\.originalURL.lastPathComponent)))+ })+ return (batches, searchKeys)+ }++ /// What was refused, one removal to an entry, and what a search looks through, worked out off the main actor.+ @concurrent+ private static func listed(+ _ records: [RefusalRecord]+ ) async -> (batches: [RefusalBatch], searchKeys: [RefusalBatch.ID: String]) {+ let batches = RefusalRecord.grouped(records).map(RefusalBatch.init)+ let searchKeys = Dictionary(uniqueKeysWithValues: batches.map {+ ($0.id, searchKey(title: $0.title, names: $0.records.map(\.url.lastPathComponent)))+ })+ return (batches, searchKeys)}func restore(_ records: [RemovalRecord], canUseHelper: Bool) async {@@ -276,7 +305,7 @@ final class RemovalHistoryStore {failures = problemsselectedIDs.subtract(restored)if !restored.isEmpty {- apply(await log.remove(restored))+ await apply(await log.remove(restored))// A move is announced, and so is its undoing: the rows only vanish from the list.AccessibilityNotification.Announcement(AttributedString(localized: "Put back ^[\(restored.count) item](inflect: true).")@@ -287,7 +316,7 @@ final class RemovalHistoryStore {/// Removes `records` from History. The page offers this for items that have left the Trash.func forget(_ records: [RemovalRecord]) async {- apply(await log.remove(Set(records.map(\.id))))+ await apply(await log.remove(Set(records.map(\.id))))selectedIDs.subtract(records.map(\.id))}@@ -306,7 +335,7 @@ final class RemovalHistoryStore {/// A batch's title and the name of each item in it, joined into one string, so a search makes one call/// per batch rather than one per record.- private static func searchKey(title: String, names: [String]) -> String {+ nonisolated private static func searchKey(title: String, names: [String]) -> String {([title] + names).joined(separator: "\n")}diff --git a/Peel/Navigation/Tool.swift b/Peel/Navigation/Tool.swiftindex 282a0596..a551e7e4 100644--- a/Peel/Navigation/Tool.swift+++ b/Peel/Navigation/Tool.swift@@ -2,7 +2,7 @@ import Foundation/// A tool in the sidebar. The order of the cases is the order within each group, in the sidebar and in the View/// menu, where the first nine tools get ⌘1 to ⌘9. The `.home` group (Home, Tweaks, History) comes first.-enum Tool: String, CaseIterable, Identifiable {+nonisolated enum Tool: String, CaseIterable, Identifiable {case home// Apps: what is installed, where it came from, and what it left behind.diff --git a/Peel/Views/Space/SpaceText.swift b/Peel/Views/Space/SpaceText.swiftindex 0bf36065..e9071b0b 100644--- a/Peel/Views/Space/SpaceText.swift+++ b/Peel/Views/Space/SpaceText.swift@@ -6,7 +6,7 @@ import SwiftUI////// They live in the app, not beside the paths in PeelCore, because the package has no string catalog: a/// `String(localized:)` there would resolve against whichever bundle loaded it.-extension SpaceItem {+nonisolated extension SpaceItem {struct Words {let title: LocalizedStringResourcelet detail: LocalizedStringResource