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
Say which chosen folders Build Artifacts couldn't search
Țugui Dragoș727fc0e542d0
diff --git a/GUIDE.md b/GUIDE.mdindex 74ea27ad..2897f11a 100644--- a/GUIDE.md+++ b/GUIDE.md@@ -98,7 +98,9 @@ exists, and a cache with a wallet, a signing key, or a password database inside.when a file of the tool that makes it proves it. Nothing is selected for you, and Select Recommended passes by aproject changed in the last 7 days, installed packages (a Python environment, `vendor`, Terraform's `.terraform`),and a folder like `target` whose name says nothing on its own. Until you choose a folder, Peel offers `~/Developer`,-`~/Projects`, `~/Code`, or `~/src` when you have one, and adds it only when you say so.+`~/Projects`, `~/Code`, or `~/src` when you have one, and adds it only when you say so. A chosen folder Peel can't+search, such as one on a disk that isn't connected, is named at the top of the page with the reason, never taken for+one with nothing built in it.**Space:** what's taking up room, and which app it belongs to. What an app manages itself, such as Xcode'ssimulators, Docker's disk, Rust's toolchains, or Android's NDK versions, Space measures and leaves to that tool,diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstringsindex 26f611b6..14df06e9 100644--- a/Localization/Peel/Localizable.xcstrings+++ b/Localization/Peel/Localizable.xcstrings@@ -85572,6 +85572,112 @@}}},+ "Not Everything Could Be Searched" : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Ne vše se podařilo prohledat"+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Nicht alles konnte durchsucht werden"+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "No se ha podido buscar en todo"+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Tout n’a pas pu être parcouru"+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Non è stato possibile cercare ovunque"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "一部を検索できませんでした"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "일부 항목을 검색할 수 없음"+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Niet alles kon worden doorzocht"+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Nie wszystko udało się przeszukać"+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Nem Tudo Pôde Ser Buscado"+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Nu s‑a putut căuta peste tot"+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Не везде удалось выполнить поиск"+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Allt kunde inte genomsökas"+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Bazı Klasörlerde Arama Yapılamadı"+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Не всюди вдалося виконати пошук"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "未能搜索全部内容"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "部分內容無法搜尋"+ }+ }+ }+ },"Not Moved" : {"localizations" : {"cs" : {@@ -139856,6 +139962,112 @@}}},+ "Some folders couldn’t be searched" : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Některé složky nelze prohledat"+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Einige Ordner konnten nicht durchsucht werden"+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "No se ha podido buscar en algunas carpetas"+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Certains dossiers n’ont pas pu être parcourus"+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Impossibile cercare in alcune cartelle"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "一部のフォルダを検索できませんでした"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "일부 폴더를 검색할 수 없음"+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Sommige mappen konden niet worden doorzocht"+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Nie udało się przeszukać niektórych folderów"+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Não foi possível buscar em algumas pastas"+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "În unele dosare nu s‑a putut căuta"+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "В некоторых папках не удалось выполнить поиск"+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vissa mappar kunde inte genomsökas"+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Bazı klasörlerde arama yapılamadı"+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "У деяких папках не вдалося виконати пошук"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "未能搜索部分文件夹"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "部分檔案夾無法搜尋"+ }+ }+ }+ },"Some items couldn’t be moved to the Trash." : {"localizations" : {"cs" : {diff --git a/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swift b/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swiftindex 7114e1ce..4bd7b9a6 100644--- a/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swift+++ b/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swift@@ -439,6 +439,8 @@ public enum ProjectArtifacts {public var unreadableLocations: [URL] = []/// True when macOS kept Peel out of one of them for want of Full Disk Access.public var needsFullDiskAccess = false+ /// The chosen folders that were not searched at all, each with the reason, in the order they were given.+ public var refusedRoots: [(url: URL, reason: Refusal)] = []}@concurrent@@ -449,7 +451,12 @@ public enum ProjectArtifacts {@concurrentstatic func scan(roots: [URL], exclusions: Exclusions, measure: @escaping LeftoverScanner.Measure) async -> Scan {await withTaskGroup(of: (artifacts: [ProjectArtifact], wasCutShort: Bool, unreadable: [URL]).self) { group in- for root in roots where isSearchable(root) {+ var refused: [(url: URL, reason: Refusal)] = []+ for root in roots {+ if let reason = refusal(for: root) {+ refused.append((root, reason))+ continue+ }group.addTask { await artifacts(in: root, exclusions: exclusions, measure: measure) }}var found: [ProjectArtifact] = []@@ -469,7 +476,8 @@ public enum ProjectArtifacts {unreadableLocations: unreadable.sorted {PathPattern.comparablePath(of: $0) < PathPattern.comparablePath(of: $1)},- needsFullDiskAccess: unreadable.contains { FullDiskAccess.canList($0) == .missing }+ needsFullDiskAccess: unreadable.contains { FullDiskAccess.canList($0) == .missing },+ refusedRoots: refused)}}@@ -526,10 +534,6 @@ public enum ProjectArtifacts {return root.isOrIsInsideAPackage ? .inAPackage : nil}- static func isSearchable(_ root: URL, home: URL = .homeDirectory) -> Bool {- refusal(for: root, home: home) == nil- }-/// Walks `root` for artifacts. Each folder is read on a thread of its own, within `FileSize`'s budget, since a/// folder on a network volume that stopped answering would otherwise hold one of the threads every scan/// shares, where a Stop cannot reach it. `listing` stands in for the listing in a test.diff --git a/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swiftindex 19d61bdf..b34cc56e 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swift@@ -134,6 +134,20 @@ struct ProjectArtifactsTests {#expect(!scan.needsFullDiskAccess)}+ @Test func namesEveryChosenFolderItCouldNotSearch() async throws {+ let directory = try TemporaryDirectory()+ try directory.file("Code/app/package.json", bytes: 16)+ try directory.file("Code/app/node_modules/left-pad/index.js", bytes: 16)+ let code = directory.url.appending(path: "Code", directoryHint: .isDirectory)+ let unplugged = directory.url.appending(path: "Disk/Projects", directoryHint: .isDirectory)++ let scan = await ProjectArtifacts.scan(roots: [unplugged, code])++ #expect(scan.artifacts.map(\.name) == ["node_modules"])+ #expect(scan.refusedRoots.map(\.url) == [unplugged])+ #expect(scan.refusedRoots.map(\.reason) == [.notAFolder])+ }+private struct Kind {let artifact: Stringlet marker: String@@ -605,11 +619,11 @@ struct ProjectArtifactsTests {}@Test func refusesRootsThatAreTooBroadOrNotOurs() {- #expect(!ProjectArtifacts.isSearchable(URL(filePath: "/")))- #expect(!ProjectArtifacts.isSearchable(URL(filePath: "/Users")))- #expect(!ProjectArtifacts.isSearchable(URL(filePath: "/Users/x/Library/Mobile Documents/com~apple~Pages")))- #expect(!ProjectArtifacts.isSearchable(URL(filePath: "/Users/x/Library/CloudStorage/Dropbox")))- #expect(!ProjectArtifacts.isSearchable(URL(filePath: "/Users/x/does-not-exist")))+ #expect(ProjectArtifacts.refusal(for: URL(filePath: "/")) == .tooBroad)+ #expect(ProjectArtifacts.refusal(for: URL(filePath: "/Users")) == .tooBroad)+ #expect(ProjectArtifacts.refusal(for: URL(filePath: "/Users/x/Library/Mobile Documents/com~apple~Pages")) == .inTheCloud)+ #expect(ProjectArtifacts.refusal(for: URL(filePath: "/Users/x/Library/CloudStorage/Dropbox")) == .inTheCloud)+ #expect(ProjectArtifacts.refusal(for: URL(filePath: "/Users/x/does-not-exist")) == .notAFolder)}@Test func findsEveryKindItKnowsInAProjectOfItsOwn() async throws {@@ -661,10 +675,10 @@ struct ProjectArtifactsTests {let home = try directory.directory("Users/someone")try directory.directory("Users/someone/Projects")- #expect(!ProjectArtifacts.isSearchable(URL(filePath: "/Users/someone"), home: home))- #expect(!ProjectArtifacts.isSearchable(URL(filePath: "/Volumes/Disk"), home: home))- #expect(!ProjectArtifacts.isSearchable(home, home: home))- #expect(ProjectArtifacts.isSearchable(home.appending(path: "Projects"), home: home))+ #expect(ProjectArtifacts.refusal(for: URL(filePath: "/Users/someone"), home: home) == .tooBroad)+ #expect(ProjectArtifacts.refusal(for: URL(filePath: "/Volumes/Disk"), home: home) == .tooBroad)+ #expect(ProjectArtifacts.refusal(for: home, home: home) == .tooBroad)+ #expect(ProjectArtifacts.refusal(for: home.appending(path: "Projects"), home: home) == nil)}/// An Electron app ships `package.json` beside `node_modules` inside its own bundle. That matches the markerdiff --git a/Peel/Model/ProjectLibrary.swift b/Peel/Model/ProjectLibrary.swiftindex df400e49..98092bd5 100644--- a/Peel/Model/ProjectLibrary.swift+++ b/Peel/Model/ProjectLibrary.swift@@ -36,6 +36,8 @@ final class ProjectLibrary {private(set) var needsFullDiskAccess = false/// The folders the last scan could not read, so what they hold isn't known.private(set) var unreadable: [URL] = []+ /// The chosen folders the last scan didn't search at all, each with the reason.+ private(set) var unsearchable: [(url: URL, reason: ProjectArtifacts.Refusal)] = []/// Folders the last Add refused, with the reason, until the next one.private(set) var refused: [(url: URL, reason: ProjectArtifacts.Refusal)] = []var selection: URL?@@ -62,6 +64,7 @@ final class ProjectLibrary {wasCutShort = scan.wasCutShortneedsFullDiskAccess = scan.needsFullDiskAccessunreadable = scan.unreadableLocations+ unsearchable = scan.refusedRootslet result = Dictionary(grouping: artifacts, by: \.project).map {ProjectGroup(diff --git a/Peel/Views/Projects/ProjectList.swift b/Peel/Views/Projects/ProjectList.swiftindex 67685bc8..37625050 100644--- a/Peel/Views/Projects/ProjectList.swift+++ b/Peel/Views/Projects/ProjectList.swift@@ -33,6 +33,15 @@ struct ProjectList: View {} else if !projects.unreadable.isEmpty, !filtered.isEmpty {UnreadableFoldersNotice(folders: projects.unreadable)}+ if !projects.unsearchable.isEmpty, !filtered.isEmpty {+ Notice(+ title: Text("Some folders couldn’t be searched"),+ detail: Text(verbatim: Self.reasons(projects.unsearchable)),+ kind: .note+ ) {}+ .padding(.vertical, 6)+ .listRowSeparator(.hidden)+ }ForEach(filtered) { group inProjectRow(group: group)}@@ -72,6 +81,12 @@ struct ProjectList: View {} description: {Text("Peel couldn’t look inside \(projects.unreadable.map(\.abbreviatedPath).formatted(.list(type: .and))), so something may be there that isn’t listed here.")}+ } else if projects.groups?.isEmpty == true, !projects.unsearchable.isEmpty {+ ContentUnavailableView {+ Label("Not Everything Could Be Searched", systemImage: "exclamationmark.triangle")+ } description: {+ Text(verbatim: Self.reasons(projects.unsearchable))+ }} else if projects.groups?.isEmpty == true {ContentUnavailableView("Nothing Built Here",@@ -96,7 +111,7 @@ struct ProjectList: View {.alert(projects.refused.count == 1 ? "That folder can’t be searched." : "These folders can’t be searched.", isPresented: isShowingRefusal) {Button("OK", role: .cancel) {}} message: {- Text(verbatim: projects.refused.map { "\($0.url.abbreviatedPath)\n\($0.reason.explanation)" }.joined(separator: "\n\n"))+ Text(verbatim: Self.reasons(projects.refused))}.fadesInColumn(whenRowsChange: projects.groups?.map(\.id)).navigationTitle(Text(Tool.projects.title))@@ -104,7 +119,8 @@ struct ProjectList: View {projects.isScanning,found: projects.summary,couldNotLook: projects.folders.isEmpty ? "No Folders Yet"- : !projects.unreadable.isEmpty ? "Not Everything Could Be Read" : nil,+ : !projects.unreadable.isEmpty ? "Not Everything Could Be Read"+ : !projects.unsearchable.isEmpty ? "Not Everything Could Be Searched" : nil,wasStopped: projects.scanRun.wasStopped).toolbar {@@ -151,6 +167,10 @@ struct ProjectList: View {.rescanOnExclusionChange("ProjectList") { await projects.refresh() }}+ private static func reasons(_ folders: [(url: URL, reason: ProjectArtifacts.Refusal)]) -> String {+ folders.map { "\($0.url.abbreviatedPath)\n\($0.reason.explanation)" }.joined(separator: "\n\n")+ }+private func phase(_ filtered: [ProjectGroup]) -> ScanPhase {if projects.folders.isEmpty { return .message }if !searchText.isEmpty, projects.groups?.isEmpty == false, filtered.isEmpty { return .message }