From e24ef3a9eba62a9dbcae252dcf70d9608145724b Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 4 Mar 2022 16:32:16 +0100
Subject: [PATCH] OP-2765 - added workfile creator and modified collector

Workfile collector shouldn't create new isntance for NP, but should update version
---
 .../plugins/create/workfile_creator.py        | 75 +++++++++++++++++++
 .../plugins/publish/collect_workfile.py       | 33 ++++----
 2 files changed, 94 insertions(+), 14 deletions(-)
 create mode 100644 openpype/hosts/aftereffects/plugins/create/workfile_creator.py

diff --git a/openpype/hosts/aftereffects/plugins/create/workfile_creator.py b/openpype/hosts/aftereffects/plugins/create/workfile_creator.py
new file mode 100644
index 0000000000..2d9d42ee8c
--- /dev/null
+++ b/openpype/hosts/aftereffects/plugins/create/workfile_creator.py
@@ -0,0 +1,75 @@
+from avalon import io
+
+import openpype.hosts.aftereffects.api as api
+from openpype.pipeline import (
+    AutoCreator,
+    CreatedInstance
+)
+
+
+class AEWorkfileCreator(AutoCreator):
+    identifier = "workfile"
+    family = "workfile"
+
+    def get_instance_attr_defs(self):
+        return []
+
+    def collect_instances(self):
+        for instance_data in api.list_instances():
+            creator_id = instance_data.get("creator_identifier")
+            if creator_id == self.identifier:
+                subset_name = instance_data["subset"]
+                instance = CreatedInstance(
+                    self.family, subset_name, instance_data, self
+                )
+                self._add_instance_to_context(instance)
+
+    def update_instances(self, update_list):
+        # nothing to change on workfiles
+        pass
+
+    def create(self, options=None):
+        existing_instance = None
+        for instance in self.create_context.instances:
+            if instance.family == self.family:
+                existing_instance = instance
+                break
+
+        variant = ''
+        project_name = io.Session["AVALON_PROJECT"]
+        asset_name = io.Session["AVALON_ASSET"]
+        task_name = io.Session["AVALON_TASK"]
+        host_name = io.Session["AVALON_APP"]
+
+        if existing_instance is None:
+            asset_doc = io.find_one({"type": "asset", "name": asset_name})
+            subset_name = self.get_subset_name(
+                variant, task_name, asset_doc, project_name, host_name
+            )
+            data = {
+                "asset": asset_name,
+                "task": task_name,
+                "variant": variant
+            }
+            data.update(self.get_dynamic_data(
+                variant, task_name, asset_doc, project_name, host_name
+            ))
+
+            new_instance = CreatedInstance(
+                self.family, subset_name, data, self
+            )
+            self._add_instance_to_context(new_instance)
+
+            api.get_stub().imprint(new_instance.get("instance_id"),
+                                   new_instance.data_to_store())
+
+        elif (
+            existing_instance["asset"] != asset_name
+            or existing_instance["task"] != task_name
+        ):
+            asset_doc = io.find_one({"type": "asset", "name": asset_name})
+            subset_name = self.get_subset_name(
+                variant, task_name, asset_doc, project_name, host_name
+            )
+            existing_instance["asset"] = asset_name
+            existing_instance["task"] = task_name
diff --git a/openpype/hosts/aftereffects/plugins/publish/collect_workfile.py b/openpype/hosts/aftereffects/plugins/publish/collect_workfile.py
index 61c4897cae..29ec3a64e6 100644
--- a/openpype/hosts/aftereffects/plugins/publish/collect_workfile.py
+++ b/openpype/hosts/aftereffects/plugins/publish/collect_workfile.py
@@ -10,10 +10,11 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
     order = pyblish.api.CollectorOrder + 0.1
 
     def process(self, context):
+        create_instance = True
         for instance in context:
             if instance.data["family"] == "workfile":
-                self.log.debug("Workfile instance found, skipping")
-                return
+                self.log.debug("Workfile instance found, do not create new")
+                create_instance = False
 
         task = api.Session["AVALON_TASK"]
         current_file = context.data["currentFile"]
@@ -44,20 +45,24 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
         # workfile instance
         family = "workfile"
         subset = family + task.capitalize()
-        # Create instance
-        instance = context.create_instance(subset)
 
-        # creating instance data
-        instance.data.update({
-            "subset": subset,
-            "label": scene_file,
-            "family": family,
-            "families": [family],
-            "representations": list()
-        })
+        if create_instance:  # old publish
+            # Create instance
+            instance = context.create_instance(subset)
 
-        # adding basic script data
-        instance.data.update(shared_instance_data)
+            # creating instance data
+            instance.data.update({
+                "subset": subset,
+                "label": scene_file,
+                "family": family,
+                "families": [family],
+                "representations": list()
+            })
+
+            # adding basic script data
+            instance.data.update(shared_instance_data)
+        else:
+            instance.data.update({"version": version})
 
         # creating representation
         representation = {