fix(archive): stable Reorganize folders, settle trash restores first, retranslate Reorganize

Integrating owner review 2 phase 4a (R7) onto the reviewed phase 3 code.

- RenamePlanner: a sequence already at its expanded folder, or at the " (n)" of it that
  filing or an earlier Reorganize gave it, keeps that folder (in the template's case, unless
  another sequence holds that exact name). The planner seeded its claimed folders with the
  sequence's own, so "2026-09-28 (2)" was planned to "(3)" and back to "(2)" by the next
  run; a second Reorganize with the same templates now plans nothing.
- MassRenamer: each step settles what a crash or a busy trash entry left in its sequences
  (SequenceWriter.ReadLocked) and waits, as a sequence deletion does, while a restore from
  the trash is not settled (FrameTrash.EnsureSettled), before its folder or any file name
  changes: that restore's journal names files by the names they had. Trash records keep
  restoring after a Reorganize: into the sequence where it is now, under the record's own
  name made free (_2) with its companion following.
- Jobs.Kind.Move and Admin.Job.Kind.Move now mean "Reorganize": their old "Move archive"
  translations are removed from the 36 other cultures so they are translated again.
- Tests: a second run plans nothing (planner and archive), companions found alike by the
  trash and Reorganize whatever their case, a photo deleted before a Reorganize comes back
  beside the new names, a Reorganize waits for a busy restore and settles it first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Alby96andClaude Opus 5.5 committed 2026-10-27 14:23:32 +01:00
1 parent ad72501f11
commit 950524929c
78 files changed
+183 -75

No files matched your search

+1 -1
View File
@@ -40,7 +40,7 @@ Dependencies point one way: `Core` ← `Core.Windows`, `Data`, `Protocol` ← `S
| `Render` | Render plan (timing modes), preparation pass, geometry, `RenderPipeline`, self-test suite |
| `Export` | Preset resolution, encoder selection with fallbacks, output naming |
| `Video` (+ `Mp4`, `Avi`, `Bitstream`, `Yuv`, `Managed`) | `IVideoEncoderProvider`, MP4 muxer and inspector, AVI-MJPEG, NV12/P010, managed encoders (MJPEG-AVI, GIF, APNG, image sequences) |
| `Archiving` | Archive layout and paths, sidecars (`sequence.json`, `project.json`), scanner, index snapshot, leases, thumbnail packs, verify, adopt, rename plans (`RenamePlanner`: folder, title and file templates, `RenameTemplates`, the plan's fingerprint; `FileRenames`: a sequence's new file names; `FileRenameJournal`: two-phase renames through temporary names, `.chronos/rename-files.json`; `FrameCompanions`: the XMP files that follow a photo) |
| `Archiving` | Archive layout and paths, sidecars (`sequence.json`, `project.json`), scanner, index snapshot, leases, thumbnail packs, verify, adopt, rename plans (`RenamePlanner`: folder, title and file templates, `RenameTemplates`, the plan's fingerprint; `FileRenames`: a sequence's new file names; `FileRenameJournal`: two-phase renames through temporary names, `.chronos/rename-files.json`; `FrameCompanions`: the XMP files that follow a photo, one rule for the trash and Reorganize, matched whatever their case and each folder listed once by `FrameCompanions.Index`) |
| `Import` | Card scan, session detection, import plan, hash-verified copy, card eraser (re-hash before delete) |
| `Naming` | Folder/file templates and tokens; `FrameNaming` (the naming context and unique file name of a frame, shared by import, upload and Reorganize) |
| `Model` | Domain entities and enums (§5) shared by Data, Server and clients |