From a4247f7a358da8947b21008e4909a507fd39ed77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 25 Jan 2022 18:25:15 +0100 Subject: [PATCH] Allow authoring task type & assign a default priority --- internal/manager/job_compilers/author.go | 6 +++++- .../manager/job_compilers/scripts/simple_blender_render.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/manager/job_compilers/author.go b/internal/manager/job_compilers/author.go index 0de186f5..97e51702 100644 --- a/internal/manager/job_compilers/author.go +++ b/internal/manager/job_compilers/author.go @@ -53,6 +53,8 @@ type JobMetadata map[string]string type AuthoredTask struct { Name string + Type string + Priority int Commands []AuthoredCommand // Dependencies are tasks that need to be completed before this one can run. @@ -64,9 +66,11 @@ type AuthoredCommand struct { Parameters map[string]string } -func (a *Author) Task(name string) (*AuthoredTask, error) { +func (a *Author) Task(name string, taskType string) (*AuthoredTask, error) { at := AuthoredTask{ name, + taskType, + 50, // TODO: handle default priority somehow. make([]AuthoredCommand, 0), make([]*AuthoredTask, 0), } diff --git a/internal/manager/job_compilers/scripts/simple_blender_render.js b/internal/manager/job_compilers/scripts/simple_blender_render.js index 3c118b4f..bc4d4ece 100644 --- a/internal/manager/job_compilers/scripts/simple_blender_render.js +++ b/internal/manager/job_compilers/scripts/simple_blender_render.js @@ -89,7 +89,7 @@ function authorRenderTasks(settings, renderDir, renderOutput) { let renderTasks = []; let chunks = frameChunker(settings.frames, settings.chunk_size); for (let chunk of chunks) { - const task = author.Task(`render-${chunk}`); + const task = author.Task(`render-${chunk}`, "blender"); const command = author.Command("blender-render", { cmd: settings.blender_cmd, filepath: settings.filepath,