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
Duplicates' walks let go of what they read as they go
Țugui Dragoș2bb951487373
diff --git a/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swift b/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swiftindex e0bb0707..812710f8 100644--- a/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swift+++ b/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swift@@ -162,38 +162,42 @@ public struct DuplicateFinder: Sendable {}) else { continue }- for case let url as URL in enumerator {+ // The enumerator's answer and each look at it get an autorelease pool of their own, or what Foundation+ // reads for every entry would pile up in memory until the walk ends.+ while let url = autoreleasepool(invoking: { enumerator.nextObject() as? URL }) {visited += 1if visited.isMultiple(of: 256) {guard !Task.isCancelled else { throw CancellationError() }progress(.collecting(filesFound: walked.count))}- if ProjectArtifacts.isMarker(url.lastPathComponent) {- let parent = Self.path(of: url.deletingLastPathComponent())- if !neverProjects.contains(parent) { projects.insert(parent) }- }- guard let values = try? url.resourceValues(forKeys: keys) else { continue }- if values.isDirectory == true {- // The enumerator does not treat a library as a package when its app is not installed, so- // libraries are skipped here: the guard would refuse every copy inside one. A folder already- // offered whole covers everything inside it, so its files are not offered again.- if url.lastPathComponent == "node_modules" || excludedFolders.contains(Self.path(of: url))- || spokenFor.contains(Self.path(of: url))- || exclusions.excludes(url) || Self.isRepository(url) || Self.isAUserLibrary(url) {- enumerator.skipDescendants()+ autoreleasepool {+ if ProjectArtifacts.isMarker(url.lastPathComponent) {+ let parent = Self.path(of: url.deletingLastPathComponent())+ if !neverProjects.contains(parent) { projects.insert(parent) }+ }+ guard let values = try? url.resourceValues(forKeys: keys) else { return }+ if values.isDirectory == true {+ // The enumerator does not treat a library as a package when its app is not installed, so+ // libraries are skipped here: the guard would refuse every copy inside one. A folder+ // already offered whole covers everything inside it, so its files are not offered again.+ if url.lastPathComponent == "node_modules" || excludedFolders.contains(Self.path(of: url))+ || spokenFor.contains(Self.path(of: url))+ || exclusions.excludes(url) || Self.isRepository(url) || Self.isAUserLibrary(url) {+ enumerator.skipDescendants()+ }+ return}- continue+ var info = stat()+ guard+ values.isRegularFile == true,+ lstat(url.path(percentEncoded: false), &info) == 0,+ info.st_mode & S_IFMT == S_IFREG,+ info.st_flags & UInt32(SF_DATALESS) == 0,+ ReclaimableSpace.held(info) >= minimumSize,+ options.kind == .any || values.contentType.map(options.kind.includes) == true+ else { return }+ walked.append(Candidate(url: url, identity: FileIdentity(info)))}- var info = stat()- guard- values.isRegularFile == true,- lstat(url.path(percentEncoded: false), &info) == 0,- info.st_mode & S_IFMT == S_IFREG,- info.st_flags & UInt32(SF_DATALESS) == 0,- ReclaimableSpace.held(info) >= minimumSize,- options.kind == .any || values.contentType.map(options.kind.includes) == true- else { continue }- walked.append(Candidate(url: url, identity: FileIdentity(info)))}}guard !Task.isCancelled else { throw CancellationError() }diff --git a/Packages/PeelCore/Sources/PeelCore/Duplicates/FolderDuplicates.swift b/Packages/PeelCore/Sources/PeelCore/Duplicates/FolderDuplicates.swiftindex cdfbbf0e..ffc765a6 100644--- a/Packages/PeelCore/Sources/PeelCore/Duplicates/FolderDuplicates.swift+++ b/Packages/PeelCore/Sources/PeelCore/Duplicates/FolderDuplicates.swift@@ -74,6 +74,8 @@ struct FolderDuplicates: Sendable {progress(.listing(foldersFound: found))let candidates = self.candidates(in: listed, minimumSize: minimumSize)+ // Only the candidates are needed from here, and each holds the folders inside it.+ listed.removeAll()guard !candidates.isEmpty else { return [] }let files = Self.files(in: candidates)@@ -135,60 +137,77 @@ struct FolderDuplicates: Sendable {let folder = Folder(url: url, identity: identity, isNeverOffered: isNeverOffered)guard !Task.isCancelled else { throw CancellationError() }onListing()- guard depth < Self.depthLimit,- let entries = try? FileManager.default.contentsOfDirectory(at: url, includingPropertiesForKeys: nil)- else {+ // The listing and each entry get an autorelease pool of their own, or what Foundation reads for every entry+ // would pile up in memory until the walk ends.+ guard depth < Self.depthLimit, let contents = autoreleasepool(invoking: { entries(of: url, depth: depth) }) else {folder.isWhole = falsereturn folder}- if depth > 0, !neverProjects.contains(DuplicateFinder.path(of: url)), entries.contains(where: { ProjectArtifacts.isMarker($0.lastPathComponent) }) {+ guard !contents.isProject else {folder.isProject = truereturn folder}- for entry in entries {- var info = stat()- guard lstat(entry.path(percentEncoded: false), &info) == 0, !exclusions.excludes(entry) else {- folder.isWhole = false- continue- }- switch info.st_mode & S_IFMT {- case S_IFDIR:- guard !managed.contains(DuplicateFinder.path(of: entry)),- entry.lastPathComponent != "node_modules",- !DuplicateFinder.isAUserLibrary(entry),- !DuplicateFinder.isRepository(entry)- else {- folder.isWhole = false- continue- }- let child = try list(- entry,- identity: FileIdentity(info),- depth: depth + 1,- isNeverOffered: isNeverOffered || Self.isHidden(entry, info) || entry.isAPackage,- onListing: onListing- )+ for entry in contents.entries {+ switch autoreleasepool(invoking: { look(at: entry, isNeverOffered: isNeverOffered) }) {+ case .folder(let name, let identity, let isNeverOffered):+ let child = try list(entry, identity: identity, depth: depth + 1, isNeverOffered: isNeverOffered, onListing: onListing)guard !child.isProject else {folder.isWhole = falsecontinue}folder.isWhole = folder.isWhole && child.isWhole- folder.children.append((entry.lastPathComponent, child))- case S_IFREG:- guard info.st_flags & UInt32(SF_DATALESS) == 0, !entry.isInTheCloud else {- folder.isWhole = false- continue- }- folder.files.append((entry.lastPathComponent, FileIdentity(info)))- folder.held += ReclaimableSpace.held(info)- default:+ folder.children.append((name, child))+ case .file(let name, let identity, let held):+ folder.files.append((name, identity))+ folder.held += held+ case .leftOut:folder.isWhole = false}}return folder}+ /// The entries of `url`, and whether a build file among them makes it a project.+ private func entries(of url: URL, depth: Int) -> (entries: [URL], isProject: Bool)? {+ guard let entries = try? FileManager.default.contentsOfDirectory(at: url, includingPropertiesForKeys: nil) else {+ return nil+ }+ let isProject = depth > 0 && !neverProjects.contains(DuplicateFinder.path(of: url))+ && entries.contains { ProjectArtifacts.isMarker($0.lastPathComponent) }+ return (entries, isProject)+ }++ private enum Entry {+ case folder(name: String, identity: FileIdentity, isNeverOffered: Bool)+ case file(name: String, identity: FileIdentity, held: Int64)+ /// Something the comparison leaves out, and with it the folder around it.+ case leftOut+ }++ private func look(at entry: URL, isNeverOffered: Bool) -> Entry {+ var info = stat()+ guard lstat(entry.path(percentEncoded: false), &info) == 0, !exclusions.excludes(entry) else { return .leftOut }+ switch info.st_mode & S_IFMT {+ case S_IFDIR:+ guard !managed.contains(DuplicateFinder.path(of: entry)),+ entry.lastPathComponent != "node_modules",+ !DuplicateFinder.isAUserLibrary(entry),+ !DuplicateFinder.isRepository(entry)+ else { return .leftOut }+ return .folder(+ name: entry.lastPathComponent,+ identity: FileIdentity(info),+ isNeverOffered: isNeverOffered || Self.isHidden(entry, info) || entry.isAPackage+ )+ case S_IFREG:+ guard info.st_flags & UInt32(SF_DATALESS) == 0, !entry.isInTheCloud else { return .leftOut }+ return .file(name: entry.lastPathComponent, identity: FileIdentity(info), held: ReclaimableSpace.held(info))+ default:+ return .leftOut+ }+ }+/// A digest of the names and sizes in `folder`, so folders that cannot hold the same bytes are told apart/// without reading a file. It also fills in the folder's file count, size, and `totalHeld`.private func shape(of folder: Folder) -> SHA256.Digest {