feat: owner review 2 phase 5c: originals, local render, clean-up and the workspace settings (#18)
CI / Build and test (push) Successful in 9m26s
CI / Windows tests and installer (push) Skipped
CI / YAML check (push) Successful in 8s
Release / Build, test and publish (push) Successful in 14m31s
CI / PostgreSQL 16 integration (push) Successful in 9m53s
CI / PostgreSQL 17 integration (push) Successful in 9m22s
CI / Docker image (push) Successful in 44s
Release / Server image (push) Successful in 1m36s
CI / Build and test (push) Successful in 9m26s
CI / Windows tests and installer (push) Skipped
CI / YAML check (push) Successful in 8s
Release / Build, test and publish (push) Successful in 14m31s
CI / PostgreSQL 16 integration (push) Successful in 9m53s
CI / PostgreSQL 17 integration (push) Successful in 9m22s
CI / Docker image (push) Successful in 44s
Release / Server image (push) Successful in 1m36s
Originals in the workspace, local render and send home with provenance, the workspace clean-up, size limit and trash, moving the workspace folder, and the complete Settings › Workspace page (owner review 2, R8, phase 5c). One adversarial review round (35 findings, 32 fixed), a copy-cancel race fixed, 184 strings in all 38 languages. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Alberto Balbo <alberto.balbo.96@gmail.com>
This commit was merged in pull request #18.
This commit is contained in:
1 parent
81c303f484
commit
db389a54f2
364 files changed
+17417
-595
No files matched your search
@@ -184,6 +184,36 @@ public sealed class ServerWorkspaceTests(TestContext context)
|
||||
static int Downloaded(WorkspaceMedia media, Range frames) => media.Frames.Take(frames).Count(f => f.FileKind == "proxy");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task ACopyFromTheServerWaitsWhileTheConnectionIsMetered()
|
||||
{
|
||||
await using var server = await TestServer.StartAsync(context, services: ArchiveModule.Register);
|
||||
var (_, _, token) = await server.UserAsync("alberto", "editor");
|
||||
var sid = await SequenceAsync(server, token, 2);
|
||||
var metered = true;
|
||||
var asked = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
await using var a = await WorkspaceClient.StartAsync(context, server, token, "PC-A", hold: () =>
|
||||
{
|
||||
var held = Volatile.Read(ref metered);
|
||||
if (held) asked.TrySetResult();
|
||||
return held;
|
||||
});
|
||||
var home = a.Home(sid);
|
||||
var main = (await home.ListAsync(context.Cancellation)).Single();
|
||||
var project = await a.Sync.CheckoutAsync(home, main.Id, cancellationToken: context.Cancellation);
|
||||
|
||||
// Held before anything is downloaded.
|
||||
var job = await a.EnqueueAsync(WorkspaceJobs.CopyFromServer(sid, Title, a.Server, a.Store.Root, main.Id));
|
||||
await asked.Task.WaitAsync(Wait, context.Cancellation);
|
||||
Assert.Equal(JobState.Running, (await a.Db.Jobs.GetAsync(job.Id, context.Cancellation))!.State);
|
||||
Assert.False(Directory.Exists(project.ProxiesDirectory) && Directory.EnumerateFiles(project.ProxiesDirectory).Any(), "nothing downloaded while metered");
|
||||
|
||||
Volatile.Write(ref metered, false);
|
||||
var done = await a.WaitAsync(job.Id, JobState.Done);
|
||||
Assert.Contains(Loc.L("Archive.Log.WorkspaceCopyHeld"), done.LogTail!);
|
||||
Assert.Equal(2, Assert.NotNull(project.ReadMedia()).Frames.Count);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task ACopyIsRefusedForAnotherHomeOrWithoutTheServer()
|
||||
{
|
||||
@@ -197,14 +227,45 @@ public sealed class ServerWorkspaceTests(TestContext context)
|
||||
// Another server's job for this project, or this server's for another sequence: refused, nothing downloaded.
|
||||
var other = await a.EnqueueAsync(WorkspaceJobs.CopyFromServer(sid, Title, "https://elsewhere:8443", a.Store.Root, main.Id));
|
||||
Assert.Equal(Loc.L("Errors.Workspace.OtherHome"), (await a.WaitAsync(other.Id, JobState.Failed)).Error);
|
||||
var originals = await a.EnqueueAsync(WorkspaceJobs.CopyFromServer(sid, Title, a.Server, a.Store.Root, main.Id, BundleMedia.Originals));
|
||||
Assert.Equal(Loc.L("Errors.Workspace.OriginalsLater"), (await a.WaitAsync(originals.Id, JobState.Failed)).Error);
|
||||
a.Connected = false;
|
||||
var signedOut = await a.EnqueueAsync(WorkspaceJobs.CopyFromServer(sid, Title, a.Server, a.Store.Root, main.Id));
|
||||
Assert.Equal(Loc.L("Errors.Sync.NotConnected"), (await a.WaitAsync(signedOut.Id, JobState.Failed)).Error);
|
||||
Assert.Null(a.Store.Find(main.Id)!.ReadMedia());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task TheOriginalsAreDownloadedCheckedAndKeptBesideTheProxies()
|
||||
{
|
||||
await using var server = await TestServer.StartAsync(context, services: ArchiveModule.Register);
|
||||
var (_, _, token) = await server.UserAsync("alberto", "editor");
|
||||
var sid = await SequenceAsync(server, token, 3);
|
||||
await using var a = await WorkspaceClient.StartAsync(context, server, token, "PC-A");
|
||||
var home = a.Home(sid);
|
||||
var main = (await home.ListAsync(context.Cancellation)).Single();
|
||||
var project = await a.Sync.CheckoutAsync(home, main.Id, BundleMedia.Originals, context.Cancellation);
|
||||
var library = Listing(a.Archive.RootPath);
|
||||
|
||||
var job = await a.EnqueueAsync(WorkspaceJobs.CopyFromServer(sid, Title, a.Server, a.Store.Root, main.Id, BundleMedia.Originals));
|
||||
job = await a.WaitAsync(job.Id, JobState.Done);
|
||||
Assert.Contains(Loc.L("Archive.Log.WorkspaceOriginalsDownloaded", Title, 3, 0, 0), job.LogTail!);
|
||||
var media = Assert.NotNull(project.ReadMedia());
|
||||
Assert.True(media.HoldsOriginals);
|
||||
Assert.Equal(BundleMedia.Originals, project.ReadBundle().Workspace!.Media.Kind);
|
||||
var manifest = await a.Client.GetManifestAsync(sid, context.Cancellation);
|
||||
foreach (var (frame, entry) in manifest.Frames.OrderBy(f => f.Index).Zip(media.Frames))
|
||||
{
|
||||
Assert.Equal(frame.Sha256.ToLowerInvariant(), entry.OriginalSha256);
|
||||
Assert.Equal(entry.OriginalSha256, Sha(project.MediaFile(Assert.NotNull(entry.Original))));
|
||||
Assert.NotNull(entry.File);
|
||||
}
|
||||
Assert.False(Directory.Exists(Path.Combine(project.OriginalsDirectory, ".staging")));
|
||||
Assert.SequenceEqual(library, Listing(a.Archive.RootPath), "this PC's library is as it was");
|
||||
|
||||
// Again: every original held is kept, hashed again.
|
||||
job = await a.WaitAsync((await a.EnqueueAsync(WorkspaceJobs.CopyFromServer(sid, Title, a.Server, a.Store.Root, main.Id, BundleMedia.Originals))).Id, JobState.Done);
|
||||
Assert.Contains(Loc.L("Archive.Log.WorkspaceOriginalsDownloaded", Title, 0, 3, 0), job.LogTail!);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task AProjectDeletedOnTheServerIsGoneAndItsCopyStays()
|
||||
{
|
||||
@@ -498,7 +559,8 @@ public sealed class ServerWorkspaceTests(TestContext context)
|
||||
/// <summary>Whether the copy job finds this PC signed in to the server.</summary>
|
||||
public bool Connected { get; set; } = true;
|
||||
|
||||
public static async Task<WorkspaceClient> StartAsync(TestContext context, TestServer server, string token, string name, HttpMessageHandler? handler = null)
|
||||
public static async Task<WorkspaceClient> StartAsync(TestContext context, TestServer server, string token, string name, HttpMessageHandler? handler = null,
|
||||
Func<bool>? hold = null)
|
||||
{
|
||||
var db = await ChronosDatabase.OpenAsync(DatabaseOptions.Sqlite(Path.Combine(context.CreateTempDirectory(name + "-db"), "chronos.db")), context.Cancellation);
|
||||
var archives = new ArchiveService(db, new ArchiveServiceOptions { Owner = name });
|
||||
@@ -506,7 +568,8 @@ public sealed class ServerWorkspaceTests(TestContext context)
|
||||
var archive = await archives.CreateAsync(context.CreateTempDirectory(name + "-archive"), "Local", cancellationToken: context.Cancellation);
|
||||
var client = new ChronosClient(server.HttpBase, new CertificatePinning([]), name, handler) { Token = token };
|
||||
WorkspaceClient? created = null;
|
||||
var engine = new JobEngine(db, WorkspaceJobs.CreateHandlers(db, archives, new Connector(client, () => created?.Connected ?? true)),
|
||||
var options = hold is null ? WorkspaceJobOptions.For(archives) : WorkspaceJobOptions.For(archives) with { HoldTransfers = hold };
|
||||
var engine = new JobEngine(db, WorkspaceJobs.CreateHandlers(db, archives, new Connector(client, () => created?.Connected ?? true), options),
|
||||
new JobEngineOptions { Workers = 1, WorkerId = name, PollInterval = TimeSpan.FromMilliseconds(50), CheckpointInterval = TimeSpan.FromMilliseconds(50) });
|
||||
await engine.StartAsync(context.Cancellation);
|
||||
var store = new WorkspaceStore(Path.Combine(context.CreateTempDirectory(name + "-ws"), "workspace"));
|
||||
|
||||
Reference in new issue
Block a user