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.

Space works out the Developer page's folders once for each area

Țugui Dragoșec015f586986
diff --git a/Packages/PeelCore/Sources/PeelCore/Developer/DeveloperCaches.swift b/Packages/PeelCore/Sources/PeelCore/Developer/DeveloperCaches.swift
index 05eb97db..23cfcc0a 100644
--- a/Packages/PeelCore/Sources/PeelCore/Developer/DeveloperCaches.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Developer/DeveloperCaches.swift
@@ -290,25 +290,33 @@ public enum DeveloperCaches {
return DeveloperEnvironment.Archive(version: version, build: build)
}
- /// The tools' own folders inside `folder`, as the name patterns leading to each (`["Google", "AndroidStudio*"]`),
- /// which Space leaves to the Developer page. Both folders are read as the kernel names them, so another spelling
- /// of the same folder (another case, a link) finds the same.
- static func foldersLeftToDeveloper(inside folder: URL, home: URL) -> [[String]] {
- // Not through `comparablePath`: standardizing drops `/private` only from a path that exists, and most
- // paths in the table don't.
- let base = PathComponents.of(PathPattern.canonical(folder).path(percentEncoded: false))
- let home = PathComponents.of(PathPattern.canonical(home).path(percentEncoded: false))
- let owned = definitions.flatMap { definition in
- let ownFolders = definition.ownFolders.map { home + PathComponents.of($0) }
- return definition.folders.filter { $0.base == .home }.compactMap { folder -> [String]? in
- let full = home + PathComponents.of(folder.path)
- guard full.count > base.count, full.starts(with: base) else { return nil }
- let declared = ownFolders.first { $0.count > base.count && full.starts(with: $0) }
- let own = declared ?? Array(full.prefix(base.count + 1))
- return Array(own[base.count...])
+ /// The table's folders under one home, which Space leaves to the Developer page, worked out once for all the
+ /// folders of an area.
+ struct FoldersLeftToDeveloper {
+ private let folders: [(path: [String], own: [[String]])]
+
+ init(home: URL) {
+ // Not through `comparablePath`: standardizing drops `/private` only from a path that exists, and most
+ // paths in the table don't.
+ let home = PathComponents.of(PathPattern.canonical(home).path(percentEncoded: false))
+ folders = DeveloperCaches.definitions.flatMap { definition in
+ let own = definition.ownFolders.map { home + PathComponents.of($0) }
+ return definition.folders.filter { $0.base == .home }.map { (home + PathComponents.of($0.path), own) }
+ }
+ }
+
+ /// The tools' own folders inside `folder`, as the name patterns leading to each (`["Google",
+ /// "AndroidStudio*"]`). The folder is read as the kernel names it, as the home is, so another spelling of the
+ /// same folder (another case, a link) finds the same.
+ func inside(_ folder: URL) -> [[String]] {
+ let base = PathComponents.of(PathPattern.canonical(folder).path(percentEncoded: false))
+ let owned = folders.compactMap { path, own -> [String]? in
+ guard path.count > base.count, path.starts(with: base) else { return nil }
+ let declared = own.first { $0.count > base.count && path.starts(with: $0) }
+ return Array((declared ?? Array(path.prefix(base.count + 1)))[base.count...])
}
+ return Set(owned).sorted { $0.joined(separator: "/") < $1.joined(separator: "/") }
}
- return Set(owned).sorted { $0.joined(separator: "/") < $1.joined(separator: "/") }
}
/// The folders the Developer page offers, relative to the home folder. Only folders one tool owns outright
diff --git a/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift b/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift
index 9c5635ce..54f1d7d0 100644
--- a/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Space/SpaceRemoval.swift
@@ -154,11 +154,11 @@ public enum SpaceRemoval {
}
}
}
+ let developerFolders = DeveloperCaches.FoldersLeftToDeveloper(home: environment.homeDirectory)
for url in item.urls {
// Everything in an app's container is that app's, whatever its name.
let owner = systemCaches.container(holding: url).flatMap { running[Naming.normalized($0)] }
- let owned = DeveloperCaches.foldersLeftToDeveloper(inside: url, home: environment.homeDirectory)
- sort(url, leaving: owned, owner: owner)
+ sort(url, leaving: developerFolders.inside(url), owner: owner)
}
return (removable, inUse, leftToDeveloper, refused)
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/DeveloperCachesTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/DeveloperCachesTests.swift
index 2be7d360..dd19d61d 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/DeveloperCachesTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/DeveloperCachesTests.swift
@@ -77,7 +77,7 @@ struct DeveloperCachesTests {
try FileManager.default.createSymbolicLink(at: directory.url.appending(path: "link"), withDestinationURL: directory.url.appending(path: "home"))
let home = directory.url.appending(path: "home", directoryHint: .isDirectory)
- let left = { (folder: URL) in DeveloperCaches.foldersLeftToDeveloper(inside: folder, home: home) }
+ let left = DeveloperCaches.FoldersLeftToDeveloper(home: home).inside
let asWritten = left(home.appending(path: "Library/Caches", directoryHint: .isDirectory))
let otherCase = left(home.appending(path: "library/caches", directoryHint: .isDirectory))
let throughALink = left(directory.url.appending(path: "link/Library/Caches", directoryHint: .isDirectory))
@@ -672,7 +672,7 @@ struct DeveloperCachesTests {
#expect(locations.map(\.url.lastPathComponent) == ["CoreSimulator"])
#expect(locations.first?.kind == .logs)
- #expect(DeveloperCaches.foldersLeftToDeveloper(inside: logs, home: directory.url).contains(["CoreSimulator"]))
+ #expect(DeveloperCaches.FoldersLeftToDeveloper(home: directory.url).inside(logs).contains(["CoreSimulator"]))
}
@Test func listsDerivedDataByWorkspaceAndLeavesTheOnesUsedThisWeek() async throws {