fix clashing namespace js function calls

avalon/harmony/TB_sceneOpened.js

@@ -45,14 +45,14 @@ function Client()
  {
  try
  {
- var func = eval.call( null, request["function"]);
+ var _func = eval.call( null, request["function"]);
 
  if (request.args == null)
  {
- result = func();
+ result = _func();
  }else
  {
- result = func(request.args);
+ result = _func(request.args);
  }
  }
 

avalon/harmony/lib.py

@@ -12,6 +12,7 @@
 import json
 import signal
 import time
+from uuid import uuid4
 
 from .server import Server
 from ..vendor.Qt import QtWidgets
@@ -30,6 +31,8 @@
 self.log = logging.getLogger(__name__)
 self.log.setLevel(logging.DEBUG)
 
+signature = str(uuid4())
+
 
 class _ZipFile(zipfile.ZipFile):
  """Extended check for windows invalid characters."""
@@ -237,7 +240,7 @@ def show(module_name):
 
 
 def get_scene_data():
- func = """function func(args)
+ func = """function %s_func(args)
  {
  var metadata = scene.metadata("avalon");
  if (metadata){
@@ -246,8 +249,8 @@ def get_scene_data():
  return {};
  }
  }
- func
- """
+ %s_func
+ """ % (signature, signature)
  try:
  return self.send({"function": func})["result"]
  except json.decoder.JSONDecodeError:
@@ -260,7 +263,7 @@ def get_scene_data():
 
 def set_scene_data(data):
  # Write scene data.
- func = """function func(args)
+ func = """function %s_func(args)
  {
  scene.setMetadata({
  "name" : "avalon",
@@ -270,8 +273,8 @@ def set_scene_data(data):
  "value" : JSON.stringify(args[0])
  });
  }
- func
- """
+ %s_func
+ """ % (signature, signature)
  self.send({"function": func, "args": [data]})
 
 
@@ -378,19 +381,19 @@ def maintained_nodes_state(nodes):
  )
 
  # Disable all nodes.
- func = """function func(nodes)
+ func = """function %s_func(nodes)
  {
  for (var i = 0 ; i < nodes.length; i++)
  {
  node.setEnable(nodes[i], false);
  }
  }
- func
- """
+ %s_func
+ """ % (signature, signature)
  self.send({"function": func, "args": [nodes]})
 
  # Restore state after yield.
- func = """function func(args)
+ func = """function %s_func(args)
  {
  var nodes = args[0];
  var states = args[1];
@@ -399,8 +402,8 @@ def maintained_nodes_state(nodes):
  node.setEnable(nodes[i], states[i]);
  }
  }
- func
- """
+ %s_func
+ """ % (signature, signature)
 
  try:
  yield
@@ -418,7 +421,7 @@ def save_scene():
  """
  # Need to turn off the backgound watcher else the communication with
  # the server gets spammed with two requests at the same time.
- func = """function func()
+ func = """function %s_func()
  {
  var app = QCoreApplication.instance();
  app.avalon_on_file_changed = false;
@@ -428,21 +431,21 @@ def save_scene():
  scene.currentVersionName() + ".xstage"
  );
  }
- func
- """
+ %s_func
+ """ % (signature, signature)
  scene_path = self.send({"function": func})["result"]
 
  # Manually update the remote file.
  self.on_file_changed(scene_path, threaded=False)
 
  # Re-enable the background watcher.
- func = """function func()
+ func = """function %s_func()
  {
  var app = QCoreApplication.instance();
  app.avalon_on_file_changed = true;
  }
- func
- """
+ %s_func
+ """ % (signature, signature)
  self.send({"function": func})
 
 

avalon/harmony/pipeline.py

@@ -1,10 +1,14 @@
 from .. import api, pipeline
 from . import lib
 from ..vendor import Qt
+from uuid import uuid4
 
 import pyblish.api
 
 
+signature = str(uuid4())
+
+
 def install():
  """Install Harmony-specific functionality of avalon-core.
 
@@ -49,18 +53,18 @@ class Creator(api.Creator):
  node_type = "COMPOSITE"
 
  def setup_node(self, node):
- func = """function func(args)
+ func = """function %s_func(args)
  {
  node.setTextAttr(args[0], "COMPOSITE_MODE", 1, "Pass Through");
  }
- func
- """
+ %s_func
+ """ % (signature, signature)
  lib.send(
  {"function": func, "args": [node]}
  )
 
  def process(self):
- func = """function func(args)
+ func = """function %s_func(args)
  {
  var nodes = node.getNodes([args[0]]);
  var node_names = [];
@@ -70,8 +74,8 @@ def process(self):
  }
  return node_names
  }
- func
- """
+ %s_func
+ """ % (signature, signature)
 
  existing_node_names = lib.send(
  {"function": func, "args": [self.node_type]}
@@ -87,7 +91,7 @@ def process(self):
  message_box.exec_()
  return False
 
- func = """function func(args)
+ func = """function %s_func(args)
  {
  var result_node = node.add("Top", args[0], args[1], 0, 0, 0);
 
@@ -103,8 +107,8 @@ def process(self):
  }
  return result_node
  }
- func
- """
+ %s_func
+ """ % (signature, signature)
 
  with lib.maintained_selection() as selection:
  node = None
@@ -161,7 +165,7 @@ def containerise(name,
  "loader": str(loader),
  "representation": str(context["representation"]["_id"]),
  "nodes": nodes
-  }
+ }
 
  lib.imprint(node, data)
 

avalon/toonboom/lib.py

@@ -10,6 +10,7 @@
 import importlib
 import logging
 import filecmp
+from uuid import uuid4
 
 from .server import Server
 from ..tools import workfiles
@@ -29,6 +30,8 @@
 self.log = logging.getLogger(__name__)
 self.log.setLevel(logging.DEBUG)
 
+signature = str(uuid4())
+
 
 def execute_in_main_thread(func_to_call_from_main_thread):
  self.callback_queue.put(func_to_call_from_main_thread)
@@ -294,7 +297,7 @@ def save_scene():
  """
  # Need to turn off the backgound watcher else the communication with
  # the server gets spammed with two requests at the same time.
- func = """function func()
+ func = """function %s_func()
  {
  var app = QCoreApplication.instance();
  app.avalon_on_file_changed = false;
@@ -303,19 +306,19 @@ def save_scene():
  scene.currentProjectPath() + "/" + scene.currentVersionName()
  );
  }
- func
- """
+ %s_func
+ """ % (signature, signature)
  scene_path = self.send({"function": func})["result"] + "." + self.extension
 
  # Manually update the remote file.
  self.on_file_changed(scene_path)
 
  # Re-enable the background watcher.
- func = """function func()
+ func = """function %s_func()
  {
  var app = QCoreApplication.instance();
  app.avalon_on_file_changed = true;
  }
- func
- """
+ %s_func
+ """ % (signature, signature)
  self.send({"function": func})