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 why a chosen folder can't be reached

Țugui Dragoș940ceffce6f3
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index b83407be..249e0e34 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -78229,6 +78229,112 @@
}
}
},
+ "It is on %@, a disk that isn’t connected now." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Je na disku %@, který teď není připojený."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Dieser Ordner liegt auf dem Volume „%@“, das gerade nicht verbunden ist."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Está en %@, un disco que ahora no está conectado."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Il se trouve sur %@, un disque qui n’est pas connecté actuellement."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Si trova su %@, un disco che ora non è collegato."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "現在接続されていないディスク“%@”上にあります。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "지금 연결되어 있지 않은 디스크 ‘%@’에 있습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Het staat op %@, een schijf die nu niet is aangesloten."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Znajduje się na dysku %@, który nie jest teraz podłączony."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Está em %@, um disco que não está conectado agora."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se află pe %@, un disc care nu este conectat acum."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Эта папка находится на диске «%@», который сейчас не подключен."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Den ligger på %@, en skiva som inte är ansluten just nu."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Şu anda bağlı olmayan %@ diskinde."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Папка лежить на диску «%@», який зараз не підʼєднано."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "它位于磁盘“%@”上,该磁盘目前未连接。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "它位於目前未連接的「%@」磁碟上。"
+ }
+ }
+ }
+ },
"It is outside the folders Peel’s helper may touch." : {
"localizations" : {
"cs" : {
@@ -78441,108 +78547,108 @@
}
}
},
- "It isn’t a folder Peel can reach. A disk that isn’t connected looks like this too." : {
+ "It isn’t a folder." : {
"localizations" : {
"cs" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Není to složka, ke které má Peel přístup. Stejně vypadá i disk, který není připojený."
+ "value" : "Není to složka."
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Dies ist kein Ordner, den Peel erreichen kann. Ein Volume, das nicht verbunden ist, sieht ebenfalls so aus."
+ "value" : "Dies ist kein Ordner."
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
- "value" : "No es una carpeta a la que Peel pueda acceder. Un disco que no está conectado también se ve así."
+ "value" : "No es una carpeta."
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Ce n’est pas un dossier auquel Peel peut accéder. Un disque qui n’est pas connecté se présente aussi ainsi."
+ "value" : "Ce n’est pas un dossier."
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Non è una cartella che Peel può raggiungere. Anche un disco non collegato appare così."
+ "value" : "Non è una cartella."
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Peelがアクセスできるフォルダではありません。接続されていないディスクもこのように表示されます。"
+ "value" : "フォルダではありません。"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Peel이 접근할 수 있는 폴더가 아닙니다. 연결되지 않은 디스크도 이렇게 보입니다."
+ "value" : "폴더가 아닙니다."
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Het is geen map die Peel kan bereiken. Een schijf die niet is aangesloten, ziet er ook zo uit."
+ "value" : "Het is geen map."
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "To nie jest folder, do którego Peel ma dostęp. Tak samo wygląda dysk, który nie jest podłączony."
+ "value" : "To nie jest folder."
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Não é uma pasta que o Peel consiga acessar. Um disco que não está conectado também aparece assim."
+ "value" : "Não é uma pasta."
}
},
"ro" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Nu este un dosar pe care Peel să îl poată accesa. Așa arată și un disc care nu este conectat."
+ "value" : "Nu este un dosar."
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Peel не может добраться до этой папки. Так же выглядит и неподключенный диск."
+ "value" : "Это не папка."
}
},
"sv" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Det är ingen mapp som Peel kommer åt. En skiva som inte är ansluten ser också ut så här."
+ "value" : "Det är ingen mapp."
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Peel’in erişebileceği bir klasör değil. Bağlı olmayan bir disk de böyle görünür."
+ "value" : "Bir klasör değil."
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Це не папка, до якої Peel має доступ. Так само виглядає й диск, який не підʼєднано."
+ "value" : "Це не папка."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
- "value" : "这不是Peel能访问的文件夹。未连接的磁盘也会显示为这种情况。"
+ "value" : "它不是文件夹。"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
- "value" : "這不是Peel能取用的檔案夾。未連接的磁碟也會顯示為這樣。"
+ "value" : "它不是檔案夾。"
}
}
}
@@ -82290,6 +82396,112 @@
}
}
},
+ "Its disk didn’t answer in time." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Disk, na kterém je, včas neodpověděl."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Das Volume dieses Ordners hat nicht rechtzeitig geantwortet."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Su disco no ha respondido a tiempo."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Son disque n’a pas répondu à temps."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Il suo disco non ha risposto in tempo."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "このフォルダがあるディスクが時間内に応答しませんでした。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "이 폴더가 있는 디스크가 제시간에 응답하지 않았습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "De schijf waarop het staat, gaf niet op tijd antwoord."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Jego dysk nie odpowiedział w porę."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O disco em que ela está não respondeu a tempo."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Discul său nu a răspuns la timp."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Диск этой папки не ответил вовремя."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Skivan den ligger på svarade inte i tid."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bulunduğu disk zamanında yanıt vermedi."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Диск, на якому лежить папка, не відповів вчасно."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "它所在的磁盘没有及时回应。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "它所在的磁碟沒有及時回應。"
+ }
+ }
+ }
+ },
"Its file is gone" : {
"localizations" : {
"cs" : {
@@ -83350,6 +83562,112 @@
}
}
},
+ "Its permissions, or those of a folder on its way, keep your account out." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Váš účet do ní nepustí její oprávnění nebo oprávnění některé ze složek, ve kterých leží."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Die Zugriffsrechte dieses Ordners oder eines übergeordneten Ordners sperren deinen Benutzeraccount aus."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Sus permisos, o los de una carpeta de su ruta, no dejan entrar a tu cuenta."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ses permissions, ou celles d’un dossier sur son chemin d’accès, empêchent votre compte d’y accéder."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "I suoi permessi, o quelli di una cartella lungo il percorso, impediscono al tuo account di accedervi."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "このフォルダ、またはそこに至るまでのフォルダのアクセス権により、お使いのアカウントではアクセスできません。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "이 폴더 또는 그 경로에 있는 폴더의 사용 권한 때문에 이 계정으로 들어갈 수 없습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "De bevoegdheden ervan, of die van een bovenliggende map, sluiten je account buiten."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Jego uprawnienia lub uprawnienia folderu na ścieżce do niego nie dają Twojemu kontu dostępu."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "As permissões dela, ou as de uma pasta no caminho até ela, não deixam esta conta entrar."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Permisiunile sale sau cele ale unui dosar de pe calea sa nu permit accesul contului dvs."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Права доступа этой папки или одной из папок на пути к ней не пускают в нее Вашу учетную запись."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Dess behörigheter, eller behörigheterna för en mapp på vägen dit, stänger ute ditt konto."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "İzinleri veya yolu üzerindeki bir klasörün izinleri hesabınızın içeri girmesini engelliyor."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Привілеї цієї папки або однієї з папок на шляху до неї не пускають ваш обліковий запис усередину."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "它的权限设置,或者通往它的路径上某个文件夹的权限设置,不允许你的账户进入。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "它的權限或其路徑上某個檔案夾的權限,讓你的帳號無法進入。"
+ }
+ }
+ }
+ },
"Its privacy permissions are reset too, and History can’t bring them back." : {
"localizations" : {
"cs" : {
@@ -256232,6 +256550,112 @@
}
}
},
+ "macOS couldn’t reach it: %@" : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Systém macOS se k ní nemohl dostat: %@"
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS konnte diesen Ordner nicht erreichen: %@"
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS no ha podido acceder a ella: %@"
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS n’a pas pu y accéder : %@"
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS non è riuscito a raggiungerla: %@"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOSがこのフォルダにアクセスできませんでした: %@"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS가 이 폴더에 접근할 수 없었습니다: %@"
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS kon het niet bereiken: %@"
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS nie mógł uzyskać do niego dostępu: %@"
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O macOS não conseguiu acessá-la: %@"
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS nu l‑a putut accesa: %@"
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS не удалось добраться до этой папки: %@"
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS kom inte åt den: %@"
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS ona ulaşamadı: %@"
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS не змогла отримати доступ до папки: %@"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS未能访问它:%@"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "macOS無法取用它:%@"
+ }
+ }
+ }
+ },
"macOS didn’t allow it." : {
"localizations" : {
"cs" : {
diff --git a/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift b/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift
index 6e52d2f9..56fe6875 100644
--- a/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift
+++ b/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift
@@ -469,7 +469,20 @@ extension DuplicateFinder.Refusal {
case .inAPackage: "it is an app or another package, or inside one, and what is inside belongs to it"
case .outsideTheHome: "it is outside your home folder and /Users/Shared, or on a disk Peel can't write to"
case .insideARepository: "it is a repository, or sits inside one, and Peel leaves repositories alone"
- case .notAFolder: "it isn't a folder Peel can reach"
+ case .unreachable(let problem): problem.summary
+ }
+ }
+}
+
+extension FolderReach {
+ var summary: String {
+ switch self {
+ case .diskNotConnected(let disk): "it is on \(Output.plain(disk)), a disk that isn't connected now"
+ case .gone: "it isn't there anymore"
+ case .notAFolder: "it isn't a folder"
+ case .closed: "its permissions, or those of a folder on its way, keep your account out"
+ case .didNotAnswer: "its disk didn't answer in time"
+ case .failed(let error): "macOS couldn't reach it: \(error.localizedDescription)"
}
}
}
@@ -482,7 +495,7 @@ extension ProjectArtifacts.Refusal {
case .inTheCloud(.cloud): "it is in a folder that syncs to your other devices through iCloud or another app, which Peel leaves to that app"
case .inTheCloud(.app(let app, let marker)):
"it is in a folder \(app.name) syncs to your other devices (its marker is \(Output.plain(Output.path(marker)))), which Peel leaves to that app"
- case .notAFolder: "it isn't a folder Peel can reach"
+ case .unreachable(let problem): problem.summary
case .inAPackage: "it is an app or another package, or inside one, and what is inside belongs to it"
case .neverSearched: "it is a hidden folder, a Library, or a folder a tool fills, such as node_modules, or it sits inside one, where apps and tools keep what they install"
case .insideAnotherFolder(let folder): "it is inside \(Output.path(folder)), which is already on the list"
diff --git a/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swift b/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swift
index 92bfa680..8885b63c 100644
--- a/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swift
@@ -952,7 +952,8 @@ public enum ProjectArtifacts {
PathPattern.comparablePath(of: $0) < PathPattern.comparablePath(of: $1)
},
needsFullDiskAccess: unreadable.contains { FullDiskAccess.canList($0) == .missing },
- refusedRoots: refused + gone.map { ($0.root, .notAFolder) }
+ refusedRoots: refused
+ + gone.map { ($0.root, .unreachable(FolderReach.problem(with: $0.root) ?? .gone)) }
+ keptInStep.sorted { key(of: $0.url) < key(of: $1.url) }
)
}
@@ -1022,7 +1023,8 @@ public enum ProjectArtifacts {
/// A folder macOS or every account uses, such as `/Applications`, `/opt`, or `/Users/Shared`.
case systemFolder
case inTheCloud(SyncKeeper)
- case notAFolder
+ /// A folder Peel can't reach, and why.
+ case unreachable(FolderReach)
/// An app or another package, or a folder inside one: what is inside belongs to it.
case inAPackage
/// A folder the walk never enters (`isSkipped`), or one inside it: apps and tools keep what they install there.
@@ -1066,7 +1068,7 @@ public enum ProjectArtifacts {
let answer = await SlowRead.answer(within: FileSize.budget) { _ in
refusal(for: root, home: home) ?? overlap(of: root, with: others)
}
- let reason = answer ?? .notAFolder
+ let reason = answer ?? .unreachable(.didNotAnswer)
reasons.append(reason)
if reason == nil { taken.append(root) }
}
@@ -1105,11 +1107,7 @@ public enum ProjectArtifacts {
if names.count == 2, names[0] == "users" { return names[1] == "shared" ? .systemFolder : .tooBroad }
}
- var isDirectory: ObjCBool = false
- let isThere =
- FileManager.default.fileExists(atPath: PathPattern.comparablePath(of: root), isDirectory: &isDirectory)
- && isDirectory.boolValue
- guard isThere else { return .notAFolder }
+ if let problem = FolderReach.problem(with: root) { return .unreachable(problem) }
if let keeper = SyncedFolders().keeper(of: root) { return .inTheCloud(keeper) }
if root.isOrIsInsideAPackage { return .inAPackage }
return PathComponents.of(kernelName).contains(where: isSkipped) ? .neverSearched : nil
diff --git a/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swift b/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swift
index 63bee84a..048aabee 100644
--- a/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swift
@@ -57,8 +57,8 @@ public struct DuplicateFinder: Sendable {
case outsideTheHome
/// A repository, or a folder inside one, which the scan leaves alone.
case insideARepository
- /// Not a folder Peel can reach, as one on a disk that isn't connected.
- case notAFolder
+ /// A folder Peel can't reach, and why.
+ case unreachable(FolderReach)
}
/// Whether `folder` may be scanned: a folder in the home folder, in `/Users/Shared`, or on another writable
@@ -92,7 +92,7 @@ public struct DuplicateFinder: Sendable {
/// repository. It is what the scan asks of each chosen folder, and what the list of folders says beside one.
public func reasonToSetAside(_ folder: URL) -> Refusal? {
refusal(of: folder)
- ?? (!Self.isAFolder(folder) ? .notAFolder : nil)
+ ?? FolderReach.problem(with: folder).map(Refusal.unreachable)
?? (Self.isInsideARepository(folder, home: homeDirectory) ? .insideARepository : nil)
}
@@ -104,13 +104,6 @@ public struct DuplicateFinder: Sendable {
}
}
- /// Whether `url` is a folder Peel can reach, links followed.
- private static func isAFolder(_ url: URL) -> Bool {
- var isDirectory: ObjCBool = false
- return FileManager.default.fileExists(atPath: url.path(percentEncoded: false), isDirectory: &isDirectory)
- && isDirectory.boolValue
- }
-
/// Runs a walk as `BlockingWork`, so a folder that never answers holds no thread of the scan's task: it throws
/// once the task is canceled, and the walk, asking `isGivenUp`, stops.
static func walk<T: Sendable>(
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/SystemError.swift b/Packages/PeelCore/Sources/PeelCore/Removal/SystemError.swift
index b8f77fff..c0985afa 100644
--- a/Packages/PeelCore/Sources/PeelCore/Removal/SystemError.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Removal/SystemError.swift
@@ -16,6 +16,11 @@ public struct SystemError: Sendable, Hashable, Codable {
self.init(domain: error.domain, code: error.code)
}
+ /// What macOS says of this error, in the language of the process asking.
+ public var localizedDescription: String {
+ NSError(domain: domain, code: code).localizedDescription
+ }
+
/// What macOS says of this error for the item at `url`, in the language of the process asking.
public func description(of url: URL) -> String {
NSError(domain: domain, code: code, userInfo: [NSFilePathErrorKey: url.path(percentEncoded: false)])
diff --git a/Packages/PeelCore/Sources/PeelCore/Support/FolderReach.swift b/Packages/PeelCore/Sources/PeelCore/Support/FolderReach.swift
new file mode 100644
index 00000000..5859b89a
--- /dev/null
+++ b/Packages/PeelCore/Sources/PeelCore/Support/FolderReach.swift
@@ -0,0 +1,39 @@
+import Darwin
+public import Foundation
+internal import PeelPrivileged
+
+/// Why a folder someone chose can't be reached, read from what macOS answers for its path.
+public enum FolderReach: Sendable, Hashable {
+ /// The disk it is on, named as in `/Volumes`, isn't connected.
+ case diskNotConnected(String)
+ /// Nothing is at that path anymore.
+ case gone
+ /// Something other than a folder is there.
+ case notAFolder
+ /// Its permissions, or those of a folder on its way, keep this account out.
+ case closed
+ /// The disk didn't answer in time, as a network volume that stopped answering does.
+ case didNotAnswer
+ /// macOS answered with another error, which says why.
+ case failed(SystemError)
+
+ /// Why `folder` can't be reached, links followed, or nil when a folder is there.
+ public static func problem(with folder: URL) -> FolderReach? {
+ let path = PathPattern.comparablePath(of: folder)
+ var info = stat()
+ if stat(path, &info) == 0 {
+ return info.st_mode & S_IFMT == S_IFDIR ? nil : .notAFolder
+ }
+ let code = errno
+ switch code {
+ case ENOENT, ENOTDIR:
+ let names = PathComponents.of(path)
+ if names.count > 1, names[0] == "Volumes", URL(filePath: "/Volumes/" + names[1]).isMissing {
+ return .diskNotConnected(names[1])
+ }
+ return .gone
+ case EACCES, EPERM: return .closed
+ default: return .failed(SystemError(domain: NSPOSIXErrorDomain, code: Int(code)))
+ }
+ }
+}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/DuplicateFinderTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/DuplicateFinderTests.swift
index 149473ad..d8e79715 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/DuplicateFinderTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/DuplicateFinderTests.swift
@@ -490,7 +490,7 @@ struct DuplicateFinderTests {
let scan = try await scan(directory, folders: ["home/Gone"])
- #expect(scan.skippedLocations.map(\.reason) == [.notAFolder])
+ #expect(scan.skippedLocations.map(\.reason) == [.unreachable(.gone)])
#expect(scan.readNothing)
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift
index ae97bbf1..c37aacfc 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift
@@ -912,9 +912,9 @@ struct FileCommandTests {
@Test func namesEachChosenFolderTheScanDidNotSearch() throws {
let unplugged = URL(filePath: "/Volumes/Disk/Projects", directoryHint: .isDirectory)
- let scan = ProjectArtifacts.Scan(refusedRoots: [(unplugged, .notAFolder)])
+ let scan = ProjectArtifacts.Scan(refusedRoots: [(unplugged, .unreachable(.diskNotConnected("Disk")))])
- #expect(ProjectsCommand.notes(for: scan) == ["/Volumes/Disk/Projects: it isn't a folder Peel can reach"])
+ #expect(ProjectsCommand.notes(for: scan) == ["/Volumes/Disk/Projects: it is on Disk, a disk that isn't connected now"])
let json = try Output.jsonText(ProjectsCommand.report(for: scan))
let report = try #require(JSONSerialization.jsonObject(with: Data(json.utf8)) as? [String: Any])
#expect(report["skippedLocations"] as? [String] == ["/Volumes/Disk/Projects"])
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/FolderReachTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/FolderReachTests.swift
new file mode 100644
index 00000000..cfbffe3b
--- /dev/null
+++ b/Packages/PeelCore/Tests/PeelCoreTests/FolderReachTests.swift
@@ -0,0 +1,25 @@
+import Darwin
+import Foundation
+@testable import PeelCore
+import Testing
+
+struct FolderReachTests {
+ @Test(.permissionsHold) func saysWhyAFolderCantBeReached() throws {
+ let directory = try TemporaryDirectory()
+ let folder = try directory.directory("Folder")
+ let file = try directory.file("File", contents: Data())
+ _ = try directory.directory("Closed/Inner")
+ try directory.setPermissions(0o000, of: "Closed")
+ defer { try? directory.setPermissions(0o755, of: "Closed") }
+ let loop = directory.url.appending(path: "Loop")
+ try FileManager.default.createSymbolicLink(atPath: loop.path(percentEncoded: false), withDestinationPath: "Loop")
+ let disk = "NoSuchDisk-\(UUID().uuidString)"
+
+ #expect(FolderReach.problem(with: folder) == nil)
+ #expect(FolderReach.problem(with: directory.url.appending(path: "Gone")) == .gone)
+ #expect(FolderReach.problem(with: file) == .notAFolder)
+ #expect(FolderReach.problem(with: directory.url.appending(path: "Closed/Inner")) == .closed)
+ #expect(FolderReach.problem(with: URL(filePath: "/Volumes/\(disk)/Projects")) == .diskNotConnected(disk))
+ #expect(FolderReach.problem(with: loop) == .failed(SystemError(domain: NSPOSIXErrorDomain, code: Int(ELOOP))))
+ }
+}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swift
index 9238dfb1..5ea965da 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swift
@@ -73,7 +73,7 @@ struct ProjectArtifactsTests {
let reasons = await ProjectArtifacts.refusals(of: roots, home: home)
- #expect(reasons == [.tooBroad, .systemFolder, nil, .notAFolder])
+ #expect(reasons == [.tooBroad, .systemFolder, nil, .unreachable(.gone)])
}
/// Full Disk Access does not open a folder closed by ordinary file permissions, so the scan must not ask for it.
@@ -248,7 +248,7 @@ struct ProjectArtifactsTests {
#expect(scan.artifacts.map(\.name) == ["node_modules"])
#expect(scan.refusedRoots.map(\.url) == [unplugged])
- #expect(scan.refusedRoots.map(\.reason) == [.notAFolder])
+ #expect(scan.refusedRoots.map(\.reason) == [.unreachable(.gone)])
}
/// An editor keeps an installed extension's `package.json` beside its `node_modules`, where the walk never goes.
@@ -1415,7 +1415,7 @@ struct ProjectArtifactsTests {
#expect(ProjectArtifacts.refusal(for: home, home: home) == .tooBroad)
#expect(ProjectArtifacts.refusal(for: URL(filePath: "/Volumes/Disk"), home: home) == .tooBroad)
#expect(ProjectArtifacts.refusal(for: home.appending(path: "Library/Mobile Documents/com~apple~CloudDocs/Code"), home: home) == .inTheCloud(.cloud))
- #expect(ProjectArtifacts.refusal(for: directory.url.appending(path: "nothing-here"), home: home) == .notAFolder)
+ #expect(ProjectArtifacts.refusal(for: directory.url.appending(path: "nothing-here"), home: home) == .unreachable(.gone))
#expect(ProjectArtifacts.refusal(for: try directory.directory("Code"), home: home) == nil)
// The same folders under other spellings that macOS also accepts.
@@ -1479,7 +1479,9 @@ struct ProjectArtifactsTests {
#expect(ProjectArtifacts.refusal(for: URL(filePath: "/Users")) == .systemFolder)
#expect(ProjectArtifacts.refusal(for: URL(filePath: "/Users/x/Library/Mobile Documents/com~apple~Pages")) == .inTheCloud(.cloud))
#expect(ProjectArtifacts.refusal(for: URL(filePath: "/Users/x/Library/CloudStorage/Dropbox")) == .inTheCloud(.cloud))
- #expect(ProjectArtifacts.refusal(for: URL(filePath: "/Users/x/does-not-exist")) == .notAFolder)
+ #expect(ProjectArtifacts.refusal(for: URL(filePath: "/Users/x/does-not-exist")) == .unreachable(.gone))
+ let disk = "NoSuchDisk-\(UUID().uuidString)"
+ #expect(ProjectArtifacts.refusal(for: URL(filePath: "/Volumes/\(disk)/Code")) == .unreachable(.diskNotConnected(disk)))
}
@@ -1524,7 +1526,7 @@ struct ProjectArtifactsTests {
}
#expect(scan.refusedRoots.map(\.url) == [disk])
- #expect(scan.refusedRoots.map(\.reason) == [.notAFolder])
+ #expect(scan.refusedRoots.map(\.reason) == [.unreachable(.gone)])
}
@Test func aLastChangeNotReadInTimeIsToldApartFromATooLargeProject() async throws {
diff --git a/Peel/Views/Presentation.swift b/Peel/Views/Presentation.swift
index 78ab05d1..adde00ce 100644
--- a/Peel/Views/Presentation.swift
+++ b/Peel/Views/Presentation.swift
@@ -292,7 +292,7 @@ extension ProjectArtifacts.Refusal {
case .inTheCloud(.cloud): String(localized: "It is in a folder that syncs to your other devices through iCloud or another app, which Peel leaves to that app.")
case .inTheCloud(.app(let app, let marker)):
String(localized: "It is in a folder \(app.name) syncs to your other devices (its marker is \(marker.abbreviatedPath)), which Peel leaves to that app.")
- case .notAFolder: String(localized: "It isn’t a folder Peel can reach. A disk that isn’t connected looks like this too.")
+ case .unreachable(let problem): problem.explanation
case .inAPackage: String(localized: "It is an app or another package, or inside one, and what is inside belongs to it.")
case .neverSearched: String(localized: "It is a hidden folder, a Library, or a folder a tool fills, such as node_modules, or it sits inside one. Apps and tools keep what they install there, so Peel doesn’t look for projects in it.")
case .insideAnotherFolder(let folder): String(localized: "It is inside \(folder.abbreviatedPath), which is already on the list.")
@@ -309,7 +309,21 @@ extension DuplicateFinder.Refusal {
case .inAPackage: String(localized: "It is an app or another package, or inside one, and what is inside belongs to it.")
case .outsideTheHome: String(localized: "It is outside your home folder and /Users/Shared, or on a disk Peel can’t write to.")
case .insideARepository: String(localized: "It is a repository, or sits inside one, and Peel leaves repositories alone.")
- case .notAFolder: String(localized: "It isn’t a folder Peel can reach. A disk that isn’t connected looks like this too.")
+ case .unreachable(let problem): problem.explanation
+ }
+ }
+}
+
+extension FolderReach {
+ /// Why a chosen folder can't be reached.
+ var explanation: String {
+ switch self {
+ case .diskNotConnected(let disk): String(localized: "It is on \(disk), a disk that isn’t connected now.")
+ case .gone: String(localized: "It isn’t there anymore.")
+ case .notAFolder: String(localized: "It isn’t a folder.")
+ case .closed: String(localized: "Its permissions, or those of a folder on its way, keep your account out.")
+ case .didNotAnswer: String(localized: "Its disk didn’t answer in time.")
+ case .failed(let error): String(localized: "macOS couldn’t reach it: \(error.localizedDescription)")
}
}
}