From c8fe973155beb7323184ee6b31476257467b609f Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakub@orbi.tools>
Date: Tue, 13 Jul 2021 16:44:39 +0200
Subject: [PATCH] standalone: plugins prepare for settings

---
 .../publish/collect_editorial_instances.py    | 17 +++++++-----
 .../publish/collect_editorial_resources.py    | 20 ++++++++------
 .../plugins/publish/collect_hierarchy.py      | 27 ++++++++++---------
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
index 3474cbcdde..dbf2574a9d 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
@@ -17,16 +17,12 @@ class CollectInstances(pyblish.api.InstancePlugin):
         "referenceMain": {
             "family": "review",
             "families": ["clip"],
-            "extensions": [".mp4"]
+            "extensions": ["mp4"]
         },
         "audioMain": {
             "family": "audio",
             "families": ["clip"],
-            "extensions": [".wav"],
-        },
-        "shotMain": {
-            "family": "shot",
-            "families": []
+            "extensions": ["wav"],
         }
     }
     timeline_frame_start = 900000  # starndard edl default (10:00:00:00)
@@ -178,7 +174,16 @@ class CollectInstances(pyblish.api.InstancePlugin):
                         data_key: instance.data.get(data_key)})
 
                 # adding subsets to context as instances
+                self.subsets.update({
+                    "shotMain": {
+                        "family": "shot",
+                        "families": []
+                    }
+                })
                 for subset, properities in self.subsets.items():
+                    if properities["version"] == 0:
+                        properities.pop("version")
+
                     # adding Review-able instance
                     subset_instance_data = instance_data.copy()
                     subset_instance_data.update(properities)
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_resources.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_resources.py
index e262009637..ffa24cfd93 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_resources.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_resources.py
@@ -177,19 +177,23 @@ class CollectInstanceResources(pyblish.api.InstancePlugin):
         collection_head_name = None
         # loop trough collections and create representations
         for _collection in collections:
-            ext = _collection.tail
+            ext = _collection.tail[1:]
             collection_head_name = _collection.head
             frame_start = list(_collection.indexes)[0]
             frame_end = list(_collection.indexes)[-1]
             repre_data = {
                 "frameStart": frame_start,
                 "frameEnd": frame_end,
-                "name": ext[1:],
-                "ext": ext[1:],
+                "name": ext,
+                "ext": ext,
                 "files": [item for item in _collection],
                 "stagingDir": staging_dir
             }
 
+            if instance_data.get("keepSequence"):
+                repre_data_keep = deepcopy(repre_data)
+                instance_data["representations"].append(repre_data_keep)
+
             if "review" in instance_data["families"]:
                 repre_data.update({
                     "thumbnail": True,
@@ -208,20 +212,20 @@ class CollectInstanceResources(pyblish.api.InstancePlugin):
 
         # loop trough reminders and create representations
         for _reminding_file in remainder:
-            ext = os.path.splitext(_reminding_file)[-1]
+            ext = os.path.splitext(_reminding_file)[-1][1:]
             if ext not in instance_data["extensions"]:
                 continue
             if collection_head_name and (
-                (collection_head_name + ext[1:]) not in _reminding_file
-            ) and (ext in [".mp4", ".mov"]):
+                (collection_head_name + ext) not in _reminding_file
+            ) and (ext in ["mp4", "mov"]):
                 self.log.info(f"Skipping file: {_reminding_file}")
                 continue
             frame_start = 1
             frame_end = 1
 
             repre_data = {
-                "name": ext[1:],
-                "ext": ext[1:],
+                "name": ext,
+                "ext": ext,
                 "files": _reminding_file,
                 "stagingDir": staging_dir
             }
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
index be36f30f4b..ba2aed4bfc 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
@@ -131,20 +131,21 @@ class CollectHierarchyInstance(pyblish.api.ContextPlugin):
             tasks_to_add = dict()
             project_tasks = io.find_one({"type": "project"})["config"]["tasks"]
             for task_name, task_data in self.shot_add_tasks.items():
-                try:
-                    if task_data["type"] in project_tasks.keys():
-                        tasks_to_add.update({task_name: task_data})
-                    else:
-                        raise KeyError(
-                            "Wrong FtrackTaskType `{}` for `{}` is not"
-                            " existing in `{}``".format(
-                                task_data["type"],
-                                task_name,
-                                list(project_tasks.keys())))
-                except KeyError as error:
+                _task_data = deepcopy(task_data)
+
+                # fixing enumerator from settings
+                _task_data["type"] = task_data["type"][0]
+
+                # check if task type in project task types
+                if _task_data["type"] in project_tasks.keys():
+                    tasks_to_add.update({task_name: _task_data})
+                else:
                     raise KeyError(
-                        "Wrong presets: `{0}`".format(error)
-                    )
+                        "Wrong FtrackTaskType `{}` for `{}` is not"
+                        " existing in `{}``".format(
+                            _task_data["type"],
+                            task_name,
+                            list(project_tasks.keys())))
 
             instance.data["tasks"] = tasks_to_add
         else: