Second fix round of owner review 2, phase 3 (engine, server, desktop).
- A photo never hashed whose original is missing can be deleted again: it goes
into its trash record without a file and without a tombstone (nothing is left
to name), stays listed until Empty erases it, and a restore keeps it with the
reason "no file". FrameDeleteBlock.Unhashable now blocks only a present
original that cannot be read; the API answers it as 409 photo_unreadable
naming the photo, and every block has its own code and message.
- Deleting a whole sequence first settles an interrupted photo deletion,
restore or ingest of it (ReadLocked under its lease), so no journal or half
entry travels into the sequence's trash entry; it refuses while a restore
into it waits for its busy entry.
- FrameTrash.Settle takes the photo entry's lease and leaves the journal for
later while the entry is busy (an emptying), so it never races EraseAsync;
meanwhile no other restore writes its journal over it and scans do not adopt
its files.
- The hashes computed for frames that stay (to find a twin of a deleted photo)
go into the sidecar and index, and only a frame whose first and last 64 KiB
match a deleted photo's is read whole.
- A restore into a new sequence rewrites its record after each photo filed, so
a crash or a database failure never leaves filed photos listed.
- An upload completion no longer has a window before the commit: the ingest
checks the sidecar's tombstones under the sequence lease a deletion takes
(IngestRequest.RefuseRemoved), unless the upload asked to bring it back.
- A restore reports each kept photo with its reason (no longer matches its
record, could not be moved back, already in the sequence, had no file); the
desktop line and the API message say so in en and it, and the tooltip holds
the whole sentence. The desktop tells TrashMismatchException by its type.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 1858f1f450a35fb8383ede8d80ce5f8de9b7ceac)
The desktop trash dialog sent the "N files stayed in the trash" sentence
through ShowError. ArchiveFailures.Cause has no arm for it, so after a
partial restore the red line and Narrator said "A file of the archive could
not be read or written." The sentence itself appeared only in the tooltip.
The same thing happened to an entry none of whose files matches its record.
- ArchiveDialogViewModel.ShowMessage shows a sentence that is already
localized. The trash dialog uses it for kept files, and its tooltip names
the files kept (six of them, then "+ N more").
- ArchiveFailures.Cause passes FrameTrash's Archive.Error.TrashMismatch
sentence through. It matches the sentence's text because the engine throws
a plain InvalidDataException. Any other InvalidDataException, such as a
sidecar that belongs to another sequence, still reads as a file error.
- Archive.Trash.List, Tooltips.Archive.Trash and Tooltips.Archive.TrashRestore
changed meaning in English: they now cover photo entries as well as
sequences. They are removed from the 36 cultures other than en and it, so
those cultures fall back to English and `i18n check` lists the keys as
untranslated instead of showing the old sequence-only wording.
- The XAML comments describe what the trash dialog and its error line show
now.
Tests: the dialog restores a photo entry and a sequence entry and checks
which rows are left. A photo entry with one tampered file shows the
KeptFiles sentence and keeps its row. An entry with every file tampered
shows the TrashMismatch sentence.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 2524a11445c87d37625b01095ef7c2a84a2ee422)
Owner review 2, R6: the web panel manages the library without editing it, so
the engine and the server must delete single photos safely, keep them out of
sync afterwards, and let an administrator restore or finally erase the trash.
- Migration 0008: frame_removals (tombstones by sequence and SHA-256, reason,
replacement); the sidecar gains "removed" (omitted when empty) and frames a
reserved "source"; the indexer writes the tombstones on every sync, so a
rebuild keeps them, and drops a hero frame that is gone.
- FrameTrash: dry run (busy, frames changed, offline, would empty), delete under
the sequence lease with a write-ahead journal that the next writer undoes
after a crash, files to trash/photos/<seq>-<time>/originals with a record,
sidecar without the frames plus tombstones, index sync clearing analyses,
thumbnails and proxies, proxies renamed to follow their frames, follow-up
jobs. Restore re-hashes every file, keeps mismatches in the trash, puts the
same frame records back and drops their tombstones, or files the photos into
a new sequence through the ingest when theirs is gone.
- Project positions on vanished photos are translated by photo and wait as
pending frames, so they come back with a restore.
- Trash entries have a kind (sequence, photos, replaced); emptying is a dry run
with a fingerprint and a new EmptyTrash job (18) that erases exactly the
planned entries, refuses a stale plan and erases replaced originals only
while their replacements still hash right.
- Sync honours tombstones: nothing one side deleted is offered back, local
files are never deleted, replaced photos count as their replacement; the
server answers an upload of a tombstoned SHA-256 as already there.
- Server: sequence thumbnail, photo delete, bulk delete/retag/jobs, trash
list/restore/empty endpoints with their error messages; a verify of
sequences now targets their archive (POST /jobs failed before).
- Desktop trash dialog lists photo entries and empties the trash after a
typed confirmation through the same job.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 35bb56690a1d69eae57153d036e1409201cd73f7)