From 60edd3abe6bf52271d7f1d84635f0be482d31c65 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 10 Mar 2022 15:13:35 +0100
Subject: [PATCH] OP-2765 - added functionality to store/retrive context data

These data is used for context publish information, for example storing enabling/disabling of validators. Currently not present in AE.
---
 openpype/hosts/aftereffects/api/pipeline.py | 22 +++++++++++++--------
 openpype/hosts/aftereffects/api/ws_stub.py  | 10 ++++++----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/openpype/hosts/aftereffects/api/pipeline.py b/openpype/hosts/aftereffects/api/pipeline.py
index 38ab2225bf..978d035020 100644
--- a/openpype/hosts/aftereffects/api/pipeline.py
+++ b/openpype/hosts/aftereffects/api/pipeline.py
@@ -9,6 +9,7 @@ from avalon import io, pipeline
 
 from openpype import lib
 from openpype.api import Logger
+from openpype.pipeline import LegacyCreator
 import openpype.hosts.aftereffects
 from openpype.pipeline import BaseCreator
 
@@ -34,7 +35,7 @@ def install():
     pyblish.api.register_plugin_path(PUBLISH_PATH)
 
     avalon.api.register_plugin_path(avalon.api.Loader, LOAD_PATH)
-    avalon.api.register_plugin_path(avalon.api.Creator, CREATE_PATH)
+    avalon.api.register_plugin_path(LegacyCreator, CREATE_PATH)
     avalon.api.register_plugin_path(BaseCreator, CREATE_PATH)
     log.info(PUBLISH_PATH)
 
@@ -48,7 +49,7 @@ def install():
 def uninstall():
     pyblish.api.deregister_plugin_path(PUBLISH_PATH)
     avalon.api.deregister_plugin_path(avalon.api.Loader, LOAD_PATH)
-    avalon.api.deregister_plugin_path(avalon.api.Creator, CREATE_PATH)
+    avalon.api.deregister_plugin_path(LegacyCreator, CREATE_PATH)
 
 
 def application_launch():
@@ -223,10 +224,8 @@ def list_instances():
     layers_meta = stub.get_metadata()
 
     for instance in layers_meta:
-        if instance.get("schema") and \
-                "container" in instance.get("schema"):
-            continue
-        instances.append(instance)
+        if instance.get("id") == "pyblish.avalon.instance":
+            instances.append(instance)
     return instances
 
 
@@ -263,12 +262,19 @@ def remove_instance(instance):
 
 # new publisher section
 def get_context_data():
-    print("get_context_data")
+    meta = _get_stub().get_metadata()
+    for item in meta:
+        if item.get("id") == "publish_context":
+            item.pop("id")
+            return item
+
     return {}
 
 
 def update_context_data(data, changes):
-    print("update_context_data")
+    item = data
+    item["id"] = "publish_context"
+    _get_stub().imprint(item["id"], item)
 
 
 def get_context_title():
diff --git a/openpype/hosts/aftereffects/api/ws_stub.py b/openpype/hosts/aftereffects/api/ws_stub.py
index 1d3b69e038..d2dc40ec89 100644
--- a/openpype/hosts/aftereffects/api/ws_stub.py
+++ b/openpype/hosts/aftereffects/api/ws_stub.py
@@ -155,10 +155,12 @@ class AfterEffectsServerStub():
         item_ids = [int(item.id) for item in all_items]
         cleaned_data = []
         for meta in result_meta:
-            # for creation of instance OR loaded container
-            if 'instance' in meta.get('id') or \
-                    int(meta.get('members')[0]) in item_ids:
-                cleaned_data.append(meta)
+            # do not added instance with nonexistend item id
+            if meta.get("members"):
+                if int(meta["members"][0]) not in item_ids:
+                    continue
+
+            cleaned_data.append(meta)
 
         payload = json.dumps(cleaned_data, indent=4)