Error handling around the batch file

Signed-off-by: Alex Hughes <[email protected]>
aws-deadline · Dec 11, 2024 · b67edc5 · b67edc5
1 parent 38e8303
commit b67edc5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/src/deadline/ae_submitter/Imports.jsx b/src/deadline/ae_submitter/Imports.jsx
@@ -12,6 +12,8 @@
 
 #include "data/InitData.jsx"
 
+#include "data/RenderScript.jsx"
+
 #include "submission/AssetReferenceTemplate.jsx"
 
 #include "submission/DataTemplate.jsx"

diff --git a/src/deadline/ae_submitter/UI/SubmitButton.jsx b/src/deadline/ae_submitter/UI/SubmitButton.jsx
@@ -82,15 +82,9 @@ function __generateSubmitButton() {
         stepsTemplate[0].name = itemName;
         stepsTemplate[0].parameterSpace.taskParameterDefinitions[0].range = "{{Param." + itemName + "_FrameStart}} - {{Param." + itemName + "_FrameEnd}} : {{Param." + itemName + "_ChunkSize}}";
         stepsTemplate[0].parameterSpace.taskParameterDefinitions[1].range = "{{Param." + itemName + "_FrameStartPlusChunkSizeMinusOne}}-{{Param." + itemName + "_FrameEndMinusOne}}:{{Param." + itemName + "_ChunkSize}},{{Param." + itemName + "_FrameEnd}}";
-        if(itemName != compNameToCheck)
-        {
-            stepsTemplate[0].script.embeddedFiles[0].data = "\"%AFTEREFFECTS_ADAPTOR_AERENDER_EXECUTABLE%\" -project \"{{Param.AfterEffectsProjectFile}}\" -comp \"{{Param." + itemName + "_CompName}}\" -s {{Task.Param.FrameChunkStart}} -e {{Task.Param.FrameChunkEnd}} || exit /b 1 \n"
-            // stepsTemplate[0].taskParameterDefinitions[2].range = ["{{Param." + compNameToCheck + "_CompName}}"];
-        }
-        else {
-            stepsTemplate[0].script.embeddedFiles[0].data = "\"%AFTEREFFECTS_ADAPTOR_AERENDER_EXECUTABLE%\" -project \"{{Param.AfterEffectsProjectFile}}\" -comp \"{{Param." + itemName + "_CompName}}\" -s {{Task.Param.FrameChunkStart}} -e {{Task.Param.FrameChunkEnd}} || exit /b 1 \n"
-            // stepsTemplate[0].taskParameterDefinitions[2].range = ["{{Param." + itemName + "_CompName}}"];
-        }
+
+        stepsTemplate[0].script.embeddedFiles[0].data = dcRenderScript.generateRenderCommand("{{Param." + itemName + "_CompName}}")
+
         basicTemplate.steps[stepID-1] = stepsTemplate[0]; 
         // logger.debug("[generateStep] basicTemplate: " + JSON.stringify(basicTemplate), _submitButtonFileName);
         return basicTemplate;

diff --git a/src/deadline/ae_submitter/data/RenderScript.jsx b/src/deadline/ae_submitter/data/RenderScript.jsx
@@ -16,4 +16,4 @@ function __generateRenderScriptTemplate(compParameterName) {
 
 dcRenderScript = {
     "generateRenderCommand": __generateRenderScriptTemplate,
-};
+};
diff --git a/src/deadline/ae_submitter/submission/JobTemplate.jsx b/src/deadline/ae_submitter/submission/JobTemplate.jsx
@@ -177,7 +177,17 @@ var OPENJD_TEMPLATE = {
                 "filename": "aerender.bat",
                 "type": "TEXT",
                 "runnable": true,
-                "data": "\"%AFTEREFFECTS_ADAPTOR_AERENDER_EXECUTABLE%\" -project \"{{Param.AfterEffectsProjectFile}}\" -comp \"{{Task.Param.Comp}}\" -s {{Task.Param.FrameChunkStart}} -e {{Task.Param.FrameChunkEnd}} || exit /b 1 \n"
+                "data": "@ECHO OFF\n" +
+                    "IF \"%AFTEREFFECTS_ADAPTOR_AERENDER_EXECUTABLE%\" == \"\" (\n" +
+                    "  set AFTEREFFECTS_ADAPTOR_AERENDER_EXECUTABLE=aerender.exe\n" +
+                    ")\n" +
+                    "\n" +
+                    "\"%AFTEREFFECTS_ADAPTOR_AERENDER_EXECUTABLE%\" -project \"{{Param.AfterEffectsProjectFile}}\" -comp \"{{Task.Param.Comp}}\" -s {{Task.Param.FrameChunkStart}} -e {{Task.Param.FrameChunkEnd}}\n" +
+                    "IF %ERRORLEVEL% NEQ 0 (\n" +
+                    " echo \"Return code: %ERRORLEVEL%\"\n" +
+                    " exit %ERRORLEVEL%\n" +
+                    ")\n" +
+                    "exit 0\n",
             }
             ]
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ function __generateRenderScriptTemplate(compParameterName) { @@
     dcRenderScript = {
         "generateRenderCommand": __generateRenderScriptTemplate,
-    };
+    };