fix(worker): parse Blender 5.x output so rendered frames are counted
Deploy / deploy (push) Successful in 3m28s
Deploy / deploy (push) Successful in 3m28s
Blender 5 logs through CLOG, prefixing every line with elapsed time and a
category ("00:02.954 render | Saved: '...'"), and reports errors as
"ERROR ..." instead of "Error: ...". The parser anchored on "Saved:" at the
start of the line, so it counted no frames from a render that wrote all of
them and the job failed as "saved no frames". Progress (Fra:) and error
detection were dead on 5.x for the same reason.
The prefix is now stripped before matching; 4.x output parses as before.
Warnings no longer count as errors: add-ons print them on every launch and
one would otherwise be reported as the reason a render failed. A run that
saves nothing now reports Blender's own error when there is one.
Verified on the real DH2 test.blend under Blender 5.2: the 1.6.2 parser
counts 0 of 3 saved frames, this one counts 3.
Bump worker to 1.6.3.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -73,6 +73,46 @@ public class BlenderProgressParserTests
|
||||
Assert.Equal(1002, frames[^1]);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Blender 5.x prefixes every line with elapsed time and a log category.
|
||||
/// Anchored on "Saved:", the parser counted no frames from a render that
|
||||
/// wrote every one, and the job failed as "saved no frames".
|
||||
/// These lines are verbatim Blender 5.2 output.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public void ParsesBlender5PrefixedOutput()
|
||||
{
|
||||
Assert.Equal(@"X:\renders\frame_0001.png",
|
||||
BlenderProgressParser.ParseSaved(@"00:02.954 render | Saved: 'X:\renders\frame_0001.png'"));
|
||||
Assert.Equal(1, BlenderProgressParser.ParseFrame("00:02.469 render | Fra: 1 | Mem: 0M | Synchronizing object | Cube"));
|
||||
Assert.Null(BlenderProgressParser.ParseSaved("00:02.954 render | Time: 00:00.87 (Saving: 00:00.14)"));
|
||||
Assert.Null(BlenderProgressParser.ParseFrame("00:02.079 render | Rendering frame 1"));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RecognisesBlender5Errors()
|
||||
{
|
||||
const string unwritable = @"00:03.063 reports | ERROR Render error (No such file or directory) cannot save: 'Q:\out\f_0001.png'";
|
||||
Assert.True(BlenderProgressParser.IsErrorLine(unwritable));
|
||||
Assert.True(BlenderProgressParser.IsNonRetryableError(unwritable));
|
||||
|
||||
const string missing = @"00:13.250 reports | ERROR Cannot read file ""X:\gone.blend"": No such file or directory";
|
||||
Assert.True(BlenderProgressParser.IsErrorLine(missing));
|
||||
Assert.True(BlenderProgressParser.IsNonRetryableError(missing));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Add-ons print warnings on every launch; one must never become the
|
||||
/// reported reason a render failed.
|
||||
/// </summary>
|
||||
[Theory]
|
||||
[InlineData("Warning: add-on missing 'bl_info', this can cause poor performance!: 'G:\\addons\\x\\__init__.py'")]
|
||||
[InlineData("00:01.000 addon | WARNING something harmless")]
|
||||
public void WarningsAreNotErrors(string line)
|
||||
{
|
||||
Assert.False(BlenderProgressParser.IsErrorLine(line));
|
||||
}
|
||||
|
||||
/// <summary>Mirrors BlenderRunner.PumpAsync: CR and LF both end a line.</summary>
|
||||
private static List<string> SplitLikeThePump(string text)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user