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.

List a folder Space couldn't look into, left alone with its reason

Țugui Dragoșa405998b51df
diff --git a/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift b/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift
index dc38a165..21ebb1e3 100644
--- a/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift
@@ -100,6 +100,9 @@ public enum SpaceRemoval {
let measured = await children.removable.concurrentMap(width: LeftoverScanner.concurrentMeasurements) { child in
(child, await measure(child))
}
+ for child in children.closed {
+ heldBack[child] = .couldNotLookInside
+ }
for (child, contents) in measured {
sizes[child] = contents.flatMap { $0.couldNotBeRead ? nil : $0.size }
let needsAnAdministrator = FileAccess.requiresPrivilegesToRemove(child)
@@ -111,7 +114,7 @@ public enum SpaceRemoval {
? .writtenRecently : nil)
}
return Plan(
- removable: children.removable,
+ removable: children.removable + children.closed,
inUse: children.inUse,
leftToDeveloper: children.leftToDeveloper,
sizes: sizes,
@@ -169,16 +172,17 @@ public enum SpaceRemoval {
running: [String: String]
) -> (
removable: [URL], inUse: [(url: URL, name: String)], leftToDeveloper: [URL], refused: [URL: GuardRefusal],
- unreadable: [URL]
+ unreadable: [URL], closed: [URL]
) {
// An area only its own app or tool should empty, such as a virtual machine's disks, offers nothing.
- guard item.handling == .trash else { return ([], [], [], [:], []) }
+ guard item.handling == .trash else { return ([], [], [], [:], [], []) }
let removalGuard = RemovalGuard(environment: environment, exclusions: exclusions)
var removable: [URL] = []
var inUse: [(url: URL, name: String)] = []
var leftToDeveloper: [URL] = []
var refused: [URL: GuardRefusal] = [:]
var unreadable: [URL] = []
+ var closed: [URL] = []
let macOSsOwn = MacOSsOwnItems(environment: environment)
let filesOnly = Set(item.onlyFilesIn.map(PathPattern.comparablePath))
func sort(_ folder: URL, leaving owned: [[String]], owner: String?, onlyFiles inside: Bool = false) {
@@ -213,6 +217,10 @@ public enum SpaceRemoval {
// A folder that stays itself is one Space empties on its own page, or one macOS expects to find.
case .staysItself:
continue
+ // Listed and left alone with its reason, as on every page: it may hold what Peel never moves.
+ case .couldNotLookInside:
+ closed.append(child)
+ continue
case let refusal?:
refused[child] = refusal
continue
@@ -236,7 +244,7 @@ public enum SpaceRemoval {
let owner = macOSsOwn.container(holding: url).flatMap { running[Naming.normalized($0)] }
sort(url, leaving: developerFolders.inside(url), owner: owner)
}
- return (removable, inUse, leftToDeveloper, refused, unreadable)
+ return (removable, inUse, leftToDeveloper, refused, unreadable, closed)
}
/// Maps each name an open app answers to, normalized, to the app's display name. The names are the bundle
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/SpaceRemovalTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/SpaceRemovalTests.swift
index 361eff6f..274e92fa 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/SpaceRemovalTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/SpaceRemovalTests.swift
@@ -832,6 +832,21 @@ struct SpaceRemovalTests {
#expect(plan.selection(keeping: [vendor, system], canUseHelper: true) == [vendor, system])
}
+ @Test(.permissionsHold) func listsAFolderItCannotLookIntoAsLeftAlone() async throws {
+ let directory = try TemporaryDirectory()
+ try directory.file("home/Library/Caches/org.example.app/closed/blob")
+ try directory.setPermissions(0, of: "home/Library/Caches/org.example.app/closed")
+ defer { try? directory.setPermissions(0o755, of: "home/Library/Caches/org.example.app/closed") }
+
+ let plan = await SpaceRemoval.plan(for: item(directory), environment: environment(directory), running: [:])
+
+ #expect(plan.removable.map(\.lastPathComponent) == ["org.example.app"])
+ #expect(plan.heldBack.map { [$0.key.lastPathComponent: $0.value] } == [["org.example.app": .couldNotLookInside]])
+ #expect(plan.refused.isEmpty)
+ #expect(plan.selectableRows(canUseHelper: true).selectable.isEmpty)
+ #expect(plan.movable(canUseHelper: true).reading == .exactly(0))
+ }
+
@Test func countsOnlyWhatCanBeMovedNow() {
let caches = URL(filePath: "/Library/Caches", directoryHint: .isDirectory)
let (open, system, beyond) = (caches.appending(path: "a"), caches.appending(path: "b"), caches.appending(path: "c"))