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 file that can't be read couldn't be set aside

Țugui Dragoșfc517cc16d10
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index 1cfbd47a..153e59df 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -123979,112 +123979,6 @@
}
}
},
- "Nothing changed. Check that Peel can write to its folder in Application Support, then try again." : {
- "localizations" : {
- "cs" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Nic se nezměnilo. Zkontrolujte, zda Peel může zapisovat do své složky v Application Support, a zkuste to znovu."
- }
- },
- "de" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Es wurde nichts geändert. Prüfe, ob Peel in seinen Ordner in Application Support schreiben kann, und versuche es dann erneut."
- }
- },
- "es" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "No ha cambiado nada. Comprueba que Peel pueda escribir en su carpeta de Application Support y vuelve a intentarlo."
- }
- },
- "fr" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Rien n’a changé. Vérifiez que Peel peut écrire dans son dossier situé dans Application Support, puis réessayez."
- }
- },
- "it" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Non è cambiato nulla. Verifica che Peel possa scrivere nella sua cartella in Application Support, poi riprova."
- }
- },
- "ja" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "何も変更されていません。Application SupportにあるPeelのフォルダにPeelが書き込めることを確認してから、やり直してください。"
- }
- },
- "ko" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "아무것도 변경되지 않았습니다. Peel이 Application Support에 있는 자신의 폴더에 쓸 수 있는지 확인한 다음 다시 시도하십시오."
- }
- },
- "nl" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Er is niets gewijzigd. Controleer of Peel naar de eigen map in Application Support kan schrijven en probeer het opnieuw."
- }
- },
- "pl" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Nic się nie zmieniło. Sprawdź, czy Peel może zapisywać w swoim folderze w Application Support, a następnie spróbuj ponownie."
- }
- },
- "pt" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Nada mudou. Verifique se o Peel consegue gravar na pasta dele em Application Support e tente novamente."
- }
- },
- "ro" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Nu s‑a schimbat nimic. Verificați dacă Peel poate scrie în dosarul său din Application Support, apoi încercați din nou."
- }
- },
- "ru" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Ничего не изменилось. Убедитесь, что Peel может записывать в свою папку в Application Support, а затем повторите попытку."
- }
- },
- "sv" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Inget ändrades. Kontrollera att Peel kan skriva till sin mapp i Application Support och försök sedan igen."
- }
- },
- "tr" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Hiçbir şey değişmedi. Peel’in Application Support içindeki klasörüne yazabildiğini denetleyin, ardından yeniden deneyin."
- }
- },
- "uk" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Нічого не змінено. Перевірте, чи може Peel записувати у свою папку в Application Support, та спробуйте ще раз."
- }
- },
- "zh-Hans" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "未做任何更改。请检查Peel能否写入它在Application Support中的文件夹,然后重试。"
- }
- },
- "zh-Hant" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "沒有任何變更。請確認Peel可以寫入它在Application Support中的檔案夾,然後再試一次。"
- }
- }
- }
- },
"Nothing else on this Mac opens these." : {
"localizations" : {
"cs" : {
diff --git a/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift b/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift
index 9cd81a24..ecce1896 100644
--- a/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift
+++ b/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift
@@ -295,19 +295,25 @@ extension RemovalLogProblem {
}
}
-extension FileProblem? {
- /// Why, as a sentence of its own after the one it explains, or nothing when it isn't known.
+extension FileProblem {
+ /// Why, as a sentence of its own after the one it explains.
var sentence: String {
switch self {
case .notAFile: " Something other than a file, such as a folder, is where the file should be."
case .tooLarge: " The file is larger than Peel ever writes it, so Peel doesn't read it."
case .damaged: " The file's contents aren't in a form Peel can read."
case .failed(let error): " macOS answered: \(Output.plain(error.localizedDescription))"
- case nil: ""
}
}
}
+extension FileProblem? {
+ /// Why, or nothing when it isn't known.
+ var sentence: String {
+ self?.sentence ?? ""
+ }
+}
+
extension RefusalLogProblem {
var summary: String {
switch self {
diff --git a/Packages/PeelCore/Sources/PeelCommandLine/Support/UnreadableHistory.swift b/Packages/PeelCore/Sources/PeelCommandLine/Support/UnreadableHistory.swift
index ed61dc73..648d9364 100644
--- a/Packages/PeelCore/Sources/PeelCommandLine/Support/UnreadableHistory.swift
+++ b/Packages/PeelCore/Sources/PeelCommandLine/Support/UnreadableHistory.swift
@@ -6,6 +6,6 @@ import PeelCore
enum UnreadableHistory {
static func note(at url: URL = RemovalHistory.defaultURL) -> String? {
guard let problem = RemovalLog.readProblem(at: url) else { return nil }
- return "Peel couldn't read its History at \(Output.plain(url.path(percentEncoded: false))), so nothing will be moved. Open Peel and click Start Over in History." + Optional(problem).sentence
+ return "Peel couldn't read its History at \(Output.plain(url.path(percentEncoded: false))), so nothing will be moved. Open Peel and click Start Over in History." + problem.sentence
}
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/AppFolders.swift b/Packages/PeelCore/Sources/PeelCore/Apps/AppFolders.swift
index 28e0efe8..127f81a0 100644
--- a/Packages/PeelCore/Sources/PeelCore/Apps/AppFolders.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Apps/AppFolders.swift
@@ -84,7 +84,7 @@ public struct AppFolders: Sendable {
public func startOver() -> StartOver {
FileLock.whileHeld(beside: url) {
guard !url.isMissing, read() == nil else { return .notNeeded }
- return DamagedFile.setAside(url) == nil ? .couldNotSetAside : .started
+ return .settingAside(url)
}
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Orphans/OrphanOwners.swift b/Packages/PeelCore/Sources/PeelCore/Orphans/OrphanOwners.swift
index 66f57dcd..57b3571c 100644
--- a/Packages/PeelCore/Sources/PeelCore/Orphans/OrphanOwners.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Orphans/OrphanOwners.swift
@@ -33,7 +33,7 @@ public struct OrphanOwners: Sendable {
public func startOver() -> StartOver {
FileLock.whileHeld(beside: url) {
guard !url.isMissing, read() == nil else { return .notNeeded }
- return DamagedFile.setAside(url) == nil ? .couldNotSetAside : .started
+ return .settingAside(url)
}
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift b/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
index ba92e357..17e97c2d 100644
--- a/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
@@ -125,9 +125,9 @@ public actor RefusalLog {
public func startOver() -> StartOver {
FileLock.whileHeld(beside: url) {
guard current() == nil else { return .notNeeded }
- guard DamagedFile.setAside(url) != nil else { return .couldNotSetAside }
- problem = nil
- return .started
+ let answer = StartOver.settingAside(url)
+ if answer == .started { problem = nil }
+ return answer
}
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift b/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift
index 785dd6bd..26697944 100644
--- a/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift
@@ -171,9 +171,9 @@ public actor RemovalLog {
public func startOver() -> StartOver {
whileNoOtherProcessWrites {
guard stored() == nil else { return .notNeeded }
- guard DamagedFile.setAside(url) != nil else { return .couldNotSetAside }
- problem = nil
- return .started
+ let answer = StartOver.settingAside(url)
+ if answer == .started { problem = nil }
+ return answer
}
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Support/Exclusions.swift b/Packages/PeelCore/Sources/PeelCore/Support/Exclusions.swift
index b4d54af2..0596536d 100644
--- a/Packages/PeelCore/Sources/PeelCore/Support/Exclusions.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Support/Exclusions.swift
@@ -365,8 +365,8 @@ public struct ExclusionStore: Sendable {
/// The saved list cannot be read, so it was left as it is; and why, when Peel knows.
case unreadable(FileProblem?)
/// The list could not be written. It carries what the list would have been, which the app keeps until it
- /// quits, and why, when Peel knows.
- case notSaved(Exclusions, FileProblem?)
+ /// quits, and why.
+ case notSaved(Exclusions, FileProblem)
}
/// Loads the saved list. No file means an empty list. A file that cannot be read or reached gives `.unreadable`,
@@ -381,7 +381,7 @@ public struct ExclusionStore: Sendable {
public func startOver() async -> StartOver {
FileLock.whileHeld(beside: url) {
guard read().isUnreadable else { return .notNeeded }
- return DamagedFile.setAside(url) == nil ? .couldNotSetAside : .started
+ return .settingAside(url)
}
}
@@ -419,7 +419,7 @@ public struct ExclusionStore: Sendable {
encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
do {
let data = try encoder.encode(exclusions)
- if read().isUnreadable, DamagedFile.setAside(url) == nil { return .notSaved(exclusions, nil) }
+ if read().isUnreadable { try DamagedFile.settingAside(url) }
try PeelFolder.write(data, to: url)
return .saved(exclusions)
} catch {
diff --git a/Packages/PeelCore/Sources/PeelCore/Support/StartOver.swift b/Packages/PeelCore/Sources/PeelCore/Support/StartOver.swift
index 73769775..73acab90 100644
--- a/Packages/PeelCore/Sources/PeelCore/Support/StartOver.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Support/StartOver.swift
@@ -1,3 +1,6 @@
+import Foundation
+internal import PeelPrivileged
+
/// What starting over one of Peel's own files did.
public enum StartOver: Sendable, Equatable {
/// The file that couldn't be read is kept beside a new one, under another name.
@@ -5,5 +8,15 @@ public enum StartOver: Sendable, Equatable {
/// The file can be read, or isn't there, so it stays as it is.
case notNeeded
/// The file couldn't be set aside, so nothing changed.
- case couldNotSetAside
+ case couldNotSetAside(FileProblem)
+
+ /// Sets the file at `url` aside under another name, and answers what came of it.
+ static func settingAside(_ url: URL) -> StartOver {
+ do {
+ try DamagedFile.settingAside(url)
+ return .started
+ } catch {
+ return .couldNotSetAside(.failed(SystemError(error)))
+ }
+ }
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Updates/TeamRegistry.swift b/Packages/PeelCore/Sources/PeelCore/Updates/TeamRegistry.swift
index 00b8d1d1..6bd0c4ea 100644
--- a/Packages/PeelCore/Sources/PeelCore/Updates/TeamRegistry.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Updates/TeamRegistry.swift
@@ -107,7 +107,7 @@ public struct TeamRegistry: Sendable {
public func startOver() async -> StartOver {
FileLock.whileHeld(beside: url) {
guard load() == nil else { return .notNeeded }
- return DamagedFile.setAside(url) == nil ? .couldNotSetAside : .started
+ return .settingAside(url)
}
}
diff --git a/Packages/PeelCore/Sources/PeelPrivileged/DamagedFile.swift b/Packages/PeelCore/Sources/PeelPrivileged/DamagedFile.swift
index 34abf749..1fdb705a 100644
--- a/Packages/PeelCore/Sources/PeelPrivileged/DamagedFile.swift
+++ b/Packages/PeelCore/Sources/PeelPrivileged/DamagedFile.swift
@@ -3,6 +3,12 @@ public import Foundation
/// Renames one of Peel's own files that cannot be read, so the next save does not overwrite it.
public enum DamagedFile {
public static func setAside(_ url: URL) -> URL? {
+ try? settingAside(url)
+ }
+
+ /// Renames `url` as `setAside` does, or throws what macOS answered.
+ @discardableResult
+ public static func settingAside(_ url: URL) throws -> URL {
let folder = url.deletingLastPathComponent()
let name = url.deletingPathExtension().lastPathComponent
let ext = url.pathExtension
@@ -13,12 +19,8 @@ public enum DamagedFile {
destination = folder.appending(path: "\(name)-damaged-\(stamp)-\(attempt).\(ext)")
attempt += 1
}
- do {
- try FileManager.default.moveItem(at: url, to: destination)
- return destination
- } catch {
- return nil
- }
+ try FileManager.default.moveItem(at: url, to: destination)
+ return destination
}
/// The files `setAside` made of `url`, or nil when their folder can't be listed. Only regular files named exactly
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/AppFoldersTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/AppFoldersTests.swift
index e939faca..b2f682d7 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/AppFoldersTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/AppFoldersTests.swift
@@ -228,6 +228,16 @@ struct AppFoldersTests {
#expect(AppFolders(url: directory.url.appending(path: "missing.json")).startOver() == .notNeeded)
}
+ @Test(.permissionsHold) func saysWhyTheDamagedListCouldNotBeSetAside() throws {
+ let directory = try TemporaryDirectory()
+ let list = try directory.file("Peel/app-folders.json", contents: Data("not a list".utf8))
+ try directory.setPermissions(0o500, of: "Peel")
+ defer { try? directory.setPermissions(0o755, of: "Peel") }
+
+ let refusedMove = SystemError(domain: NSCocoaErrorDomain, code: NSFileWriteNoPermissionError)
+ #expect(AppFolders(url: list).startOver() == .couldNotSetAside(.failed(refusedMove)))
+ }
+
@Test func startingOverKeepsTheDamagedListBesideAnEmptyOne() throws {
let directory = try TemporaryDirectory()
let folders = AppFolders(url: try directory.file("app-folders.json", contents: Data("not a list".utf8)))
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/ExclusionsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/ExclusionsTests.swift
index 3ed3fee6..5b187b2c 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/ExclusionsTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/ExclusionsTests.swift
@@ -409,6 +409,21 @@ struct ExclusionsTests {
#expect(try String(contentsOf: directory.url.appending(path: aside), encoding: .utf8) == "not json")
}
+ @Test(.permissionsHold) func saysWhyAListItCannotReadCouldNotBeSetAsideToStartAgain() async throws {
+ let directory = try TemporaryDirectory()
+ let file = try directory.file("Peel/exclusions.json", contents: Data("not json".utf8))
+ try directory.setPermissions(0o500, of: "Peel")
+ defer { try? directory.setPermissions(0o755, of: "Peel") }
+
+ let outcome = await ExclusionStore(url: file).change(startingOverIfUnreadable: true) {
+ $0.bundleIdentifiers.insert("com.example.app")
+ }
+
+ let refusedMove = SystemError(domain: NSCocoaErrorDomain, code: NSFileWriteNoPermissionError)
+ #expect(outcome == .notSaved(Exclusions(bundleIdentifiers: ["com.example.app"]), .failed(refusedMove)))
+ #expect(try String(contentsOf: file, encoding: .utf8) == "not json")
+ }
+
/// A change that cannot be written says what the list would have been, so the app can keep it until it quits.
@Test(.permissionsHold) func aChangeThatCannotBeWrittenSaysWhatItWouldHaveSaved() async throws {
let directory = try TemporaryDirectory()
diff --git a/Peel/Model/AppLibrary.swift b/Peel/Model/AppLibrary.swift
index aab142ac..edc421ce 100644
--- a/Peel/Model/AppLibrary.swift
+++ b/Peel/Model/AppLibrary.swift
@@ -1092,7 +1092,7 @@ final class AppLibrary {
@discardableResult
func startTeamRecordOver() async -> StartOver {
let answer = await teamRegistry.startOver()
- if answer != .couldNotSetAside { await checkSigningTeams() }
+ if case .couldNotSetAside = answer {} else { await checkSigningTeams() }
return answer
}
diff --git a/Peel/Views/StartOverButton.swift b/Peel/Views/StartOverButton.swift
index ff133c8d..5509d074 100644
--- a/Peel/Views/StartOverButton.swift
+++ b/Peel/Views/StartOverButton.swift
@@ -9,24 +9,27 @@ struct StartOverButton: View {
let file: URL
let startedOver: LocalizedStringResource
let startOver: () async -> StartOver
- @State private var couldNotSetAside = false
+ @State private var notSetAside: FileProblem?
var body: some View {
Button("Start Over") {
Task {
switch await startOver() {
case .started: AccessibilityNotification.Announcement(AttributedString(localized: startedOver)).post()
- case .couldNotSetAside: couldNotSetAside = true
+ case .couldNotSetAside(let why): notSetAside = why
case .notNeeded: break
}
}
}
- .alert("Peel couldn’t set the old file aside", isPresented: $couldNotSetAside) {
+ .alert(
+ "Peel couldn’t set the old file aside",
+ isPresented: Binding(get: { notSetAside != nil }, set: { if !$0 { notSetAside = nil } })
+ ) {
Button("Show in Finder") { NSWorkspace.shared.activateFileViewerSelecting([file]) }
Button("OK", role: .cancel) {}
.keyboardShortcut(.defaultAction)
} message: {
- Text("Nothing changed. Check that Peel can write to its folder in Application Support, then try again.")
+ Text(verbatim: notSetAside.said(after: String(localized: "Nothing changed."), about: file))
}
}
}
diff --git a/PeelTests/RemovalHistoryStoreTests.swift b/PeelTests/RemovalHistoryStoreTests.swift
index cc684594..90fd79aa 100644
--- a/PeelTests/RemovalHistoryStoreTests.swift
+++ b/PeelTests/RemovalHistoryStoreTests.swift
@@ -347,8 +347,11 @@ struct RemovalHistoryStoreTests {
let startedOver = await history.startOver()
let startedRefusalsOver = await history.startOverRefusals()
- #expect(startedOver == .couldNotSetAside && history.shownProblem == .unreadable(.notAFile))
- #expect(startedRefusalsOver == .couldNotSetAside && history.refusalProblem == .unreadable(.notAFile))
+ let refusedMove = SystemError(domain: NSCocoaErrorDomain, code: NSFileWriteNoPermissionError)
+ #expect(startedOver == .couldNotSetAside(.failed(refusedMove)))
+ #expect(history.shownProblem == .unreadable(.notAFile))
+ #expect(startedRefusalsOver == .couldNotSetAside(.failed(refusedMove)))
+ #expect(history.refusalProblem == .unreadable(.notAFile))
}
@Test func startsOverANotMovedListItCannotRead() async throws {