diff --git a/src/Titano.Data/Processing/SequenceAnalyser.cs b/src/Titano.Data/Processing/SequenceAnalyser.cs index 056d01d1..241a6ea7 100644 --- a/src/Titano.Data/Processing/SequenceAnalyser.cs +++ b/src/Titano.Data/Processing/SequenceAnalyser.cs @@ -44,7 +44,6 @@ internal sealed class SequenceAnalyser(TitanoDatabase db, ProcessingOptions opti ? await AnalyseDeepAsync(frames, metadata, folder, progress, cancellationToken).ConfigureAwait(false) : ReadReport(folder, frames.Count); var context = SequenceContext.FromFrames(frames.Frames, options.AdvisorCodecs); - var warnings = Advisor.Recommend(light, report, context).Findings.Count(f => f.Severity >= FindingSeverity.Warning); bool changed, unreadable = false; try @@ -60,6 +59,9 @@ internal sealed class SequenceAnalyser(TitanoDatabase db, ProcessingOptions opti (changed, unreadable) = (false, true); } + // A deep analysis of the same sequence may have finished meanwhile: count its findings and keep its status. + report ??= ReadReport(folder, frames.Count); + var warnings = Advisor.Recommend(light, report, context).Findings.Count(f => f.Severity >= FindingSeverity.Warning); var set = SequenceStatus.AnalyzedLight | (report is null ? SequenceStatus.None : SequenceStatus.AnalyzedDeep) | (warnings > 0 ? SequenceStatus.HasWarnings : SequenceStatus.None); // Without a current report (none, or made before frames were added) the deep status no longer holds. diff --git a/tests/Titano.Server.Tests/Jobs/RenderNodeClientTests.cs b/tests/Titano.Server.Tests/Jobs/RenderNodeClientTests.cs index f5ea40c8..d4c5aaf3 100644 --- a/tests/Titano.Server.Tests/Jobs/RenderNodeClientTests.cs +++ b/tests/Titano.Server.Tests/Jobs/RenderNodeClientTests.cs @@ -86,14 +86,69 @@ public sealed class RenderNodeClientTests(TestContext context) Assert.SequenceEqual(["apng", "gif", "mjpeg"], registered.Encoders.Select(e => e.Codec).Order(StringComparer.Ordinal)); } - private static RenderNodeClient Node(TitanoClient client, string cache) => - new(client, new ProcessingOptions { Archive = new ArchiveServiceOptions { Decoder = DecoderFactory.CreateServer() } }, - new RenderNodeOptions { ClientName = "studio-pc", CacheDirectory = cache, ProgressInterval = TimeSpan.Zero }); + [Test] + public async Task AStartedNodeRegistersBeatsClaimsAndStopsCleanly() + { + await using var server = await TestServer.StartAsync(context); + var (editor, _, token) = await server.UserAsync("alberto", "editor", renderNode: true); + var sequenceId = await UploadSequenceAsync(editor, Photos()); + // A batch cannot travel back from a node: the main preset renders and the log says what did not. + var job = await CreateRenderAsync(server, editor, sequenceId, Mjpeg with { Batch = ["gif-preview"] }); - private static async Task CreateRenderAsync(TestServer server, HttpClient editor, Guid sequenceId) + using var client = new TitanoClient(server.HttpBase, new CertificatePinning([]), "studio-pc") { Token = token }; + var cache = context.CreateTempDirectory("node"); + var node = Node(client, cache, TimeSpan.FromMilliseconds(100)); + node.Start(); + var done = await JobApiTests.WaitForAsync(editor, job.Id, "done"); + var beat = (await server.Database.RenderNodes.ListAsync()).Single().LastHeartbeat; + await Task.Delay(300); + await node.DisposeAsync(); + + Assert.Greater((await server.Database.RenderNodes.ListAsync()).Single().LastHeartbeat.Ticks, beat.Ticks); + Assert.Contains(Loc.L("Export.Log.NodeBatch", Loc.L("Export.Preset.Gif")), done.LogTail); + Assert.Equal("mjpeg", (await server.Database.Renders.ListBySequenceAsync(sequenceId)).Single().Codec); + Assert.False(Directory.EnumerateFileSystemEntries(Path.Combine(cache, "jobs")).Any(), "job folder removed"); + } + + [Test] + public async Task ADownloadThatEndedBeforeItsCheckIsVerifiedNotFetchedAgain() + { + await using var server = await TestServer.StartAsync(context); + var (editor, _, token) = await server.UserAsync("alberto", "editor", renderNode: true); + var photos = Photos(); + var sequenceId = await UploadSequenceAsync(editor, photos); + await CreateRenderAsync(server, editor, sequenceId, Mjpeg); + // A crash after the last byte arrived but before the hash check left a complete part file. + var cache = context.CreateTempDirectory("node"); + var sha = Uploads.Sha(photos[0]); + var part = Path.Combine(cache, "originals", sha[..2], sha + ".jpg.part"); + Directory.CreateDirectory(Path.GetDirectoryName(part)!); + await File.WriteAllBytesAsync(part, photos[0]); + + using var client = new TitanoClient(server.HttpBase, new CertificatePinning([]), "studio-pc") { Token = token }; + await using var node = Node(client, cache); + Assert.True(await node.RunOnceAsync(context.Cancellation), "a job was claimed"); + + Assert.Count(1, await server.Database.Renders.ListBySequenceAsync(sequenceId)); + Assert.FileMissing(part); + Assert.FileExists(part[..^".part".Length]); + } + + private static RenderNodeClient Node(TitanoClient client, string cache, TimeSpan? interval = null) => + new(client, new ProcessingOptions { Archive = new ArchiveServiceOptions { Decoder = DecoderFactory.CreateServer() } }, + new RenderNodeOptions + { + ClientName = "studio-pc", + CacheDirectory = cache, + ProgressInterval = TimeSpan.Zero, + PollInterval = interval ?? TimeSpan.FromSeconds(10), + HeartbeatInterval = interval ?? TimeSpan.FromSeconds(30), + }); + + private static async Task CreateRenderAsync(TestServer server, HttpClient editor, Guid sequenceId, ExportSettings? export = null) { var sequence = (await server.Database.Sequences.GetAsync(sequenceId))!; - var request = ProcessingJobs.Render(sequence, Mjpeg, 96, 64); + var request = ProcessingJobs.Render(sequence, export ?? Mjpeg, 96, 64); return await JobApiTests.CreateAsync(editor, "render", sequenceId, request.ParametersJson); }