From 86119ea823c7436461e6aa4ca3681ea3febcd9d3 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej@samohel.cz>
Date: Mon, 27 Jul 2020 13:37:16 +0200
Subject: [PATCH 1/2] support for updating renderSetup settings

---
 pype/plugins/maya/load/load_rendersetup.py | 63 +++++++++++++++++++---
 1 file changed, 55 insertions(+), 8 deletions(-)

diff --git a/pype/plugins/maya/load/load_rendersetup.py b/pype/plugins/maya/load/load_rendersetup.py
index b38e2988b1..fae79548a5 100644
--- a/pype/plugins/maya/load/load_rendersetup.py
+++ b/pype/plugins/maya/load/load_rendersetup.py
@@ -1,14 +1,23 @@
-from avalon import api
-import maya.app.renderSetup.model.renderSetup as renderSetup
-from avalon.maya import lib
-from maya import cmds
+# -*- coding: utf-8 -*-
+"""Load and update RenderSetup settings.
+
+Working with RenderSetup setting is Maya is done utilizing json files.
+When this json is loaded, it will overwrite all settings on RenderSetup
+instance.
+"""
+
 import json
 
+from avalon import api
+from avalon.maya import lib
+from pype.hosts.maya import lib as pypelib
+
+from maya import cmds
+import maya.app.renderSetup.model.renderSetup as renderSetup
+
 
 class RenderSetupLoader(api.Loader):
-    """
-    This will load json preset for RenderSetup, overwriting current one.
-    """
+    """Load json preset for RenderSetup overwriting current one."""
 
     families = ["rendersetup"]
     representations = ["json"]
@@ -19,7 +28,7 @@ class RenderSetupLoader(api.Loader):
     color = "orange"
 
     def load(self, context, name, namespace, data):
-
+        """Load RenderSetup settings."""
         from avalon.maya.pipeline import containerise
         # from pype.hosts.maya.lib import namespaced
 
@@ -48,3 +57,41 @@ class RenderSetupLoader(api.Loader):
             nodes=nodes,
             context=context,
             loader=self.__class__.__name__)
+
+    def remove(self, container):
+        """Remove RenderSetup settings instance."""
+        from maya import cmds
+
+        namespace = container["namespace"]
+        container_name = container["objectName"]
+
+        self.log.info("Removing '%s' from Maya.." % container["name"])
+
+        container_content = cmds.sets(container_name, query=True)
+        nodes = cmds.ls(container_content, long=True)
+
+        nodes.append(container_name)
+
+        try:
+            cmds.delete(nodes)
+        except ValueError:
+            # Already implicitly deleted by Maya upon removing reference
+            pass
+
+        cmds.namespace(removeNamespace=namespace, deleteNamespaceContent=True)
+
+    def update(self, container, representation):
+        """Update RenderSetup setting by overwriting existing settings."""
+        pypelib.show_message(
+            "Render setup update",
+            "Render setup setting will be overwritten by new version. All "
+            "setting specified by user not included in loaded version "
+            "will be lost.")
+        path = api.get_representation_path(representation)
+        with open(path, "r") as file:
+            renderSetup.instance().decode(
+                json.load(file), renderSetup.DECODE_AND_OVERWRITE, None)
+
+    def switch(self, container, representation):
+        """Switch representations."""
+        self.update(container, representation)

From 7ce31ba1ecf45a5a03b5c4d3e3d19c1b780c9e4d Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej@samohel.cz>
Date: Tue, 28 Jul 2020 13:14:20 +0200
Subject: [PATCH 2/2] small code fixes

---
 pype/plugins/maya/load/load_rendersetup.py | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pype/plugins/maya/load/load_rendersetup.py b/pype/plugins/maya/load/load_rendersetup.py
index fae79548a5..45a314a9d1 100644
--- a/pype/plugins/maya/load/load_rendersetup.py
+++ b/pype/plugins/maya/load/load_rendersetup.py
@@ -7,6 +7,8 @@ instance.
 """
 
 import json
+import six
+import sys
 
 from avalon import api
 from avalon.maya import lib
@@ -38,7 +40,7 @@ class RenderSetupLoader(api.Loader):
             prefix="_" if asset[0].isdigit() else "",
             suffix="_",
         )
-
+        self.log.info(">>> loading json [ {} ]".format(self.fname))
         with open(self.fname, "r") as file:
             renderSetup.instance().decode(
                 json.load(file), renderSetup.DECODE_AND_OVERWRITE, None)
@@ -51,6 +53,7 @@ class RenderSetupLoader(api.Loader):
         if not nodes:
             return
 
+        self.log.info(">>> containerising [ {} ]".format(name))
         return containerise(
             name=name,
             namespace=namespace,
@@ -62,7 +65,6 @@ class RenderSetupLoader(api.Loader):
         """Remove RenderSetup settings instance."""
         from maya import cmds
 
-        namespace = container["namespace"]
         container_name = container["objectName"]
 
         self.log.info("Removing '%s' from Maya.." % container["name"])
@@ -78,8 +80,6 @@ class RenderSetupLoader(api.Loader):
             # Already implicitly deleted by Maya upon removing reference
             pass
 
-        cmds.namespace(removeNamespace=namespace, deleteNamespaceContent=True)
-
     def update(self, container, representation):
         """Update RenderSetup setting by overwriting existing settings."""
         pypelib.show_message(
@@ -89,8 +89,19 @@ class RenderSetupLoader(api.Loader):
             "will be lost.")
         path = api.get_representation_path(representation)
         with open(path, "r") as file:
-            renderSetup.instance().decode(
-                json.load(file), renderSetup.DECODE_AND_OVERWRITE, None)
+            try:
+                renderSetup.instance().decode(
+                    json.load(file), renderSetup.DECODE_AND_OVERWRITE, None)
+            except Exception:
+                self.log.error("There were errors during loading")
+                six.reraise(*sys.exc_info())
+
+        # Update metadata
+        node = container["objectName"]
+        cmds.setAttr("{}.representation".format(node),
+                     str(representation["_id"]),
+                     type="string")
+        self.log.info("... updated")
 
     def switch(self, container, representation):
         """Switch representations."""