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.

Forget says what it does, and VoiceOver hears Forget and Start Over

Țugui Dragoșbf0ff6ab10bb
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index d5f24130..1643eb47 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -46669,6 +46669,346 @@
}
}
},
+ "Forgot ^[%lld item](inflect: true)." : {
+ "localizations" : {
+ "cs" : {
+ "variations" : {
+ "plural" : {
+ "few" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Byly zapomenuty %lld položky."
+ }
+ },
+ "many" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bylo zapomenuto %lld položky."
+ }
+ },
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Byla zapomenuta %lld položka."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bylo zapomenuto %lld položek."
+ }
+ }
+ }
+ }
+ },
+ "de" : {
+ "variations" : {
+ "plural" : {
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld Objekt vergessen."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld Objekte vergessen."
+ }
+ }
+ }
+ }
+ },
+ "es" : {
+ "variations" : {
+ "plural" : {
+ "many" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se han olvidado %lld de ítems."
+ }
+ },
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se ha olvidado un ítem."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se han olvidado %lld ítems."
+ }
+ }
+ }
+ }
+ },
+ "fr" : {
+ "variations" : {
+ "plural" : {
+ "many" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld d’éléments oubliés."
+ }
+ },
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld élément oublié."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld éléments oubliés."
+ }
+ }
+ }
+ }
+ },
+ "it" : {
+ "variations" : {
+ "plural" : {
+ "many" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Dimenticati %lld di elementi."
+ }
+ },
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Dimenticato un elemento."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Dimenticati %lld elementi."
+ }
+ }
+ }
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld項目を履歴から削除しました。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "항목 %lld개를 기록에서 지웠습니다."
+ }
+ },
+ "nl" : {
+ "variations" : {
+ "plural" : {
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld onderdeel vergeten."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld onderdelen vergeten."
+ }
+ }
+ }
+ }
+ },
+ "pl" : {
+ "variations" : {
+ "plural" : {
+ "few" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zapomniano %lld rzeczy."
+ }
+ },
+ "many" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zapomniano %lld rzeczy."
+ }
+ },
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zapomniano %lld rzecz."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zapomniano %lld rzeczy."
+ }
+ }
+ }
+ }
+ },
+ "pt" : {
+ "variations" : {
+ "plural" : {
+ "many" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld de itens esquecidos."
+ }
+ },
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld item esquecido."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld itens esquecidos."
+ }
+ }
+ }
+ }
+ },
+ "ro" : {
+ "variations" : {
+ "plural" : {
+ "few" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld articole au fost uitate."
+ }
+ },
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld articol a fost uitat."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld de articole au fost uitate."
+ }
+ }
+ }
+ }
+ },
+ "ru" : {
+ "variations" : {
+ "plural" : {
+ "few" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Забыто %lld объекта."
+ }
+ },
+ "many" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Забыто %lld объектов."
+ }
+ },
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Забыт %lld объект."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Забыто %lld объекта."
+ }
+ }
+ }
+ }
+ },
+ "sv" : {
+ "variations" : {
+ "plural" : {
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld objekt glömdes."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld objekt glömdes."
+ }
+ }
+ }
+ }
+ },
+ "tr" : {
+ "variations" : {
+ "plural" : {
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld öğe unutuldu."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "%lld öğe unutuldu."
+ }
+ }
+ }
+ }
+ },
+ "uk" : {
+ "variations" : {
+ "plural" : {
+ "few" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Забуто %lld елементи."
+ }
+ },
+ "many" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Забуто %lld елементів."
+ }
+ },
+ "one" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Забуто %lld елемент."
+ }
+ },
+ "other" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Забуто %lld елемента."
+ }
+ }
+ }
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已移除%lld个项目的记录。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已移除%lld個項目的記錄。"
+ }
+ }
+ }
+ },
"Formula" : {
"comment" : "Homebrew's own name for one of its two kinds of package, shown as a badge on a package's page. Homebrew prints it in English whatever language the Mac uses, so it stays in English.",
"shouldTranslate" : false
@@ -51156,6 +51496,112 @@
}
}
},
+ "History stops listing them. They have already left the Trash, so nothing on your Mac changes." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Historie je přestane zobrazovat. Už nejsou v koši, takže se ve vašem Macu nic nezmění."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Der Verlauf zeigt sie nicht mehr an. Diese Objekte sind bereits nicht mehr im Papierkorb, daher ändert sich auf deinem Mac nichts."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Historial deja de mostrarlos. Ya no están en la papelera, así que no cambia nada en tu Mac."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "L’Historique cesse de les lister. Ils ont déjà quitté la corbeille : rien ne change donc sur votre Mac."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "La Cronologia smette di elencarli. Sono già usciti dal Cestino, quindi sul Mac non cambia nulla."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "これらの項目は履歴に表示されなくなります。すでにゴミ箱にはないため、Mac上では何も変わりません。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "기록에서 더 이상 이 항목들을 나열하지 않습니다. 이 항목들은 이미 휴지통에 없으므로 Mac에서는 아무것도 변경되지 않습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Geschiedenis vermeldt ze dan niet meer. Ze zijn al uit de prullenmand verdwenen, dus er verandert niets op je Mac."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Historia przestanie je wyświetlać. Te rzeczy zniknęły już z Kosza, więc na Twoim Macu nic się nie zmieni."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O Histórico deixa de listá-los. Eles já saíram do Lixo, então nada muda no seu Mac."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Istoricul nu le va mai lista. Acestea nu mai sunt în Coș, așa că pe Mac‑ul dvs. nu se schimbă nimic."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "История перестанет их показывать. Их уже нет в Корзине, поэтому на Вашем Mac ничего не изменится."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Historik listar dem inte längre. De har redan lämnat papperskorgen, så inget på datorn ändras."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Geçmiş bunları artık listelemez. Bunlar zaten Çöp Sepeti’nden çıktı, bu yüzden Mac’inizde hiçbir şey değişmez."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Історія перестане їх показувати. Їх уже немає в Смітнику, тож на вашому Mac нічого не зміниться."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "“历史记录”将不再列出它们。它们已不在废纸篓中,因此你的Mac上不会有任何变化。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "「歷史記錄」將不再列出這些項目。它們已不在「垃圾桶」中,因此你的Mac上不會有任何變更。"
+ }
+ }
+ }
+ },
"Hold Control and Command and drag, instead of aiming for the title bar." : {
"localizations" : {
"cs" : {
@@ -163205,6 +163651,218 @@
}
}
},
+ "Started History over." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Historie byla začata znovu."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Der Verlauf wurde neu begonnen."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se ha vuelto a empezar Historial."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "L’Historique a été recommencé."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ricominciata da capo la Cronologia."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "履歴を最初からやり直しました。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "기록을 처음부터 다시 시작했습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Opnieuw begonnen met Geschiedenis."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zaczęto od nowa Historię."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Histórico recomeçado."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Istoricul a fost reînceput."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "История начата заново."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Började om Historik."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Geçmiş baştan başlatıldı."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Історію почато наново."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已重新开始建立“历史记录”。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已重新開始「歷史記錄」。"
+ }
+ }
+ }
+ },
+ "Started the Not Moved list over." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Seznam Nepřesunuto byl začat znovu."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Die Liste „Nicht verschoben“ wurde neu begonnen."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Se ha vuelto a empezar la lista “Sin trasladar”."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "La liste « Non déplacés » a été recommencée."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ricominciato da capo l’elenco “Non spostati”."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "“移動されなかった項目”のリストを最初からやり直しました。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "‘이동되지 않음’ 목록을 처음부터 다시 시작했습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Opnieuw begonnen met de lijst 'Niet verplaatst'."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zaczęto od nowa listę „Nie przeniesiono”."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Lista “Não Movidos” recomeçada."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Lista „Nu au fost mutate” a fost reîncepută."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Список «Не перемещено» начат заново."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Började om listan Inte flyttat."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Taşınmayanlar listesi baştan başlatıldı."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Список «Не переміщено» почато наново."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已重新开始建立“未移动”列表。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "已重新開始「未移動」列表。"
+ }
+ }
+ }
+ },
"Starts Peel when you log in. “Watch the Trash” works only while Peel is running." : {
"localizations" : {
"cs" : {
@@ -196531,112 +197189,6 @@
}
}
},
- "What History forgets, it can’t put back afterward." : {
- "localizations" : {
- "cs" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Co Historie zapomene, to už pak nemůže vrátit zpět."
- }
- },
- "de" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Was der Verlauf vergisst, kann er danach nicht mehr zurücklegen."
- }
- },
- "es" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Lo que Historial olvida, no puede restaurarlo después."
- }
- },
- "fr" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Ce que l’Historique oublie, il ne peut pas le remettre en place par la suite."
- }
- },
- "it" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Ciò che la Cronologia dimentica, non può più ripristinarlo."
- }
- },
- "ja" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "履歴から削除した項目は、あとから戻すことはできません。"
- }
- },
- "ko" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "기록에서 지운 항목은 나중에 되돌려 놓을 수 없습니다."
- }
- },
- "nl" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Wat Geschiedenis vergeet, kan Geschiedenis daarna niet meer terugzetten."
- }
- },
- "pl" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Tego, co Historia zapomni, nie może potem przywrócić."
- }
- },
- "pt" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "O que o Histórico esquece, ele não pode colocar de volta depois."
- }
- },
- "ro" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Ce uitați nu mai puteți pune înapoi din Istoric."
- }
- },
- "ru" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "То, что История забудет, она потом не сможет восстановить."
- }
- },
- "sv" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Det som Historik glömmer kan den inte lägga tillbaka efteråt."
- }
- },
- "tr" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Geçmiş, unuttuklarını sonradan yerine koyamaz."
- }
- },
- "uk" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Те, що Історія забуде, вона вже не зможе повернути."
- }
- },
- "zh-Hans" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "移除记录后,“历史记录”就无法再将相应的项目放回原处。"
- }
- },
- "zh-Hant" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "「歷史記錄」移除記錄後,就無法再還原這些項目。"
- }
- }
- }
- },
"What Homebrew Found" : {
"localizations" : {
"cs" : {
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift b/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
index d929d2d9..407bb8c6 100644
--- a/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Removal/RefusalLog.swift
@@ -99,13 +99,12 @@ public actor RefusalLog {
}
/// Keeps a file that cannot be read beside a new one, under another name, and starts writing refusals down again.
- public func startOver() -> (records: [RefusalRecord]?, problem: RefusalLogProblem?) {
+ /// False when the file can be read, or couldn't be set aside.
+ public func startOver() -> Bool {
FileLock.whileHeld(beside: url) {
- if let records = current() { return (records, problem) }
- guard DamagedFile.setAside(url) != nil else { return (nil, problem) }
+ guard current() == nil, DamagedFile.setAside(url) != nil else { return false }
problem = nil
- let records = current()
- return (records, problem)
+ return true
}
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift b/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift
index aab16e6e..e26ed42b 100644
--- a/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Removal/RemovalLog.swift
@@ -119,13 +119,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.
- public func startOver() -> RemovalLogOutcome {
+ /// 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 {
whileNoOtherProcessWrites {
- guard stored() == nil else { return RemovalLogOutcome(records: current(), problem: problem) }
- guard DamagedFile.setAside(url) != nil else { return RemovalLogOutcome(records: nil, problem: problem) }
+ guard stored() == nil, DamagedFile.setAside(url) != nil else { return false }
problem = nil
- return RemovalLogOutcome(records: current(), problem: problem)
+ return true
}
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift
index 14ed93dc..6f4349ae 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/RefusalLogTests.swift
@@ -1,6 +1,7 @@
import Foundation
@testable import PeelCommandLine
@testable import PeelCore
+import PeelPrivileged
import Testing
struct RefusalLogTests {
@@ -203,13 +204,24 @@ struct RefusalLogTests {
try Data("[]".utf8).write(to: url)
try directory.setPermissions(0, of: url)
- let started = await RefusalLog(url: url).startOver()
+ let log = RefusalLog(url: url)
- #expect(started.records == [] && started.problem == nil)
+ #expect(await log.startOver())
+ let read = await log.load()
+ #expect(read.records == [] && read.problem == nil)
let kept = try FileManager.default.contentsOfDirectory(atPath: url.deletingLastPathComponent().path())
#expect(kept.contains { $0.hasPrefix("refusals-damaged-") }, "the file it could not read was not kept")
}
+ @Test func startsNothingOverWhileTheListCanBeRead() async throws {
+ let directory = try TemporaryDirectory()
+ let url = try directory.directory("Peel").appending(path: "refusals.json")
+ try Data("[]".utf8).write(to: url)
+
+ #expect(await RefusalLog(url: url).startOver() == false)
+ #expect(DamagedFile.copies(of: url) == [])
+ }
+
@Test func clearMovesTheCopiesItSetAsideToo() async throws {
let directory = try TemporaryDirectory()
let (service, folder) = try trash(in: directory)
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/RemovalHistoryTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/RemovalHistoryTests.swift
index bf3759f6..7ec5e2f8 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/RemovalHistoryTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/RemovalHistoryTests.swift
@@ -360,19 +360,30 @@ struct RemovalHistoryTests {
let log = RemovalLog(url: url)
#expect(await log.load().problem == .unreadable)
- let outcome = await log.startOver()
+ let startedOver = await log.startOver()
let folder = directory.url.appending(path: "Peel").path(percentEncoded: false)
let kept = try FileManager.default.contentsOfDirectory(atPath: folder).filter { $0.hasPrefix("removals-damaged-") }
for name in kept {
try directory.setPermissions(0o644, of: "Peel/\(name)")
}
+ #expect(startedOver)
#expect(kept.count == 1, "the old file was not kept beside the new one")
+ let outcome = await log.load()
#expect(outcome.records == [])
#expect(outcome.problem == nil)
#expect(await log.add([Self.record(batch: UUID())]).records?.count == 1)
}
+ @Test func startsNothingOverWhileHistoryCanBeRead() async throws {
+ let directory = try TemporaryDirectory()
+ let url = try directory.file("Peel/removals.json", contents: Data("[]".utf8))
+
+ #expect(await RemovalLog(url: url).startOver() == false)
+ let folder = url.deletingLastPathComponent().path(percentEncoded: false)
+ #expect(try !FileManager.default.contentsOfDirectory(atPath: folder).contains { $0.hasPrefix("removals-damaged-") })
+ }
+
/// A log in a folder that cannot be searched is not known to be empty, so it is unreadable, never replaced.
@Test func aLogItCannotReachIsUnreadableNotEmpty() async throws {
let directory = try TemporaryDirectory()
diff --git a/Peel/Model/RemovalHistoryStore.swift b/Peel/Model/RemovalHistoryStore.swift
index 1753d6e6..ea3b9abc 100644
--- a/Peel/Model/RemovalHistoryStore.swift
+++ b/Peel/Model/RemovalHistoryStore.swift
@@ -131,6 +131,7 @@ final class RemovalHistoryStore {
private let outcome: RemovalOutcome?
private let knowsTheExclusions: () -> Bool
private let restoring: ([TrashedItem], Bool) async -> [RestoreFailure?]
+ private let announcing: (AttributedString) -> Void
/// Read again here once History has counted a removal, rather than by each tool.
var stats: LifetimeStats?
/// The last batch moved, for Undo. `@Environment(\.undoManager)` is nil in an app with no documents,
@@ -197,13 +198,15 @@ final class RemovalHistoryStore {
knowsTheExclusions: @escaping () -> Bool = { ExclusionsStore.shared.exclusions.isKnown },
restoring: @escaping ([TrashedItem], Bool) async -> [RestoreFailure?] = { items, canUseHelper in
await TrashService(exclusions: ExclusionsStore.shared.exclusions).restore(items, canUseHelper: canUseHelper)
- }
+ },
+ announcing: @escaping (AttributedString) -> Void = { AccessibilityNotification.Announcement($0).post() }
) {
self.log = log
self.refusals = refusals
self.outcome = outcome
self.knowsTheExclusions = knowsTheExclusions
self.restoring = restoring
+ self.announcing = announcing
}
func load() async {
@@ -253,11 +256,15 @@ final class RemovalHistoryStore {
/// Keeps a History that cannot be read beside a new one, and records again.
func startOver() async {
- await apply(await log.startOver())
+ let startedOver = await log.startOver()
+ await apply(await log.load())
+ if startedOver { announcing(AttributedString(localized: "Started History over.")) }
}
func startOverRefusals() async {
- await showRefusals(await refusals.startOver())
+ let startedOver = await refusals.startOver()
+ await loadRefusals()
+ if startedOver { announcing(AttributedString(localized: "Started the Not Moved list over.")) }
}
private func loadRefusals() async {
@@ -336,7 +343,7 @@ final class RemovalHistoryStore {
let parts = RemovalPart.of(removal.records.map { ($0.date, $0.part) })
let moved = RemovalBatch(id: removal.batch, parts: parts, date: .now, records: removal.records)
justMoved = moved
- AccessibilityNotification.Announcement(moved.movedAnnouncement).post()
+ announcing(moved.movedAnnouncement)
stats?.reload()
registerUndo(of: removal.records, title: RemovalBatch.undoTitle(of: parts, title: moved.title))
}
@@ -468,9 +475,7 @@ final class RemovalHistoryStore {
}
await apply(await log.remove(restored))
// A move is announced, and so is its undoing: the rows only vanish from the list.
- AccessibilityNotification.Announcement(
- AttributedString(localized: "Put back ^[\(restored.count) item](inflect: true).")
- ).post()
+ announcing(AttributedString(localized: "Put back ^[\(restored.count) item](inflect: true)."))
}
return stayed
}
@@ -479,8 +484,12 @@ final class RemovalHistoryStore {
/// Removes `records` from History. The page offers this for items that have left the Trash.
func forget(_ records: [RemovalRecord]) async {
keepUndoable(without: Set(records.map(\.id)))
- await apply(await log.remove(Set(records.map(\.id))))
+ let outcome = await log.remove(Set(records.map(\.id)))
+ await apply(outcome)
selectedIDs.subtract(records.map(\.id))
+ if !records.isEmpty, outcome.records != nil {
+ announcing(AttributedString(localized: "Forgot ^[\(records.count) item](inflect: true)."))
+ }
}
func isSelected(_ record: RemovalRecord) -> Bool {
diff --git a/Peel/Views/History/HistoryDetailView.swift b/Peel/Views/History/HistoryDetailView.swift
index f6ec50ca..5497c16f 100644
--- a/Peel/Views/History/HistoryDetailView.swift
+++ b/Peel/Views/History/HistoryDetailView.swift
@@ -118,7 +118,7 @@ struct HistoryDetailView: View {
}
Button("Cancel", role: .cancel) {}
} message: {
- Text("What History forgets, it can’t put back afterward.")
+ Text("History stops listing them. They have already left the Trash, so nothing on your Mac changes.")
}
}
diff --git a/PeelTests/RemovalHistoryStoreTests.swift b/PeelTests/RemovalHistoryStoreTests.swift
index dad53241..53a33447 100644
--- a/PeelTests/RemovalHistoryStoreTests.swift
+++ b/PeelTests/RemovalHistoryStoreTests.swift
@@ -61,6 +61,53 @@ struct RemovalHistoryStoreTests {
#expect(!history.isKnownEmpty)
}
+ @Test func tellsVoiceOverWhatForgetForgot() async throws {
+ let folder = FileManager.default.temporaryDirectory.appending(path: "PeelTests-\(UUID().uuidString)")
+ defer { try? FileManager.default.removeItem(at: folder) }
+ let heard = Heard()
+ let history = RemovalHistoryStore(
+ log: RemovalLog(url: folder.appending(path: "removals.json")),
+ refusals: RefusalLog(url: folder.appending(path: "refusals.json")),
+ knowsTheExclusions: { true },
+ announcing: { heard.words.append(String($0.characters)) }
+ )
+ let part = RemovalPart(source: "Example", sourceKey: nil, tool: Tool.developer.rawValue)
+ var removal = RemovalInProgress()
+ await history.record(try moved("One"), part: part, sizes: [:], in: &removal)
+ await history.record(try moved("Two"), part: part, sizes: [:], in: &removal)
+ history.finish(removal)
+ await history.load()
+
+ await history.forget(history.records)
+
+ #expect(heard.words.last == "Forgot 2 items.")
+ #expect(history.batches.isEmpty)
+ }
+
+ @Test func tellsVoiceOverOnlyAStartOverThatHappened() 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)) }
+ )
+ 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."])
+ }
+
@Test func startsOverANotMovedListItCannotRead() async throws {
let folder = FileManager.default.temporaryDirectory.appending(path: "PeelTests-\(UUID().uuidString)")
defer { try? FileManager.default.removeItem(at: folder) }
@@ -127,3 +174,7 @@ struct RemovalHistoryStoreTests {
#expect(history.refusalBatches.count == 1)
}
}
+
+private final class Heard {
+ var words: [String] = []
+}