From f5c73f5a948ea52fbfe18d0a38f27d5506f7ad4e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 27 Oct 2022 18:41:53 +0200
Subject: [PATCH] create context collector also adds thumbnail source to
 instances

---
 .../plugins/publish/collect_movie_batch.py    |  3 ++-
 .../publish/collect_simple_instances.py       |  3 ++-
 .../plugins/publish/extract_thumbnail.py      | 13 +++++----
 .../publish/collect_from_create_context.py    | 27 ++++++++++++++++---
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_movie_batch.py b/openpype/hosts/traypublisher/plugins/publish/collect_movie_batch.py
index 3d93e2c927..5f8b2878b7 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_movie_batch.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_movie_batch.py
@@ -40,7 +40,8 @@ class CollectMovieBatch(
         if creator_attributes["add_review_family"]:
             repre["tags"].append("review")
             instance.data["families"].append("review")
-            instance.data["thumbnailSource"] = file_url
+            if not instance.data.get("thumbnailSource"):
+                instance.data["thumbnailSource"] = file_url
 
         instance.data["source"] = file_url
 
diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index 7035a61d7b..183195a515 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -188,7 +188,8 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
         if "review" not in instance.data["families"]:
             instance.data["families"].append("review")
 
-        instance.data["thumbnailSource"] = first_filepath
+        if not instance.data.get("thumbnailSource"):
+            instance.data["thumbnailSource"] = first_filepath
 
         review_representation["tags"].append("review")
         self.log.debug("Representation {} was marked for review. {}".format(
diff --git a/openpype/hosts/traypublisher/plugins/publish/extract_thumbnail.py b/openpype/hosts/traypublisher/plugins/publish/extract_thumbnail.py
index 7781bb7b3e..96aefe0043 100644
--- a/openpype/hosts/traypublisher/plugins/publish/extract_thumbnail.py
+++ b/openpype/hosts/traypublisher/plugins/publish/extract_thumbnail.py
@@ -42,7 +42,15 @@ class ExtractThumbnailFromSource(pyblish.api.InstancePlugin):
             "Processing instance with subset name {}".format(subset_name)
         )
 
+        # Check if already has thumbnail created
+        if self._already_has_thumbnail(instance):
+            self.log.info("Thumbnail representation already present.")
+            return
+
         thumbnail_source = instance.data.get("thumbnailSource")
+        if not thumbnail_source:
+            thumbnail_source = instance.context.data.get("thumbnailSource")
+
         if not thumbnail_source:
             self.log.debug("Thumbnail source not filled. Skipping.")
             return
@@ -53,11 +61,6 @@ class ExtractThumbnailFromSource(pyblish.api.InstancePlugin):
                     thumbnail_source))
             return
 
-        # Check if already has thumbnail created
-        if self._already_has_thumbnail(instance):
-            self.log.info("Thumbnail representation already present.")
-            return
-
         # Create temp directory for thumbnail
         # - this is to avoid "override" of source file
         dst_staging = tempfile.mkdtemp(prefix="pyblish_tmp_")
diff --git a/openpype/plugins/publish/collect_from_create_context.py b/openpype/plugins/publish/collect_from_create_context.py
index fc0f97b187..ddb6908a4c 100644
--- a/openpype/plugins/publish/collect_from_create_context.py
+++ b/openpype/plugins/publish/collect_from_create_context.py
@@ -19,14 +19,28 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
         if not create_context:
             return
 
+        thumbnail_paths_by_instance_id = (
+            create_context.thumbnail_paths_by_instance_id
+        )
+        context.data["thumbnailSource"] = (
+            thumbnail_paths_by_instance_id.get(None)
+        )
+
         project_name = create_context.project_name
         if project_name:
             context.data["projectName"] = project_name
+
         for created_instance in create_context.instances:
             instance_data = created_instance.data_to_store()
             if instance_data["active"]:
+                thumbnail_path = thumbnail_paths_by_instance_id.get(
+                    created_instance.id
+                )
                 self.create_instance(
-                    context, instance_data, created_instance.transient_data
+                    context,
+                    instance_data,
+                    created_instance.transient_data,
+                    thumbnail_path
                 )
 
         # Update global data to context
@@ -39,7 +53,13 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
                 legacy_io.Session[key] = value
                 os.environ[key] = value
 
-    def create_instance(self, context, in_data, transient_data):
+    def create_instance(
+        self,
+        context,
+        in_data,
+        transient_data,
+        thumbnail_path
+    ):
         subset = in_data["subset"]
         # If instance data already contain families then use it
         instance_families = in_data.get("families") or []
@@ -53,7 +73,8 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
             "name": subset,
             "family": in_data["family"],
             "families": instance_families,
-            "representations": []
+            "representations": [],
+            "thumbnailSource": thumbnail_path
         })
         for key, value in in_data.items():
             if key not in instance.data: