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.

Say when Space couldn't look into an area's folders

Țugui Dragoș66e04f2165cd
diff --git a/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift b/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift
index aab62949..a29c4107 100644
--- a/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift
@@ -27,6 +27,10 @@ public enum SpaceRemoval {
/// What the guard never moves from here, each with its reason, so the page can say why the area holds more
/// than it offers. What the person excluded is left out, as it is everywhere.
public var refused: [URL: GuardRefusal] = [:]
+ /// The folders Peel couldn't look into, so the area may hold more than the plan offers.
+ public var unreadable: [URL] = []
+ /// True when macOS's privacy protection kept Peel out of one of them, which Full Disk Access lifts.
+ public var needsFullDiskAccess = false
/// The open apps whose folders are left alone, each named once and sorted, by the names the user knows, not
/// the folder names. One app can write to several folders, by its name and by its identifier.
@@ -104,7 +108,9 @@ public enum SpaceRemoval {
inUse: children.inUse,
leftToDeveloper: children.leftToDeveloper,
sizes: sizes,
- heldBack: heldBack, needsTheHelper: needsTheHelper, refused: children.refused
+ heldBack: heldBack, needsTheHelper: needsTheHelper, refused: children.refused,
+ unreadable: children.unreadable,
+ needsFullDiskAccess: children.unreadable.contains { FullDiskAccess.canList($0) == .missing }
)
}
@@ -154,20 +160,29 @@ public enum SpaceRemoval {
environment: SearchEnvironment,
exclusions: Exclusions,
running: [String: String]
- ) -> (removable: [URL], inUse: [(url: URL, name: String)], leftToDeveloper: [URL], refused: [URL: GuardRefusal]) {
+ ) -> (
+ removable: [URL], inUse: [(url: URL, name: String)], leftToDeveloper: [URL], refused: [URL: GuardRefusal],
+ unreadable: [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] = []
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) {
- let children = try? FileManager.default.contentsOfDirectory(at: folder, includingPropertiesForKeys: nil)
+ guard let children = try? FileManager.default.contentsOfDirectory(
+ at: folder, includingPropertiesForKeys: nil
+ ) else {
+ if !folder.isMissing { unreadable.append(folder) }
+ return
+ }
let onlyFiles = inside || filesOnly.contains(PathPattern.comparablePath(of: folder))
- for child in children ?? [] {
+ for child in children {
let name = child.lastPathComponent
if item.leavesMacOSsOwn, SpaceInventory.isMacOSsOwn(name) { continue }
if onlyFiles, child.isRealFolder { continue }
@@ -214,7 +229,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)
+ return (removable, inUse, leftToDeveloper, refused, unreadable)
}
/// 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 bf66c562..dedbf9f5 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/SpaceRemovalTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/SpaceRemovalTests.swift
@@ -23,6 +23,32 @@ struct SpaceRemovalTests {
)
}
+ @Test(.permissionsHold) func namesTheFoldersItCannotLookIntoAndNeverReadsThemAsEmpty() async throws {
+ let directory = try TemporaryDirectory()
+ try directory.file("home/Library/Caches/com.example.open/cache.db")
+ try directory.file("home/Library/Logs/com.example.closed/log.txt")
+ let closed = directory.url.appending(path: "home/Library/Logs", directoryHint: .isDirectory)
+ let area = SpaceItem(
+ id: "caches-and-logs",
+ category: .library,
+ urls: [
+ directory.url.appending(path: "home/Library/Caches", directoryHint: .isDirectory),
+ closed,
+ directory.url.appending(path: "home/Library/Missing", directoryHint: .isDirectory),
+ ],
+ size: 0,
+ handling: .trash
+ )
+ try directory.setPermissions(0o000, of: "home/Library/Logs")
+ defer { try? directory.setPermissions(0o755, of: "home/Library/Logs") }
+
+ let plan = await SpaceRemoval.plan(for: area, environment: environment(directory))
+
+ #expect(plan.removable.map(\.lastPathComponent) == ["com.example.open"])
+ #expect(plan.unreadable == [closed])
+ #expect(!plan.needsFullDiskAccess)
+ }
+
/// An area only its own app or tool should empty, such as a virtual machine's disks, is never planned for the
/// Trash, whoever asks.
@Test func plansNothingInAnAreaItsOwnToolEmpties() async throws {
diff --git a/Peel/Views/Space/SpaceDetailView.swift b/Peel/Views/Space/SpaceDetailView.swift
index a83a5850..fe4b46af 100644
--- a/Peel/Views/Space/SpaceDetailView.swift
+++ b/Peel/Views/Space/SpaceDetailView.swift
@@ -114,8 +114,13 @@ struct SpaceDetailView: View {
@ViewBuilder
private func contents(of plan: SpaceRemoval.Plan) -> some View {
+ if plan.needsFullDiskAccess {
+ FullDiskAccessBanner()
+ } else if !plan.unreadable.isEmpty {
+ UnreadableFoldersNotice(folders: plan.unreadable)
+ }
Section {
- if plan.removable.isEmpty {
+ if plan.removable.isEmpty, plan.unreadable.isEmpty {
Text("Nothing in here can be moved now.")
.foregroundStyle(.secondary)
.listRowSeparator(.hidden)
@@ -213,7 +218,7 @@ struct SpaceDetailView: View {
/// The size of the item's folders until the plan is ready, then the size of what can be moved to the Trash.
private var total: SizeTotal {
guard let plan else { return SizeTotal([item.size]) }
- return SizeTotal(plan.removable.map { plan.sizes[$0] })
+ return SizeTotal(plan.removable.map { plan.sizes[$0] } + plan.unreadable.map { _ -> Int64? in nil })
}
private var caption: Text {