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.

Give every Start Over one answer, one alert, and one word for VoiceOver

Țugui Dragoșe5647e845aef
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index 3433b4f4..dc417154 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -164075,6 +164075,324 @@
}
}
},
+ "Started the list of app folders over." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Seznam složek aplikací byl začat znovu."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Die Liste der App-Ordner wurde neu begonnen."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se ha vuelto a empezar la lista de carpetas de apps."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "La liste des dossiers d’apps a été recommencée."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ricominciato da capo l’elenco delle cartelle delle app."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "アプリのフォルダのリストを最初からやり直しました。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "앱 폴더 목록을 처음부터 다시 시작했습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Opnieuw begonnen met de lijst van mappen met apps."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zaczęto od nowa listę folderów z aplikacjami."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Lista de pastas de apps recomeçada."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Lista de dosare de aplicații a fost reîncepută."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Список папок приложений начат заново."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Började om listan över appmappar."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Uygulama klasörleri listesi baştan başlatıldı."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Список папок програм почато наново."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已重新开始建立App文件夹列表。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已重新開始App檔案夾列表。"
+ }
+ }
+ }
+ },
+ "Started the list of exclusions over." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Seznam výjimek byl začat znovu."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Die Liste der Ausschlüsse wurde neu begonnen."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se ha vuelto a empezar la lista de exclusiones."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "La liste des exclusions a été recommencée."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ricominciato da capo l’elenco delle esclusioni."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "除外リストを最初からやり直しました。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "제외 항목 목록을 처음부터 다시 시작했습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Opnieuw begonnen met de lijst met uitsluitingen."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zaczęto od nowa listę wykluczeń."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Lista de exclusões recomeçada."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Lista de excluderi a fost reîncepută."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Список исключений начат заново."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Började om listan över undantag."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Hariç tutulanlar listesi baştan başlatıldı."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Список винятків почато наново."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已重新开始建立排除项列表。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已重新開始排除項目列表。"
+ }
+ }
+ }
+ },
+ "Started the record of who signs your apps over." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Záznam o tom, kdo podepisuje vaše aplikace, byl začat znovu."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Die Aufzeichnung darüber, wer deine Apps signiert, wurde neu begonnen."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se ha vuelto a empezar el registro de quién firma tus apps."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Le registre des signataires de vos apps a été recommencé."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ricominciato da capo il registro di chi firma le tue app."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "アプリの署名者の記録を最初からやり直しました。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "앱 서명자 기록을 처음부터 다시 시작했습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Opnieuw begonnen met de registratie van wie je apps ondertekent."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zaczęto od nowa zapis tego, kto podpisuje Twoje aplikacje."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Registro de quem assina seus apps recomeçado."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Evidența celor care semnează aplicațiile dvs. a fost reîncepută."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Журнал того, кем подписаны Ваши приложения, начат заново."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Började om förteckningen över vem som signerar dina appar."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Uygulamalarınızı kimin imzaladığına ilişkin kayıt baştan başlatıldı."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Запис про те, хто підписує ваші програми, почато наново."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已重新开始建立你的App的签名者记录。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已重新開始你的App簽署者記錄。"
+ }
+ }
+ }
+ },
"Starts Peel when you log in. “Watch the Trash” works only while Peel is running." : {
"localizations" : {
"cs" : {
diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/AppFolders.swift b/Packages/PeelCore/Sources/PeelCore/Apps/AppFolders.swift
index 2c43cd1f..d7617ebc 100644
--- a/Packages/PeelCore/Sources/PeelCore/Apps/AppFolders.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Apps/AppFolders.swift
@@ -49,12 +49,12 @@ public struct AppFolders: Sendable {
}
}
- /// Sets a list that cannot be read aside, under another name, so the folders can be chosen again. False when it
- /// stays where it is.
+ /// Sets a list that cannot be read aside, under another name, so the folders can be chosen again.
@discardableResult
- public func startOver() -> Bool {
+ public func startOver() -> StartOver {
FileLock.whileHeld(beside: url) {
- url.isMissing || read() != nil || DamagedFile.setAside(url) != nil
+ guard !url.isMissing, read() == nil else { return .notNeeded }
+ return DamagedFile.setAside(url) == nil ? .couldNotSetAside : .started
}
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift b/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
index edf812d6..90689459 100644
--- a/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
@@ -117,12 +117,12 @@ public actor RefusalLog {
}
/// Keeps a file that cannot be read beside a new one, under another name, and starts writing refusals down again.
- /// False when the file can be read, or couldn't be set aside.
- public func startOver() -> Bool {
+ public func startOver() -> StartOver {
FileLock.whileHeld(beside: url) {
- guard current() == nil, DamagedFile.setAside(url) != nil else { return false }
+ guard current() == nil else { return .notNeeded }
+ guard DamagedFile.setAside(url) != nil else { return .couldNotSetAside }
problem = nil
- return true
+ return .started
}
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift b/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift
index 42a7cb10..2649ede8 100644
--- a/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift
@@ -122,13 +122,13 @@ public actor RemovalLog {
return UInt64(info.f_bavail) * UInt64(info.f_bsize)
}
- /// Keeps a History that cannot be read beside the new one, under another name, and starts recording again. False
- /// when History can be read, or the old file couldn't be set aside.
- public func startOver() -> Bool {
+ /// Keeps a History that cannot be read beside the new one, under another name, and starts recording again.
+ public func startOver() -> StartOver {
whileNoOtherProcessWrites {
- guard stored() == nil, DamagedFile.setAside(url) != nil else { return false }
+ guard stored() == nil else { return .notNeeded }
+ guard DamagedFile.setAside(url) != nil else { return .couldNotSetAside }
problem = nil
- return true
+ return .started
}
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Updates/TeamRegistry.swift b/Packages/PeelCore/Sources/PeelCore/Updates/TeamRegistry.swift
index 71db2ebf..f8a252aa 100644
--- a/Packages/PeelCore/Sources/PeelCore/Updates/TeamRegistry.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Updates/TeamRegistry.swift
@@ -101,11 +101,12 @@ public struct TeamRegistry: Sendable {
}
/// Keeps a registry that cannot be read beside a new one, which the next check starts recording in. A registry
- /// that reads is left as it is. False when the old file could not be set aside.
+ /// that reads is left as it is.
@concurrent
- public func startOver() async -> Bool {
+ public func startOver() async -> StartOver {
FileLock.whileHeld(beside: url) {
- load() != nil || DamagedFile.setAside(url) != nil
+ guard load() == nil else { return .notNeeded }
+ return DamagedFile.setAside(url) == nil ? .couldNotSetAside : .started
}
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/AppFoldersTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/AppFoldersTests.swift
index ec77818e..6a2180d9 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/AppFoldersTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/AppFoldersTests.swift
@@ -82,11 +82,19 @@ struct AppFoldersTests {
#expect(AppFolders(url: directory.url.appending(path: "missing.json")).load() == [])
}
+ @Test func startsNothingOverWhileTheListCanBeRead() throws {
+ let directory = try TemporaryDirectory()
+ let folders = AppFolders(url: try directory.file("app-folders.json", contents: Data("[]".utf8)))
+
+ #expect(folders.startOver() == .notNeeded)
+ #expect(AppFolders(url: directory.url.appending(path: "missing.json")).startOver() == .notNeeded)
+ }
+
@Test func startingOverKeepsTheDamagedListBesideAnEmptyOne() throws {
let directory = try TemporaryDirectory()
let folders = AppFolders(url: try directory.file("app-folders.json", contents: Data("not a list".utf8)))
- #expect(folders.startOver())
+ #expect(folders.startOver() == .started)
#expect(folders.load() == [])
let kept = try FileManager.default.contentsOfDirectory(atPath: directory.url.path(percentEncoded: false))
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift
index dbf8be80..31184d9d 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift
@@ -247,7 +247,7 @@ struct RefusalLogTests {
let log = RefusalLog(url: url)
- #expect(await log.startOver())
+ #expect(await log.startOver() == .started)
let read = await log.load()
#expect(read.records == [] && read.problem == nil)
let kept = try FileManager.default.contentsOfDirectory(atPath: url.deletingLastPathComponent().path())
@@ -259,7 +259,7 @@ struct RefusalLogTests {
let url = try directory.directory("Peel").appending(path: "refusals.json")
try Data("[]".utf8).write(to: url)
- #expect(await RefusalLog(url: url).startOver() == false)
+ #expect(await RefusalLog(url: url).startOver() == .notNeeded)
#expect(DamagedFile.copies(of: url) == [])
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/RemovalHistoryTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/RemovalHistoryTests.swift
index 8323854c..57094fbf 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/RemovalHistoryTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/RemovalHistoryTests.swift
@@ -367,7 +367,7 @@ struct RemovalHistoryTests {
for name in kept {
try directory.setPermissions(0o644, of: "Peel/\(name)")
}
- #expect(startedOver)
+ #expect(startedOver == .started)
#expect(kept.count == 1, "the old file was not kept beside the new one")
let outcome = await log.load()
#expect(outcome.records == [])
@@ -396,7 +396,7 @@ struct RemovalHistoryTests {
let directory = try TemporaryDirectory()
let url = try directory.file("Peel/removals.json", contents: Data("[]".utf8))
- #expect(await RemovalLog(url: url).startOver() == false)
+ #expect(await RemovalLog(url: url).startOver() == .notNeeded)
let folder = url.deletingLastPathComponent().path(percentEncoded: false)
#expect(try !FileManager.default.contentsOfDirectory(atPath: folder).contains { $0.hasPrefix("removals-damaged-") })
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
index 9142bca7..bf417590 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
@@ -589,7 +589,7 @@ struct TeamRegistryTests {
#expect(await registry.acknowledge("com.example.app") == .unreadable)
#expect(try Data(contentsOf: url) == Data("{".utf8))
- #expect(await registry.startOver())
+ #expect(await registry.startOver() == .started)
let kept = try FileManager.default.contentsOfDirectory(atPath: directory.url.path(percentEncoded: false))
#expect(kept.contains { $0.hasPrefix("teams-damaged-") && $0.hasSuffix(".json") })
#expect(await registry.check([app("com.example.app", team: "AAAA111111")]) == .init(changes: [], problem: nil))
@@ -604,7 +604,7 @@ struct TeamRegistryTests {
let registry = TeamRegistry(url: url)
_ = await registry.check([app("com.example.app", team: "AAAA111111")])
- #expect(await registry.startOver())
+ #expect(await registry.startOver() == .notNeeded)
let files = try FileManager.default.contentsOfDirectory(atPath: directory.url.path(percentEncoded: false))
#expect(!files.contains { $0.hasPrefix("teams-damaged-") })
#expect(await registry.check([app("com.example.app", team: "BBBB222222")]).changes.map(\.previous) == ["AAAA111111"])
diff --git a/Peel/Model/AppLibrary.swift b/Peel/Model/AppLibrary.swift
index e5afe2b4..3aa60ff9 100644
--- a/Peel/Model/AppLibrary.swift
+++ b/Peel/Model/AppLibrary.swift
@@ -252,8 +252,13 @@ final class AppLibrary {
}
/// Sets the list of folders aside when it cannot be read, so the folders can be chosen again.
- func startFoldersOver() {
- changeFolders { $0.startOver() }
+ @discardableResult
+ func startFoldersOver() -> StartOver {
+ let store = AppFolders()
+ let answer = store.startOver()
+ if answer == .started { couldNotSaveFolders = false }
+ folders = store.load()
+ return answer
}
private func changeFolders(_ change: (AppFolders) -> Bool) {
@@ -932,11 +937,15 @@ final class AppLibrary {
}
/// Keeps a record of signers that cannot be read beside a new one, and records who signs each app now.
- func startTeamRecordOver() async {
- guard await teamRegistry.startOver() else { return }
- await checkSigningTeams()
+ @discardableResult
+ func startTeamRecordOver() async -> StartOver {
+ let answer = await teamRegistry.startOver()
+ if answer != .couldNotSetAside { await checkSigningTeams() }
+ return answer
}
+ var teamRecordFile: URL { teamRegistry.url }
+
/// Selects the apps together, adding each first when it lives outside the scanned folders, for example in
/// the Trash. What is not an app is passed over, and false means none was.
@discardableResult
diff --git a/Peel/Model/ExclusionsStore.swift b/Peel/Model/ExclusionsStore.swift
index 0917ae51..f05e91f5 100644
--- a/Peel/Model/ExclusionsStore.swift
+++ b/Peel/Model/ExclusionsStore.swift
@@ -63,14 +63,9 @@ final class ExclusionsStore {
func startOver() async -> StartOver {
await inTurn { [self] in
let answer = await store.startOver()
- switch answer {
- case .started:
+ if answer == .started {
unsaved = []
couldNotSave = false
- case .couldNotSetAside:
- couldNotSave = true
- case .notNeeded:
- break
}
show(withUnsaved(await store.load()))
return answer
diff --git a/Peel/Model/RemovalHistoryStore.swift b/Peel/Model/RemovalHistoryStore.swift
index c97d4a60..0f8e3286 100644
--- a/Peel/Model/RemovalHistoryStore.swift
+++ b/Peel/Model/RemovalHistoryStore.swift
@@ -258,19 +258,17 @@ final class RemovalHistoryStore {
/// Keeps a History that cannot be read beside a new one, and records again.
@discardableResult
- func startOver() async -> Bool {
- let startedOver = await log.startOver()
+ func startOver() async -> StartOver {
+ let answer = await log.startOver()
await apply(await log.load())
- if startedOver { announcing(AttributedString(localized: "Started History over.")) }
- return startedOver
+ return answer
}
@discardableResult
- func startOverRefusals() async -> Bool {
- let startedOver = await refusals.startOver()
+ func startOverRefusals() async -> StartOver {
+ let answer = await refusals.startOver()
await loadRefusals()
- if startedOver { announcing(AttributedString(localized: "Started the Not Moved list over.")) }
- return startedOver
+ return answer
}
var historyFile: URL { log.url }
diff --git a/Peel/Views/AppList.swift b/Peel/Views/AppList.swift
index c23f29df..e60156f9 100644
--- a/Peel/Views/AppList.swift
+++ b/Peel/Views/AppList.swift
@@ -24,7 +24,9 @@ struct AppList: View {
detail: Text("Peel can’t read its list of app folders, so Orphaned Files lists nothing. Starting over keeps the old list beside a new one."),
kind: .note
) {
- Button("Start Over") { library.startFoldersOver() }
+ StartOverButton(file: AppFolders.defaultURL, startedOver: "Started the list of app folders over.") {
+ library.startFoldersOver()
+ }
}
.padding(.vertical, 6)
.listRowSeparator(.hidden)
@@ -139,8 +141,8 @@ private struct TeamRecordNotice: View {
title: Text("Peel can’t read its record of who signs your apps"),
detail: Text("Until you start the record over, Peel can’t warn you when an app’s signer changes. Starting over keeps the old file beside a new one.")
) {
- Button("Start Over") {
- Task { await library.startTeamRecordOver() }
+ StartOverButton(file: library.teamRecordFile, startedOver: "Started the record of who signs your apps over.") {
+ await library.startTeamRecordOver()
}
}
case .unsaved:
diff --git a/Peel/Views/History/HistoryList.swift b/Peel/Views/History/HistoryList.swift
index 5ab1cb00..9422ba7b 100644
--- a/Peel/Views/History/HistoryList.swift
+++ b/Peel/Views/History/HistoryList.swift
@@ -133,8 +133,8 @@ private struct HistoryProblemNotice: View {
title: Text("The record of past removals can’t be read"),
detail: Text("Until it can read the record, or you start over, Peel removes nothing, because anything it moved now couldn’t be put back. Starting over keeps the old file beside a new one. Items it lists can then only be dragged back out of the Trash in Finder.")
) {
- StartOverButton(file: history.historyFile) {
- await history.startOver() || history.shownProblem != .unreadable
+ StartOverButton(file: history.historyFile, startedOver: "Started History over.") {
+ await history.startOver()
}
}
case .couldNotRecord:
@@ -172,8 +172,8 @@ private struct RefusalProblemNotice: View {
title: Text("The Not Moved list can’t be read"),
detail: Text("Until you start the list over, Peel adds nothing to it, since it is the only record of what stayed. Starting over keeps the old file beside a new one.")
) {
- StartOverButton(file: history.refusalsFile) {
- await history.startOverRefusals() || history.refusalProblem != .unreadable
+ StartOverButton(file: history.refusalsFile, startedOver: "Started the Not Moved list over.") {
+ await history.startOverRefusals()
}
}
case .couldNotRecord:
@@ -185,27 +185,6 @@ private struct RefusalProblemNotice: View {
}
}
-/// Starts a file that can't be read over, and says so when its old copy couldn't be set aside, which leaves
-/// everything as it was.
-private struct StartOverButton: View {
- let file: URL
- /// Starts over and answers whether the file can be used now.
- let startOver: () async -> Bool
- @State private var couldNotSetAside = false
-
- var body: some View {
- Button("Start Over") {
- Task { couldNotSetAside = !(await startOver()) }
- }
- .alert("Peel couldn’t set the old file aside", isPresented: $couldNotSetAside) {
- Button("Show in Finder") { NSWorkspace.shared.activateFileViewerSelecting([file]) }
- Button("OK", role: .cancel) {}
- } message: {
- Text("Nothing changed. Check that Peel can write to its folder in Application Support, then try again.")
- }
- }
-}
-
private struct HistoryBatchRow: View {
let batch: RemovalBatch
diff --git a/Peel/Views/Intel/IntelList.swift b/Peel/Views/Intel/IntelList.swift
index 9d628d9a..57b80d87 100644
--- a/Peel/Views/Intel/IntelList.swift
+++ b/Peel/Views/Intel/IntelList.swift
@@ -135,7 +135,9 @@ struct IntelList: View {
@ViewBuilder
private var unreadActions: some View {
if library.listOfFoldersUnreadable {
- Button("Start Over") { library.startFoldersOver() }
+ StartOverButton(file: AppFolders.defaultURL, startedOver: "Started the list of app folders over.") {
+ library.startFoldersOver()
+ }
}
UnreadableFoldersActions(folders: unread, needsFullDiskAccess: needsFullDiskAccess)
}
diff --git a/Peel/Views/Orphans/OrphanList.swift b/Peel/Views/Orphans/OrphanList.swift
index 9da1b2ef..06a8377d 100644
--- a/Peel/Views/Orphans/OrphanList.swift
+++ b/Peel/Views/Orphans/OrphanList.swift
@@ -51,7 +51,9 @@ struct OrphanList: View {
parts.dropFirst().reduce(parts.first ?? Text(verbatim: "")) { Text("\($0)\n\n\($1)") }
} actions: {
if library.listOfFoldersUnreadable {
- Button("Start Over") { library.startFoldersOver() }
+ StartOverButton(file: AppFolders.defaultURL, startedOver: "Started the list of app folders over.") {
+ library.startFoldersOver()
+ }
}
UnreadableFoldersActions(
folders: library.unreadable,
diff --git a/Peel/Views/Settings/AppFoldersSection.swift b/Peel/Views/Settings/AppFoldersSection.swift
index c2208c69..c52476fe 100644
--- a/Peel/Views/Settings/AppFoldersSection.swift
+++ b/Peel/Views/Settings/AppFoldersSection.swift
@@ -45,7 +45,9 @@ struct AppFoldersSection: View {
HStack {
StatusLabel(title: Text("Peel can’t read its list of app folders, so Orphaned Files lists nothing. Starting over keeps the old list beside a new one."))
Spacer()
- Button("Start Over") { library.startFoldersOver() }
+ StartOverButton(file: AppFolders.defaultURL, startedOver: "Started the list of app folders over.") {
+ library.startFoldersOver()
+ }
}
}
if library.couldNotSaveFolders {
diff --git a/Peel/Views/Settings/ExclusionsSettingsView.swift b/Peel/Views/Settings/ExclusionsSettingsView.swift
index c8f539a5..a2133f63 100644
--- a/Peel/Views/Settings/ExclusionsSettingsView.swift
+++ b/Peel/Views/Settings/ExclusionsSettingsView.swift
@@ -44,8 +44,8 @@ struct ExclusionsSettingsView: View {
title: Text("Peel couldn’t read your exclusions"),
detail: Text("Until it can read them, or you start over, Peel removes nothing and puts nothing back, because it can’t tell what you asked it to leave alone. Adding or removing an entry below starts over too: the old file is kept beside the new one, but nothing in it counts anymore.")
) {
- Button("Start Over") {
- Task { await exclusions.startOver() }
+ StartOverButton(file: ExclusionStore.defaultURL, startedOver: "Started the list of exclusions over.") {
+ await exclusions.startOver()
}
}
}
diff --git a/Peel/Views/StartOverButton.swift b/Peel/Views/StartOverButton.swift
new file mode 100644
index 00000000..9638fd69
--- /dev/null
+++ b/Peel/Views/StartOverButton.swift
@@ -0,0 +1,31 @@
+import Accessibility
+import AppKit
+import PeelCore
+import SwiftUI
+
+/// Starts one of Peel's files that can't be read over: VoiceOver hears `startedOver` once it did, and an alert says
+/// when the old file couldn't be set aside, which leaves everything as it was.
+struct StartOverButton: View {
+ let file: URL
+ let startedOver: LocalizedStringResource
+ let startOver: () async -> StartOver
+ @State private var couldNotSetAside = false
+
+ var body: some View {
+ Button("Start Over") {
+ Task {
+ switch await startOver() {
+ case .started: AccessibilityNotification.Announcement(AttributedString(localized: startedOver)).post()
+ case .couldNotSetAside: couldNotSetAside = true
+ case .notNeeded: break
+ }
+ }
+ }
+ .alert("Peel couldn’t set the old file aside", isPresented: $couldNotSetAside) {
+ Button("Show in Finder") { NSWorkspace.shared.activateFileViewerSelecting([file]) }
+ Button("OK", role: .cancel) {}
+ } message: {
+ Text("Nothing changed. Check that Peel can write to its folder in Application Support, then try again.")
+ }
+ }
+}
diff --git a/PeelTests/RemovalHistoryStoreTests.swift b/PeelTests/RemovalHistoryStoreTests.swift
index 4d9f9171..1a8c6ec3 100644
--- a/PeelTests/RemovalHistoryStoreTests.swift
+++ b/PeelTests/RemovalHistoryStoreTests.swift
@@ -84,28 +84,24 @@ struct RemovalHistoryStoreTests {
#expect(history.batches.isEmpty)
}
- @Test func tellsVoiceOverOnlyAStartOverThatHappened() async throws {
+ @Test func answersWhatEachStartOverDid() async throws {
let folder = FileManager.default.temporaryDirectory.appending(path: "PeelTests-\(UUID().uuidString)")
defer { try? FileManager.default.removeItem(at: folder) }
let removals = folder.appending(path: "removals.json")
let refusals = folder.appending(path: "refusals.json")
try FileManager.default.createDirectory(at: removals, withIntermediateDirectories: true)
try FileManager.default.createDirectory(at: refusals, withIntermediateDirectories: true)
- let heard = Heard()
let history = RemovalHistoryStore(
log: RemovalLog(url: removals),
refusals: RefusalLog(url: refusals),
- knowsTheExclusions: { true },
- announcing: { heard.words.append(String($0.characters)) }
+ knowsTheExclusions: { true }
)
await history.load()
- await history.startOver()
- await history.startOverRefusals()
- await history.startOver()
- await history.startOverRefusals()
-
- #expect(heard.words == ["Started History over.", "Started the Not Moved list over."])
+ #expect(await history.startOver() == .started)
+ #expect(await history.startOverRefusals() == .started)
+ #expect(await history.startOver() == .notNeeded)
+ #expect(await history.startOverRefusals() == .notNeeded)
}
@Test func looksInTheTrashAgainAfterAPutBackHistoryCouldNotWrite() async throws {
@@ -179,8 +175,8 @@ struct RemovalHistoryStoreTests {
let startedOver = await history.startOver()
let startedRefusalsOver = await history.startOverRefusals()
- #expect(!startedOver && history.shownProblem == .unreadable)
- #expect(!startedRefusalsOver && history.refusalProblem == .unreadable)
+ #expect(startedOver == .couldNotSetAside && history.shownProblem == .unreadable)
+ #expect(startedRefusalsOver == .couldNotSetAside && history.refusalProblem == .unreadable)
}
@Test func startsOverANotMovedListItCannotRead() async throws {