From f5117f4593f62b086e6af1809331c5d3580af73c Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 23 Mar 2023 14:28:05 +0100
Subject: [PATCH] celaction: fixes after testing

---
 .../hosts/celaction/hooks/pre_celaction_setup.py | 16 +++++++++-------
 .../plugins/publish/submit_celaction_deadline.py |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/openpype/hosts/celaction/hooks/pre_celaction_setup.py b/openpype/hosts/celaction/hooks/pre_celaction_setup.py
index c7e8bc5d0c..96e784875c 100644
--- a/openpype/hosts/celaction/hooks/pre_celaction_setup.py
+++ b/openpype/hosts/celaction/hooks/pre_celaction_setup.py
@@ -58,17 +58,17 @@ class CelactionPrelaunchHook(PreLaunchHook):
         # Add custom parameters from workfile settings
         if "render_chunk" in workfile_settings["submission_overrides"]:
             parameters += [
-                "--chunk *CHUNK*"
+                "--chunk", "*CHUNK*"
            ]
-        elif "resolution" in workfile_settings["submission_overrides"]:
+        if "resolution" in workfile_settings["submission_overrides"]:
             parameters += [
-                "--resolutionWidth *X*",
-                "--resolutionHeight *Y*"
+                "--resolutionWidth", "*X*",
+                "--resolutionHeight", "*Y*"
             ]
-        elif "frame_range" in workfile_settings["submission_overrides"]:
+        if "frame_range" in workfile_settings["submission_overrides"]:
             parameters += [
-                "--frameStart *START*",
-                "--frameEnd *END*"
+                "--frameStart", "*START*",
+                "--frameEnd", "*END*"
             ]
 
         winreg.SetValueEx(
@@ -76,6 +76,8 @@ class CelactionPrelaunchHook(PreLaunchHook):
             subprocess.list2cmdline(parameters)
         )
 
+        self.log.debug(f"__ parameters: \"{parameters}\"")
+
         # setting resolution parameters
         path_submit = "\\".join([
             path_user_settings, "Dialogs", "SubmitOutput"
diff --git a/openpype/modules/deadline/plugins/publish/submit_celaction_deadline.py b/openpype/modules/deadline/plugins/publish/submit_celaction_deadline.py
index 038ee4fc03..bcf0850768 100644
--- a/openpype/modules/deadline/plugins/publish/submit_celaction_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_celaction_deadline.py
@@ -106,7 +106,7 @@ class CelactionSubmitDeadline(pyblish.api.InstancePlugin):
 
         # define chunk and priority
         chunk_size = instance.context.data.get("chunk")
-        if chunk_size == 0:
+        if not chunk_size:
             chunk_size = self.deadline_chunk_size
 
         # search for %02d pattern in name, and padding number