feature: sent-PDF history (10) + image retention (30) with pruning per Ben's 2026-09-02 ruling
This commit is contained in:
@@ -30,6 +30,20 @@ enum PickerSelfTest {
|
||||
}
|
||||
}
|
||||
|
||||
/// Standalone HISTORY phase when `SHOTDECK_HISTORY_SELFTEST` is set without
|
||||
/// the picker chain. Waits for NSApp like the other phases, then exits.
|
||||
static func runHistoryIfRequested() {
|
||||
guard let raw = ProcessInfo.processInfo.environment["SHOTDECK_HISTORY_SELFTEST"],
|
||||
!raw.isEmpty
|
||||
else { return }
|
||||
_ = raw
|
||||
DispatchQueue.main.async {
|
||||
MainActor.assumeIsolated {
|
||||
runHistoryPhase()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static func execute(outputDirectory: URL) {
|
||||
do {
|
||||
try FileManager.default.createDirectory(
|
||||
@@ -117,7 +131,8 @@ enum PickerSelfTest {
|
||||
runRegionPersistPhase()
|
||||
// Hop off this MainActor job so the SEND-TRUTH Task can run; do not
|
||||
// exit(0) here — runSendTruthPhase prints its own PASS/FAIL, then
|
||||
// chains to UPDATE-SELFTEST (or exits if that phase is not requested).
|
||||
// chains to HISTORY, then UPDATE-SELFTEST (or exits if that phase is
|
||||
// not requested).
|
||||
runSendTruthPhase()
|
||||
}
|
||||
|
||||
@@ -166,21 +181,166 @@ enum PickerSelfTest {
|
||||
/// Fail path must leave the session open in the temp spool; success path archives
|
||||
/// and mints a fresh empty session. Scheduled as a new MainActor job because this
|
||||
/// function is called from inside `execute()` — a nested run-loop wait would never
|
||||
/// let the Task start. On success, chains to UPDATE-SELFTEST instead of exiting.
|
||||
/// let the Task start. On success, chains to HISTORY instead of exiting.
|
||||
private static func runSendTruthPhase() {
|
||||
Task { @MainActor in
|
||||
do {
|
||||
try await executeSendTruth()
|
||||
print("SEND-TRUTH PASS")
|
||||
fflush(stdout)
|
||||
if !startUpdateSelfTestIfRequested() {
|
||||
exit(0)
|
||||
}
|
||||
} catch {
|
||||
print("SEND-TRUTH FAIL \(error)")
|
||||
fflush(stdout)
|
||||
exit(1)
|
||||
}
|
||||
runHistoryPhase()
|
||||
}
|
||||
}
|
||||
|
||||
/// Phase 4: drive HistoryStore record/prune in a temp root. Env-gated by
|
||||
/// `SHOTDECK_HISTORY_SELFTEST` the same way UPDATE is gated, and also runs
|
||||
/// whenever the picker self-test chain is already in flight so a full
|
||||
/// self-test prints HISTORY PASS|FAIL. Chains to UPDATE-SELFTEST (or exits).
|
||||
private static func runHistoryPhase() {
|
||||
let historyRequested = ProcessInfo.processInfo.environment["SHOTDECK_HISTORY_SELFTEST"]
|
||||
let pickerRequested = ProcessInfo.processInfo.environment["SHOTDECK_PICKER_SELFTEST"]
|
||||
let shouldRun = (historyRequested.map { !$0.isEmpty } ?? false)
|
||||
|| (pickerRequested.map { !$0.isEmpty } ?? false)
|
||||
guard shouldRun else {
|
||||
if !startUpdateSelfTestIfRequested() {
|
||||
exit(0)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
Task { @MainActor in
|
||||
do {
|
||||
try await executeHistorySelfTest()
|
||||
print("HISTORY PASS")
|
||||
fflush(stdout)
|
||||
if !startUpdateSelfTestIfRequested() {
|
||||
exit(0)
|
||||
}
|
||||
} catch {
|
||||
print("HISTORY FAIL \(error)")
|
||||
fflush(stdout)
|
||||
exit(1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static func executeHistorySelfTest() async throws {
|
||||
let fm = FileManager.default
|
||||
let root = fm.temporaryDirectory
|
||||
.appendingPathComponent("shotdeck-history-selftest-\(UUID().uuidString)", isDirectory: true)
|
||||
defer { try? fm.removeItem(at: root) }
|
||||
|
||||
let paths = try AppSupportPaths(
|
||||
root: root.appendingPathComponent("root", isDirectory: true),
|
||||
outbox: root.appendingPathComponent("outbox", isDirectory: true),
|
||||
watchFolder: root.appendingPathComponent("watch", isDirectory: true)
|
||||
)
|
||||
let store = try HistoryStore(paths: paths)
|
||||
let sources = root.appendingPathComponent("user-sources", isDirectory: true)
|
||||
try fm.createDirectory(at: sources, withIntermediateDirectories: true)
|
||||
|
||||
var recorded: [HistoryEntry] = []
|
||||
for i in 0..<12 {
|
||||
let source = sources.appendingPathComponent("source-\(i).pdf")
|
||||
try Data("%PDF-1.4\n%hist-\(i)\n%%EOF\n".utf8).write(to: source)
|
||||
let entry = try await store.recordSentPDF(
|
||||
sourceURL: source,
|
||||
sessionID: UUID(),
|
||||
pageCount: 1,
|
||||
sentAt: Date(timeIntervalSince1970: 1_800_000_000 + TimeInterval(i))
|
||||
)
|
||||
recorded.append(entry)
|
||||
let onDisk = try Data(contentsOf: source)
|
||||
guard onDisk == Data("%PDF-1.4\n%hist-\(i)\n%%EOF\n".utf8) else {
|
||||
throw HistorySelfTestError.detail("user source PDF was modified: \(source.path)")
|
||||
}
|
||||
}
|
||||
|
||||
let listed = await store.listPDFs()
|
||||
guard listed.count == 10 else {
|
||||
throw HistorySelfTestError.detail("listPDFs count \(listed.count) want 10")
|
||||
}
|
||||
let wantNewest = Array(recorded.suffix(10).reversed())
|
||||
guard listed.map(\.id) == wantNewest.map(\.id) else {
|
||||
throw HistorySelfTestError.detail("listPDFs did not return the 10 newest")
|
||||
}
|
||||
let pdfsDir = paths.root.appendingPathComponent("history/pdfs", isDirectory: true)
|
||||
for entry in recorded.prefix(2) {
|
||||
let gone = pdfsDir.appendingPathComponent(entry.fileName)
|
||||
guard !fm.fileExists(atPath: gone.path) else {
|
||||
throw HistorySelfTestError.detail("oldest PDF still on disk: \(gone.path)")
|
||||
}
|
||||
}
|
||||
|
||||
let same = sources.appendingPathComponent("same.pdf")
|
||||
try Data("%PDF-1.4\n%same\n%%EOF\n".utf8).write(to: same)
|
||||
let first = try await store.recordSentPDF(
|
||||
sourceURL: same, sessionID: nil, pageCount: 1,
|
||||
sentAt: Date(timeIntervalSince1970: 1_800_000_100)
|
||||
)
|
||||
let second = try await store.recordSentPDF(
|
||||
sourceURL: same, sessionID: nil, pageCount: 1,
|
||||
sentAt: Date(timeIntervalSince1970: 1_800_000_101)
|
||||
)
|
||||
guard first.id != second.id, first.fileURL.path != second.fileURL.path,
|
||||
fm.fileExists(atPath: first.fileURL.path),
|
||||
fm.fileExists(atPath: second.fileURL.path),
|
||||
fm.fileExists(atPath: same.path)
|
||||
else {
|
||||
throw HistorySelfTestError.detail("re-record same source did not produce two distinct copies")
|
||||
}
|
||||
|
||||
let spool = try SpoolStore(paths: paths)
|
||||
let png = try makeTinyPNGData()
|
||||
let base = Date(timeIntervalSince1970: 1_800_100_000)
|
||||
var n = 0
|
||||
var oldestSessionID: UUID?
|
||||
for count in [5, 15, 15] {
|
||||
if n == 0 {
|
||||
oldestSessionID = try await spool.currentSession().id
|
||||
}
|
||||
for _ in 0..<count {
|
||||
_ = try await spool.append(
|
||||
pngData: png, pixelWidth: 64, pixelHeight: 48, scale: 1,
|
||||
capturedAt: base.addingTimeInterval(TimeInterval(n))
|
||||
)
|
||||
n += 1
|
||||
}
|
||||
_ = try await spool.archiveCurrent(pdfFileName: "Redline-hist-\(n).pdf")
|
||||
}
|
||||
let openCapture = try await spool.append(
|
||||
pngData: png, pixelWidth: 64, pixelHeight: 48, scale: 1,
|
||||
capturedAt: Date(timeIntervalSince1970: 1_900_000_000)
|
||||
)
|
||||
let openSession = try await spool.currentSession()
|
||||
let openPNG = paths.sessionDirectory(openSession.id).appendingPathComponent(openCapture.fileName)
|
||||
let openBytes = try Data(contentsOf: openPNG)
|
||||
|
||||
try await store.pruneImages()
|
||||
|
||||
let images = try await store.listImages(limit: 50)
|
||||
guard images.count == 30 else {
|
||||
throw HistorySelfTestError.detail("listImages count \(images.count) want 30")
|
||||
}
|
||||
if let oldestSessionID {
|
||||
let oldDir = paths.archiveDirectory(oldestSessionID)
|
||||
guard !fm.fileExists(atPath: oldDir.path) else {
|
||||
throw HistorySelfTestError.detail("emptied archive session still on disk")
|
||||
}
|
||||
}
|
||||
guard fm.fileExists(atPath: openPNG.path), try Data(contentsOf: openPNG) == openBytes else {
|
||||
throw HistorySelfTestError.detail("open session PNG was touched")
|
||||
}
|
||||
let remainingOpen = try await spool.currentSession()
|
||||
guard remainingOpen.id == openSession.id,
|
||||
remainingOpen.captures.map(\.id) == [openCapture.id]
|
||||
else {
|
||||
throw HistorySelfTestError.detail("open session manifest was touched")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -196,7 +356,7 @@ enum PickerSelfTest {
|
||||
watchFolder: root.appendingPathComponent("watch", isDirectory: true)
|
||||
)
|
||||
let ledger = try ReturnLedger(paths: paths)
|
||||
let model = AppModel(
|
||||
let model = try AppModel(
|
||||
paths: paths,
|
||||
spool: try SpoolStore(paths: paths),
|
||||
composer: PDFComposer(),
|
||||
@@ -300,7 +460,7 @@ enum PickerSelfTest {
|
||||
exit(1)
|
||||
}
|
||||
|
||||
/// Phase 4: builds a fake 99.0.0 bundle, serves a local appcast, stages via
|
||||
/// Phase 5: builds a fake 99.0.0 bundle, serves a local appcast, stages via
|
||||
/// `checkNow`, then `installStaged` into the env dir — never `/Applications`.
|
||||
/// Returns true when the async phase was scheduled (it calls `exit` itself).
|
||||
@discardableResult
|
||||
@@ -439,7 +599,7 @@ enum PickerSelfTest {
|
||||
watchFolder: root.appendingPathComponent("watch", isDirectory: true)
|
||||
)
|
||||
let ledger = try ReturnLedger(paths: paths)
|
||||
let model = AppModel(
|
||||
let model = try AppModel(
|
||||
paths: paths,
|
||||
spool: try SpoolStore(paths: paths),
|
||||
composer: PDFComposer(),
|
||||
@@ -538,3 +698,12 @@ private enum UpdateSelfTestError: Error, CustomStringConvertible {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private enum HistorySelfTestError: Error, CustomStringConvertible {
|
||||
case detail(String)
|
||||
var description: String {
|
||||
switch self {
|
||||
case .detail(let s): return s
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user