From 4da6f25b47f09ee0ef85dbabcd46b960c1d78823 Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Fri, 9 Feb 2024 11:02:59 +0200
Subject: [PATCH] rearrange deadline settings

---
 .../server/settings/publish_plugins.py        | 160 +++++++++---------
 server_addon/deadline/server/version.py       |   2 +-
 2 files changed, 82 insertions(+), 80 deletions(-)

diff --git a/server_addon/deadline/server/settings/publish_plugins.py b/server_addon/deadline/server/settings/publish_plugins.py
index 8abe59674b..3f5ac3108d 100644
--- a/server_addon/deadline/server/settings/publish_plugins.py
+++ b/server_addon/deadline/server/settings/publish_plugins.py
@@ -306,36 +306,38 @@ class PublishPluginsModel(BaseSettingsModel):
         default_factory=ValidateExpectedFilesModel,
         title="Validate Expected Files"
     )
-    MayaSubmitDeadline: MayaSubmitDeadlineModel = SettingsField(
-        default_factory=MayaSubmitDeadlineModel,
-        title="Maya Submit to deadline")
-    MaxSubmitDeadline: MaxSubmitDeadlineModel = SettingsField(
-        default_factory=MaxSubmitDeadlineModel,
-        title="Max Submit to deadline")
-    FusionSubmitDeadline: FusionSubmitDeadlineModel = SettingsField(
-        default_factory=FusionSubmitDeadlineModel,
-        title="Fusion submit to Deadline")
-    NukeSubmitDeadline: NukeSubmitDeadlineModel = SettingsField(
-        default_factory=NukeSubmitDeadlineModel,
-        title="Nuke Submit to deadline")
-    HarmonySubmitDeadline: HarmonySubmitDeadlineModel = SettingsField(
-        default_factory=HarmonySubmitDeadlineModel,
-        title="Harmony Submit to deadline")
     AfterEffectsSubmitDeadline: AfterEffectsSubmitDeadlineModel = (
         SettingsField(
             default_factory=AfterEffectsSubmitDeadlineModel,
-            title="After Effects to deadline"
+            title="After Effects to deadline",
+            section="Hosts"
         )
     )
-    CelactionSubmitDeadline: CelactionSubmitDeadlineModel = SettingsField(
-        default_factory=CelactionSubmitDeadlineModel,
-        title="Celaction Submit Deadline")
     BlenderSubmitDeadline: BlenderSubmitDeadlineModel = SettingsField(
         default_factory=BlenderSubmitDeadlineModel,
         title="Blender Submit Deadline")
+    CelactionSubmitDeadline: CelactionSubmitDeadlineModel = SettingsField(
+        default_factory=CelactionSubmitDeadlineModel,
+        title="Celaction Submit Deadline")
+    FusionSubmitDeadline: FusionSubmitDeadlineModel = SettingsField(
+        default_factory=FusionSubmitDeadlineModel,
+        title="Fusion submit to Deadline")
+    HarmonySubmitDeadline: HarmonySubmitDeadlineModel = SettingsField(
+        default_factory=HarmonySubmitDeadlineModel,
+        title="Harmony Submit to deadline")
+    MaxSubmitDeadline: MaxSubmitDeadlineModel = SettingsField(
+        default_factory=MaxSubmitDeadlineModel,
+        title="Max Submit to deadline")
+    MayaSubmitDeadline: MayaSubmitDeadlineModel = SettingsField(
+        default_factory=MayaSubmitDeadlineModel,
+        title="Maya Submit to deadline")
+    NukeSubmitDeadline: NukeSubmitDeadlineModel = SettingsField(
+        default_factory=NukeSubmitDeadlineModel,
+        title="Nuke Submit to deadline")
     ProcessSubmittedCacheJobOnFarm: ProcessCacheJobFarmModel = SettingsField(
         default_factory=ProcessCacheJobFarmModel,
-        title="Process submitted cache Job on farm.")
+        title="Process submitted cache Job on farm.",
+            section="Publish Jobs")
     ProcessSubmittedJobOnFarm: ProcessSubmittedJobOnFarmModel = SettingsField(
         default_factory=ProcessSubmittedJobOnFarmModel,
         title="Process submitted job on farm.")
@@ -357,6 +359,65 @@ DEFAULT_DEADLINE_PLUGINS_SETTINGS = {
             "deadline"
         ]
     },
+    "AfterEffectsSubmitDeadline": {
+        "enabled": True,
+        "optional": False,
+        "active": True,
+        "use_published": True,
+        "priority": 50,
+        "chunk_size": 10000,
+        "group": "",
+        "department": "",
+        "multiprocess": True
+    },
+    "BlenderSubmitDeadline": {
+        "enabled": True,
+        "optional": False,
+        "active": True,
+        "use_published": True,
+        "priority": 50,
+        "chunk_size": 10,
+        "group": "none",
+        "job_delay": "00:00:00:00"
+    },
+    "CelactionSubmitDeadline": {
+        "enabled": True,
+        "deadline_department": "",
+        "deadline_priority": 50,
+        "deadline_pool": "",
+        "deadline_pool_secondary": "",
+        "deadline_group": "",
+        "deadline_chunk_size": 10,
+        "deadline_job_delay": "00:00:00:00"
+    },
+    "FusionSubmitDeadline": {
+        "enabled": True,
+        "optional": False,
+        "active": True,
+        "priority": 50,
+        "chunk_size": 10,
+        "concurrent_tasks": 1,
+        "group": ""
+    },
+    "HarmonySubmitDeadline": {
+        "enabled": True,
+        "optional": False,
+        "active": True,
+        "use_published": True,
+        "priority": 50,
+        "chunk_size": 10000,
+        "group": "",
+        "department": ""
+    },
+    "MaxSubmitDeadline": {
+        "enabled": True,
+        "optional": False,
+        "active": True,
+        "use_published": True,
+        "priority": 50,
+        "chunk_size": 10,
+        "group": "none"
+    },
     "MayaSubmitDeadline": {
         "enabled": True,
         "optional": False,
@@ -376,24 +437,6 @@ DEFAULT_DEADLINE_PLUGINS_SETTINGS = {
         "pluginInfo": "",
         "scene_patches": []
     },
-    "MaxSubmitDeadline": {
-        "enabled": True,
-        "optional": False,
-        "active": True,
-        "use_published": True,
-        "priority": 50,
-        "chunk_size": 10,
-        "group": "none"
-    },
-    "FusionSubmitDeadline": {
-        "enabled": True,
-        "optional": False,
-        "active": True,
-        "priority": 50,
-        "chunk_size": 10,
-        "concurrent_tasks": 1,
-        "group": ""
-    },
     "NukeSubmitDeadline": {
         "enabled": True,
         "optional": False,
@@ -410,47 +453,6 @@ DEFAULT_DEADLINE_PLUGINS_SETTINGS = {
         "env_search_replace_values": [],
         "limit_groups": []
     },
-    "HarmonySubmitDeadline": {
-        "enabled": True,
-        "optional": False,
-        "active": True,
-        "use_published": True,
-        "priority": 50,
-        "chunk_size": 10000,
-        "group": "",
-        "department": ""
-    },
-    "AfterEffectsSubmitDeadline": {
-        "enabled": True,
-        "optional": False,
-        "active": True,
-        "use_published": True,
-        "priority": 50,
-        "chunk_size": 10000,
-        "group": "",
-        "department": "",
-        "multiprocess": True
-    },
-    "CelactionSubmitDeadline": {
-        "enabled": True,
-        "deadline_department": "",
-        "deadline_priority": 50,
-        "deadline_pool": "",
-        "deadline_pool_secondary": "",
-        "deadline_group": "",
-        "deadline_chunk_size": 10,
-        "deadline_job_delay": "00:00:00:00"
-    },
-    "BlenderSubmitDeadline": {
-        "enabled": True,
-        "optional": False,
-        "active": True,
-        "use_published": True,
-        "priority": 50,
-        "chunk_size": 10,
-        "group": "none",
-        "job_delay": "00:00:00:00"
-    },
     "ProcessSubmittedCacheJobOnFarm": {
         "enabled": True,
         "deadline_department": "",
diff --git a/server_addon/deadline/server/version.py b/server_addon/deadline/server/version.py
index 9cb17e7976..c11f861afb 100644
--- a/server_addon/deadline/server/version.py
+++ b/server_addon/deadline/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.8"
+__version__ = "0.1.9"