fix(archive): exports follow a Reorganize folder move; writers resolve the folder under the lease
A Reorganize step that moves a sequence folder carries its exports/ with it, but only the sequences and frames rows followed: renders.output_path kept naming the old folder, so the server answered 404 for the export, Get/Send exports and Reveal lost it, and no scan or trash restore could repair it. RenderRepository.RebaseFolderAsync now rewrites the archive-relative output paths of the step's sequence in the same transaction as the frames (idempotent on resume; absolute outputs and the archive root are untouched). Writers that read a sequence row before taking its lease wrote into the folder a Reorganize had moved meanwhile, creating it again (project.json from the editor or a sync, a thumbnail pack) or failing on its missing sidecar. They now take the folder from the index row read under the lease (SequenceWriter.FolderAsync): the editor's save refuses with FramesChangedException and reloads at the new folder, FramesCurrentAsync reports a moved folder, and the sync apply, project store, thumbnail pass and its status, decode tiers, analyses, verify, info edits, ingest, duplicate flags, pack compaction and photo restores write where the sequence is now; a photo deletion planned before the move is refused as stale. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit be28d8acf0d96012c94a266f8af61e9bbafaa28d)
This commit is contained in:
1 parent
b253cac8d4
commit
9ce201cd70
22 files changed
+343
-35
No files matched your search
@@ -734,12 +734,13 @@ public sealed class SyncService
|
||||
?? throw new InvalidDataException($"Archive {local.ArchiveId} is not indexed.");
|
||||
var paths = new ArchivePaths(archive.RootPath);
|
||||
ArchiveVolume.EnsureWritable(paths);
|
||||
var folder = paths.Sequence(local.Folder);
|
||||
await using (await _writer.LockAsync(paths, local.Id, cancellationToken).ConfigureAwait(false))
|
||||
{
|
||||
// The frames cannot change under the lease: the positions are moved to them as they are now.
|
||||
if (await positions.ToLocalAsync(payload.SettingsJson, local.SettingsVersion, cancellationToken).ConfigureAwait(false) is not { } current) return null;
|
||||
var row = current.Local;
|
||||
// The folder too: a Reorganize moves it and its row under this lease.
|
||||
var folder = paths.Sequence(row.Folder);
|
||||
payload = payload with { SettingsJson = current.SettingsJson };
|
||||
var metadata = !payload.SameMetadata(SyncPayload.Of(row));
|
||||
var settings = !SyncRules.SameSettings(payload.SettingsJson, row.SettingsJson);
|
||||
|
||||
Reference in new issue
Block a user