From 0df9744f29de5e20f7de1c2c3a72fc87f6968888 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakub@orbi.tools>
Date: Fri, 30 Jul 2021 16:08:54 +0200
Subject: [PATCH] publisher: editorial plugins fixes

---
 .../plugins/publish/collect_editorial_instances.py   |  2 +-
 .../plugins/publish/collect_hierarchy.py             | 12 ++++++------
 .../plugins/publish/extract_trim_video_audio.py      |  2 +-
 .../project_settings/standalonepublisher.json        |  2 +-
 .../schema_project_standalonepublisher.json          |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
index 60a8cf48fc..3a9a7a3445 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
@@ -182,7 +182,7 @@ class CollectInstances(pyblish.api.InstancePlugin):
                 })
                 for subset, properities in self.subsets.items():
                     version = properities.get("version")
-                    if version and version == 0:
+                    if version == 0:
                         properities.pop("version")
 
                     # adding Review-able instance
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
index ba2aed4bfc..acad98d784 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
@@ -37,7 +37,7 @@ class CollectHierarchyInstance(pyblish.api.ContextPlugin):
 
         # return if any
         if entity_type:
-            return {"entityType": entity_type, "entityName": value}
+            return {"entity_type": entity_type, "entity_name": value}
 
     def rename_with_hierarchy(self, instance):
         search_text = ""
@@ -76,8 +76,8 @@ class CollectHierarchyInstance(pyblish.api.ContextPlugin):
         # add current selection context hierarchy from standalonepublisher
         for entity in reversed(visual_hierarchy):
             parents.append({
-                "entityType": entity["data"]["entityType"],
-                "entityName": entity["name"]
+                "entity_type": entity["data"]["entityType"],
+                "entity_name": entity["name"]
             })
 
         if self.shot_add_hierarchy:
@@ -98,7 +98,7 @@ class CollectHierarchyInstance(pyblish.api.ContextPlugin):
 
                 # in case SP context is set to the same folder
                 if (_index == 0) and ("folder" in parent_key) \
-                        and (parents[-1]["entityName"] == parent_filled):
+                        and (parents[-1]["entity_name"] == parent_filled):
                     self.log.debug(f" skiping : {parent_filled}")
                     continue
 
@@ -280,9 +280,9 @@ class CollectHierarchyContext(pyblish.api.ContextPlugin):
 
             for parent in reversed(parents):
                 next_dict = {}
-                parent_name = parent["entityName"]
+                parent_name = parent["entity_name"]
                 next_dict[parent_name] = {}
-                next_dict[parent_name]["entity_type"] = parent["entityType"]
+                next_dict[parent_name]["entity_type"] = parent["entity_type"]
                 next_dict[parent_name]["childs"] = actual
                 actual = next_dict
 
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/extract_trim_video_audio.py b/openpype/hosts/standalonepublisher/plugins/publish/extract_trim_video_audio.py
index eb613fa951..059ac9603c 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/extract_trim_video_audio.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/extract_trim_video_audio.py
@@ -60,7 +60,7 @@ class ExtractTrimVideoAudio(openpype.api.Extractor):
                 ]
 
             args = [
-                ffmpeg_path,
+                f"\"{ffmpeg_path}\"",
                 "-ss", str(start / fps),
                 "-i", f"\"{video_file_path}\"",
                 "-t", str(dur / fps)
diff --git a/openpype/settings/defaults/project_settings/standalonepublisher.json b/openpype/settings/defaults/project_settings/standalonepublisher.json
index 7d5cd4d8a1..50c1e34366 100644
--- a/openpype/settings/defaults/project_settings/standalonepublisher.json
+++ b/openpype/settings/defaults/project_settings/standalonepublisher.json
@@ -254,7 +254,7 @@
             },
             "shot_add_tasks": {}
         },
-        "shot_add_tasks": {
+        "CollectInstances": {
             "custom_start_frame": 0,
             "timeline_frame_start": 900000,
             "timeline_frame_offset": 0,
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_standalonepublisher.json b/openpype/settings/entities/schemas/projects_schema/schema_project_standalonepublisher.json
index 0af32c8287..37fcaac69f 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_standalonepublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_standalonepublisher.json
@@ -327,7 +327,7 @@
                 {
                     "type": "dict",
                     "collapsible": true,
-                    "key": "shot_add_tasks",
+                    "key": "CollectInstances",
                     "label": "Collect Clip Instances",
                     "is_group": true,
                     "children": [