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.

Sizes are added up the same capped way everywhere

Țugui Dragoș9f97f9241445
diff --git a/Packages/PeelCore/Sources/PeelCore/Support/CappedSum.swift b/Packages/PeelCore/Sources/PeelCore/Support/CappedSum.swift
index ac556b23..50ea8ce5 100644
--- a/Packages/PeelCore/Sources/PeelCore/Support/CappedSum.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Support/CappedSum.swift
@@ -7,3 +7,10 @@ extension FixedWidthInteger {
return other < 0 ? .min : .max
}
}
+
+extension Sequence where Element: FixedWidthInteger {
+ /// The sum of the elements, capped as `addingCapped` caps it.
+ public var cappedSum: Element {
+ reduce(0) { $0.addingCapped($1) }
+ }
+}
diff --git a/Packages/PeelCore/Sources/PeelCore/Support/SizeTotal.swift b/Packages/PeelCore/Sources/PeelCore/Support/SizeTotal.swift
index 98bd572b..7f802335 100644
--- a/Packages/PeelCore/Sources/PeelCore/Support/SizeTotal.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Support/SizeTotal.swift
@@ -21,6 +21,11 @@ public struct SizeTotal: Sendable, Hashable, Comparable, Codable {
self.init(known: known, isComplete: isComplete)
}
+ /// Adds totals together. The sum is complete only when every part is.
+ public init(combining totals: some Sequence<SizeTotal>) {
+ self = totals.reduce(SizeTotal(known: 0, isComplete: true)) { $0.adding($1) }
+ }
+
public func adding(_ other: SizeTotal) -> SizeTotal {
SizeTotal(known: known.addingCapped(other.known), isComplete: isComplete && other.isComplete)
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/CappedSumTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/CappedSumTests.swift
index e8a6ee84..24dc5f09 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/CappedSumTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/CappedSumTests.swift
@@ -10,6 +10,19 @@ struct CappedSumTests {
#expect(Int.min.addingCapped(-1) == .min)
}
+ @Test func sumsASequenceUpToTheLargestNumber() {
+ #expect([Int64.max, 1, 2].cappedSum == .max)
+ #expect([Int64(40), 2].cappedSum == 42)
+ #expect([Int64]().cappedSum == 0)
+ }
+
+ @Test func combinesTotalsUpToTheLargestNumber() {
+ let whole = SizeTotal(combining: [SizeTotal(known: .max, isComplete: true), SizeTotal(known: 1, isComplete: true)])
+ #expect(whole == SizeTotal(known: .max, isComplete: true))
+ let part = SizeTotal(combining: [SizeTotal(known: 10, isComplete: true), SizeTotal(known: 5, isComplete: false)])
+ #expect(part == SizeTotal(known: 15, isComplete: false))
+ }
+
@Test func addsAsUsualBelowTheLimit() {
#expect(40.addingCapped(2) == 42)
#expect(Int64(0).addingCapped(0) == 0)
diff --git a/Peel/Model/CloudLibrary.swift b/Peel/Model/CloudLibrary.swift
index 467859ee..f328fc7a 100644
--- a/Peel/Model/CloudLibrary.swift
+++ b/Peel/Model/CloudLibrary.swift
@@ -31,7 +31,7 @@ final class CloudLibrary {
/// What the listed files take on this Mac, only the least it can be when there is more than the list shows.
var total: SizeTotal {
- SizeTotal(known: (files ?? []).reduce(0) { $0.addingCapped($1.size) }, isComplete: !wasCutShort)
+ SizeTotal(known: (files ?? []).map(\.size).cappedSum, isComplete: !wasCutShort)
}
/// The files whose folder or path holds `query`, every file for an empty one.
@@ -44,7 +44,7 @@ final class CloudLibrary {
}
private func updateSelectedSize() {
- selectedSize = selectedURLs.reduce(0) { $0 + (sizes[$1] ?? 0) }
+ selectedSize = selectedURLs.map { sizes[$0] ?? 0 }.cappedSum
}
/// Scans again. What the last Free Up Space refused is cleared, since it described the old list.
@@ -67,6 +67,6 @@ final class CloudLibrary {
let kept = Set(refused.map(\.url))
await refresh()
refusals = refused
- return chosen.filter { !kept.contains($0.url) }.reduce(0) { $0 + $1.size }
+ return chosen.filter { !kept.contains($0.url) }.map(\.size).cappedSum
}
}
diff --git a/Peel/Model/FoundLastTimeStore.swift b/Peel/Model/FoundLastTimeStore.swift
index acdd72ec..a339bb1a 100644
--- a/Peel/Model/FoundLastTimeStore.swift
+++ b/Peel/Model/FoundLastTimeStore.swift
@@ -88,7 +88,7 @@ extension InstallerLibrary {
extension DuplicateLibrary {
var looked: Looked? {
scan.map { scan in
- let reclaimable = scan.groups.reduce(0) { $0 + $1.reclaimableSize } + scan.folderGroups.reduce(0) { $0 + $1.reclaimableSize }
+ let reclaimable = (scan.groups.map(\.reclaimableSize) + scan.folderGroups.map(\.reclaimableSize)).cappedSum
return Looked(count: scan.groups.count + scan.folderGroups.count, size: SizeTotal(known: reclaimable, isComplete: true))
}
}
diff --git a/Peel/Views/Duplicates/DuplicateFolderGroupView.swift b/Peel/Views/Duplicates/DuplicateFolderGroupView.swift
index 919d2e39..33024f03 100644
--- a/Peel/Views/Duplicates/DuplicateFolderGroupView.swift
+++ b/Peel/Views/Duplicates/DuplicateFolderGroupView.swift
@@ -6,7 +6,7 @@ struct DuplicateFolderGroupView: View {
let group: DuplicateFolderGroup
private var selectedSize: Int64 {
- group.folders.filter { duplicates.selectedFolders.contains($0.url) }.reduce(0) { $0 + $1.reclaimableSize }
+ group.folders.filter { duplicates.selectedFolders.contains($0.url) }.map(\.reclaimableSize).cappedSum
}
var body: some View {
diff --git a/Peel/Views/Duplicates/DuplicateGroupView.swift b/Peel/Views/Duplicates/DuplicateGroupView.swift
index d4b8d6cc..1a4b2e11 100644
--- a/Peel/Views/Duplicates/DuplicateGroupView.swift
+++ b/Peel/Views/Duplicates/DuplicateGroupView.swift
@@ -9,7 +9,7 @@ struct DuplicateGroupView: View {
/// What the selection in this group would free.
private var selectedSize: Int64 {
- group.files.filter { duplicates.selectedURLs.contains($0.url) }.reduce(0) { $0 + $1.reclaimableSize }
+ group.files.filter { duplicates.selectedURLs.contains($0.url) }.map(\.reclaimableSize).cappedSum
}
var body: some View {
diff --git a/Peel/Views/ToolSummaries.swift b/Peel/Views/ToolSummaries.swift
index 9064f506..7ca37573 100644
--- a/Peel/Views/ToolSummaries.swift
+++ b/Peel/Views/ToolSummaries.swift
@@ -8,13 +8,6 @@ import SwiftUI
// order, as Japanese or Turkish need. The sentences avoid verbs that would have to agree with a number, and the
// total comes first because `SizeTotal.text` ("Over X") is written to stand on its own.
-extension SizeTotal {
- /// Adds totals together. The sum is complete only when every part is.
- init(combining totals: [SizeTotal]) {
- self.init(known: totals.reduce(0) { $0 + $1.known }, isComplete: totals.allSatisfy(\.isComplete))
- }
-}
-
extension Tool {
/// What the tool found, as its pane says it and Home repeats it, or nil for a tool with no such sentence.
func sentence(for looked: Looked) -> AttributedString? {
@@ -73,7 +66,7 @@ extension AppLibrary {
var summary: AttributedString? {
guard hasLoaded else { return nil }
let count = apps.count
- let known = sizes.values.reduce(0, +)
+ let known = sizes.values.cappedSum
let total = SizeTotal(known: known, isComplete: sizes.count >= count)
let size = known > 0 ? AttributedString(localized: "\(total.text) in ^[\(count) app](inflect: true).") : AttributedString(localized: "^[\(count) app](inflect: true).")
guard let updates = Tool.applications.summary(of: Looked(count: appsWithUpdates.count, size: nil)) else { return size }
@@ -113,7 +106,7 @@ extension HomebrewLibrary {
extension FileSearchLibrary {
var summary: AttributedString? {
results.flatMap { results in
- Tool.fileSearch.summary(of: Looked(count: results.files.count, size: SizeTotal(known: results.files.reduce(0) { $0 + $1.size }, isComplete: true)))
+ Tool.fileSearch.summary(of: Looked(count: results.files.count, size: SizeTotal(known: results.files.map(\.size).cappedSum, isComplete: true)))
}
}
}