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
@@ -45,6 +45,23 @@ public sealed class RenderRepository
|
||||
return true;
|
||||
}, cancellationToken);
|
||||
|
||||
/// <summary>
|
||||
/// Rewrites the output paths of a sequence's renders after its folder moved (Reorganize): an export inside the folder
|
||||
/// moved with it. Outputs elsewhere (absolute paths, other folders of the archive) stay as they are.
|
||||
/// </summary>
|
||||
/// <remarks>Only paths still under <paramref name="oldFolder"/> change, so repeating it after a crash is harmless.</remarks>
|
||||
public Task<int> RebaseFolderAsync(Guid sequenceId, string oldFolder, string newFolder, CancellationToken cancellationToken = default)
|
||||
{
|
||||
// The archive root never moves, and its prefix ("/") would match absolute paths outside the archive.
|
||||
if (oldFolder.Length == 0) return Task.FromResult(0);
|
||||
// substr counts characters (code points) on both dialects; the tail starts with the '/' after the folder.
|
||||
var prefix = oldFolder + "/";
|
||||
var length = prefix.EnumerateRunes().Count();
|
||||
return _db.ExecuteAsync(
|
||||
"UPDATE renders SET output_path = $2 || substr(output_path, $3) WHERE sequence_id = $1 AND substr(output_path, 1, $4) = $5",
|
||||
[sequenceId, newFolder, length, length, prefix], cancellationToken);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Serialises render changes per sequence on PostgreSQL, so the recount (a new statement, hence a new snapshot)
|
||||
/// sees every committed render; SQLite's write lock already does this.
|
||||
|
||||
Reference in new issue
Block a user