Owner review 2, phase 5a (R8): editing moves out of the library into a workspace on a fast disk, and a sequence gets several projects, each with a linear version history pushed and pulled like git. - Core: ProjectSettings keeps members a newer Chronos wrote (Extra) and reads a newer settings format read-only; ProjectContent is the portable form of a version (every frame position parked by photo, canonical text, SHA-256 content hash); ProjectBundle format 2 adds the workspace section, and a file without it is still written as format 1. JobKind.WorkspaceCopy = 20 (19 kept for Convert). - Data: migration 0009 (projects, project_versions, the render's project columns); ProjectService on ArchiveService.Projects keeps projects as sidecars first (.chronos/projects/<id>/), then the index, under the sequence lease: create, rename, delete into the projects' trash, history, push with fast-forward, idempotent repeat, divergence and hash checks. Main is made from the sequence's settings and mirrored both ways, so every older code path keeps working; outside writes become "external" versions, a mirror a crash cut short is completed or merged. Full scans and rebuilds take the projects back from their sidecars. - ProjectMerge moves from the App to Data/Projects, merges pending frames photo by photo and replays unpushed commits on a moved head. - Workspaces: WorkspaceStore, WorkspaceSync (checkout, save, commit, push, pull with replay and merge, conflicts settled by keep mine / take server / save both, restore, status) and the WorkspaceCopy job (proxies copied hash-verified and resumable; originals refused until phase 5c). - Renders of a project version place its positions on the frames and record the project and version. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit c4c1802884e403db8759ed0501f770a67a047f20)
93 lines
4.7 KiB
C#
93 lines
4.7 KiB
C#
using Chronos.Data.Projects;
|
|
using System.IO;
|
|
using Chronos.App.Editor;
|
|
using Chronos.Core.Project;
|
|
using Chronos.Testing;
|
|
|
|
namespace Chronos.App.Tests.Editor;
|
|
|
|
/// <summary>"Save both" copies of this PC's settings: listed newest first and restored as one undoable step.</summary>
|
|
public sealed class SavedCopiesTests(TestContext context)
|
|
{
|
|
[Test]
|
|
public void CopiesAreListedNewestFirst()
|
|
{
|
|
var meta = context.CreateTempDirectory("meta");
|
|
File.WriteAllText(Path.Combine(meta, "project.this-pc-20261001-090000.json"), new ProjectSettings().ToJson());
|
|
File.WriteAllText(Path.Combine(meta, "project.this-pc-20261003-142200.json"), new ProjectSettings().ToJson());
|
|
File.WriteAllText(Path.Combine(meta, "project.json"), new ProjectSettings().ToJson());
|
|
File.WriteAllText(Path.Combine(meta, "analysis.json"), "{}");
|
|
|
|
var copies = SavedCopies.List(meta);
|
|
Assert.SequenceEqual([new DateTime(2026, 10, 3, 14, 22, 0), new DateTime(2026, 10, 1, 9, 0, 0)], copies.Select(c => c.SavedAt));
|
|
Assert.Empty(SavedCopies.List(Path.Combine(meta, "missing")));
|
|
}
|
|
|
|
[Test]
|
|
public void AnUnreadableCopyIsReported()
|
|
{
|
|
var meta = context.CreateTempDirectory("meta");
|
|
var path = Path.Combine(meta, "project.this-pc-20261003-142200.json");
|
|
File.WriteAllText(path, "{ not json");
|
|
Assert.Throws<InvalidDataException>(() => SavedCopies.Read(new SavedCopy(path, DateTime.Now)));
|
|
Assert.Throws<InvalidDataException>(() => SavedCopies.Read(new SavedCopy(Path.Combine(meta, "gone.json"), DateTime.Now)));
|
|
}
|
|
|
|
[Test]
|
|
public async Task RestoringACopyIsOneUndoableStep()
|
|
{
|
|
var meta = context.CreateTempDirectory("meta");
|
|
var kept = new ProjectSettings { HeroFrame = 7, Exposure = new ExposureSettings { ExposureOffsetEv = -0.3 } };
|
|
var path = Path.Combine(meta, "project.this-pc-20261003-142200.json");
|
|
File.WriteAllText(path, kept.ToJson());
|
|
var copy = Assert.Contains(SavedCopies.List(meta), _ => true);
|
|
|
|
var content = EditorFixture.Content(EditorFixture.Sunset) with { SavedCopies = [copy] };
|
|
var source = new FakeSequenceSource(EditorFixture.Sunset, content);
|
|
await using var session = new EditorSession(source, content, [], TimeSpan.FromMilliseconds(20));
|
|
var before = session.Project;
|
|
session.Edit(p => p with { Exposure = p.Exposure with { ExposureOffsetEv = 0.6 } });
|
|
var edited = session.Project;
|
|
|
|
Assert.NotNull(await session.RestoreAsync(copy));
|
|
Assert.True(ProjectMerge.SameValues(kept, session.Project));
|
|
Assert.Null(await session.RestoreAsync(copy), "the same values again change nothing");
|
|
await session.FlushAsync();
|
|
Assert.True(ProjectMerge.SameValues(kept, source.Stored), "the restored project is saved");
|
|
|
|
Assert.True(session.Undo());
|
|
Assert.True(ProjectMerge.SameValues(edited, session.Project), "undo brings back the project before the restore");
|
|
Assert.True(session.Undo());
|
|
Assert.True(ProjectMerge.SameValues(before, session.Project));
|
|
}
|
|
|
|
[Test]
|
|
public async Task TheUndoOfARestoreTakesBackOnlyTheRestore()
|
|
{
|
|
var meta = context.CreateTempDirectory("meta");
|
|
var path = Path.Combine(meta, "project.this-pc-20261003-142200.json");
|
|
File.WriteAllText(path, new ProjectSettings { Exposure = new ExposureSettings { ExposureOffsetEv = -0.3 } }.ToJson());
|
|
var copy = Assert.Contains(SavedCopies.List(meta), _ => true);
|
|
var content = EditorFixture.Content(EditorFixture.Sunset);
|
|
await using var session = new EditorSession(new FakeSequenceSource(EditorFixture.Sunset, content), content, [], TimeSpan.FromMilliseconds(20));
|
|
session.Edit(p => p with { HeroFrame = 4 });
|
|
var before = session.Project;
|
|
|
|
var restore = Assert.NotNull(await session.RestoreAsync(copy));
|
|
Assert.True(restore.CanUndo);
|
|
Assert.True(restore.Undo());
|
|
Assert.True(ProjectMerge.SameValues(before, session.Project), "the project from before the restore");
|
|
Assert.False(restore.CanUndo, "taken back once");
|
|
Assert.True(session.Undo(), "the undo of the restore is a step of its own");
|
|
Assert.Equal(-0.3, session.Project.Exposure.ExposureOffsetEv);
|
|
|
|
// An edit after the restore: its Undo would take that edit back, so it no longer applies.
|
|
session.Edit(p => p with { HeroFrame = 5 });
|
|
restore = Assert.NotNull(await session.RestoreAsync(copy));
|
|
session.Edit(p => p with { Exposure = p.Exposure with { ExposureOffsetEv = 0.9 } });
|
|
Assert.False(restore.CanUndo);
|
|
Assert.False(restore.Undo());
|
|
Assert.Equal(0.9, session.Project.Exposure.ExposureOffsetEv);
|
|
}
|
|
}
|