support for Maya 2022 and Nuke 13, fixed asset list - v1.3.0.80

Author: RichardFrangenberg

Prism/Plugins/Apps/Houdini/Scripts/Prism_Houdini_Functions.py

@@ -1532,6 +1532,9 @@ def getStateFromNode(self, kwargs):
  if node and node.path() == knode.path():
  return state
 
+ if getattr(sm, "stateInCreation", None):
+ return sm.stateInCreation
+
  state = self.createStateForNode(kwargs)
  return state
 
@@ -1559,16 +1562,24 @@ def openInExplorerFromNode(self, kwargs):
  def onNodeCreated(self, kwargs):
  pass
 
+ @err_catcher(name=__name__)
+ def getApiFromNode(self, node):
+ for api in self.nodeTypeAPIs:
+ validApi = self.isValidNodeApi(node, api)
+
+ if validApi:
+ return api
+
  @err_catcher(name=__name__)
  def onNodeDeleted(self, kwargs):
  if hou.hipFile.isLoadingHipFile() or hou.hipFile.isShuttingDown():
  return
 
  state = self.getStateFromNode(kwargs)
  parent = None
- for api in self.nodeTypeAPIs:
-  if kwargs["node"].type().name().startswith(api.getTypeName()):
-  parent = api.getParentFolder(create=False, node=kwargs["node"])
+ api = self.getApiFromNode(kwargs["node"])
+ if api:
+ parent = api.getParentFolder(create=False, node=kwargs["node"])
 
  sm = self.core.getStateManager()
  sm.deleteState(state, silent=True)
@@ -1580,18 +1591,35 @@ def onNodeDeleted(self, kwargs):
  else:
  break
 
+ @err_catcher(name=__name__)
+ def isValidNodeApi(self, node, api):
+ validApi = False
+ typeName = api.getTypeName()
+ if isinstance(typeName, list):
+ typeNames = typeName
+ else:
+ typeNames = [typeName]
+
+ for name in typeNames:
+ validApi = node.type().name().startswith(name)
+ if validApi:
+ break
+
+ return validApi
+
  @err_catcher(name=__name__)
  def createStateForNode(self, kwargs):
  sm = self.core.getStateManager()
 
- for api in self.nodeTypeAPIs:
- if kwargs["node"].type().name().startswith(api.getTypeName()):
- parent = api.getParentFolder(create=False, node=kwargs["node"])
- if parent:
- parentExpanded = parent.isExpanded()
-
- openBrowser = False if api.listType == "Import" else None
- state = sm.createState(api.stateType, node=kwargs["node"], setActive=True, openProductsBrowser=openBrowser, parent=parent)
+ parent = None
+ api = self.getApiFromNode(kwargs["node"])
+ if api:
+ parent = api.getParentFolder(create=False, node=kwargs["node"])
+ if parent:
+ parentExpanded = parent.isExpanded()
+
+ openBrowser = False if api.listType == "Import" else None
+ state = sm.createState(api.stateType, node=kwargs["node"], setActive=True, openProductsBrowser=openBrowser, parent=parent)
 
  if parent:
  parent.setExpanded(parentExpanded)

Prism/Plugins/Apps/Houdini/Scripts/Prism_Houdini_Node_Filecache.py

@@ -379,14 +379,18 @@ def versionSelected(self, path, mode, kwargs):
 
  return version
 
+ @err_catcher(name=__name__)
+ def getProductName(self, node):
+ return node.parm("task").eval()
+
  @err_catcher(name=__name__)
  def getImportPath(self):
  sm = self.core.getStateManager(create=False)
  if not sm or self.core.getCurrentFileName() != sm.scenename:
  return ""
 
  node = hou.pwd()
- product = node.parm("task").eval()
+ product = self.getProductName(node)
  version = self.getReadVersionFromNode(node)
  if version == "latest":
  path = self.core.products.getLatestVersionpathFromProduct(product)
@@ -410,6 +414,7 @@ def getProductNames(self):
  if data["entity"] == "invalid":
  return names
  names = self.core.products.getProductsFromEntity(data["entity"], data["fullEntityName"])
+ names = sorted(names.keys())
  names = [name for name in names for _ in range(2)]
  return names
 
@@ -427,6 +432,17 @@ def getFrameranges(self):
  ranges = [r for r in ranges for _ in range(2)]
  return ranges
 
+ @err_catcher(name=__name__)
+ def getFrameRange(self, node):
+ if node.parm("framerange").eval() == 0:
+ startFrame = self.core.appPlugin.getCurrentFrame()
+ endFrame = startFrame
+ else:
+ startFrame = node.parm("f1").eval()
+ endFrame = node.parm("f2").eval()
+
+ return startFrame, endFrame
+
  @err_catcher(name=__name__)
  def framerangeChanged(self, kwargs):
  state = self.getStateFromNode(kwargs)
@@ -438,7 +454,7 @@ def getNodeDescription(self):
  version = self.getWriteVersionFromNode(node)
  if version == "next":
  version += " (%s)" % (self.core.versionFormat % node.parm("writeVersion").eval())
- descr = node.parm("task").eval() + "\n" + version
+ descr = self.getProductName(node) + "\n" + version
 
  if not node.parm("latestVersionRead").eval():
  readv = self.core.versionFormat % node.parm("readVersion").eval()

Prism/Plugins/Apps/Houdini/Scripts/StateManagerNodes/hou_Export.py

@@ -630,12 +630,11 @@ def getFrameRange(self, rangeType):
  if frange:
  startFrame, endFrame = frange
  elif rangeType == "Node" and self.node:
- if self.isPrismFilecacheNode(self.node):
- if self.node.parm("framerange").eval() == 0:
- startFrame = self.core.appPlugin.getCurrentFrame()
- endFrame = startFrame
+ api = self.core.appPlugin.getApiFromNode(self.node)
+ if api:
+ startFrame, endFrame = api.getFrameRange(self.node)
 
- if not startFrame:
+ if startFrame is None:
  try:
  startFrame = self.node.parm("f1").eval()
  endFrame = self.node.parm("f2").eval()
@@ -1309,22 +1308,22 @@ def executeState(self, parent, useVersion="next"):
  if self.cb_outType.currentText() in [".abc", ".fbx", ".usd"]:
  outputName = outputName.replace(".$F4", "")
 
- fc = self.isPrismFilecacheNode(self.node)
+ api = self.core.appPlugin.getApiFromNode(self.node)
  isStart = ropNode.parm("f1").eval() == startFrame
  isEnd = ropNode.parm("f2").eval() == endFrame
 
- if not fc:
+ if not api:
  if not self.core.appPlugin.setNodeParm(ropNode, "trange", val=1):
  return [self.state.text(0) + ": error - Publish canceled"]
 
- if not (fc and isStart):
+ if not (api and isStart):
  if not self.core.appPlugin.setNodeParm(ropNode, "f1", clear=True):
  return [self.state.text(0) + ": error - Publish canceled"]
 
  if not self.core.appPlugin.setNodeParm(ropNode, "f1", val=startFrame):
  return [self.state.text(0) + ": error - Publish canceled"]
 
- if not (fc and isEnd):
+ if not (api and isEnd):
  if not self.core.appPlugin.setNodeParm(ropNode, "f2", clear=True):
  return [self.state.text(0) + ": error - Publish canceled"]
 

Prism/Plugins/Apps/Maya/Scripts/Prism_Maya_Functions.py

@@ -67,6 +67,7 @@ class Prism_Maya_Functions(object):
  def __init__(self, core, plugin):
  self.core = core
  self.plugin = plugin
+ self.importHandlers = {}
 
  @err_catcher(name=__name__)
  def startup(self, origin):
@@ -452,11 +453,11 @@ def sm_export_addObjects(self, origin, objects=None):
  if objects:
  cmds.select(objects)
 
- setName = self.validate(origin.l_taskName.text())
+ setName = self.validate(origin.getTaskname())
  if not setName:
  setName = self.sm_export_setTaskText(origin, None, "Export")
 
- setName = self.validate(origin.l_taskName.text())
+ setName = self.validate(origin.getTaskname())
  for i in cmds.ls(selection=True, long=True):
  if i not in origin.nodes:
  try:
@@ -525,7 +526,8 @@ def sm_export_startup(self, origin):
  origin.f_objectList.setStyleSheet(
  "QFrame { border: 0px solid rgb(150,150,150); }"
  )
- origin.w_additionalOptions.setVisible(False)
+ if hasattr(origin, "w_additionalOptions"):
+ origin.w_additionalOptions.setVisible(False)
 
  origin.w_exportNamespaces = QWidget()
  origin.lo_exportNamespaces = QHBoxLayout()
@@ -634,19 +636,19 @@ def sm_export_setTaskText(self, origin, prevTaskName, newTaskName):
 
  @err_catcher(name=__name__)
  def sm_export_removeSetItem(self, origin, node):
- setName = self.validate(origin.l_taskName.text())
+ setName = self.validate(origin.getTaskname())
  cmds.sets(node, remove=setName)
 
  @err_catcher(name=__name__)
  def sm_export_clearSet(self, origin):
- setName = origin.l_taskName.text()
+ setName = origin.getTaskname()
  if self.isNodeValid(origin, setName):
  cmds.sets(clear=setName)
 
  @err_catcher(name=__name__)
  def sm_export_updateObjects(self, origin):
  prevSel = cmds.ls(selection=True, long=True)
- setName = self.validate(origin.l_taskName.text())
+ setName = self.validate(origin.getTaskname())
  if not setName:
  setName = self.sm_export_setTaskText(origin, None, "Export")
 
@@ -695,7 +697,7 @@ def sm_export_exportAppObjects(
  ):
  cmds.select(clear=True)
  if nodes is None:
- setName = self.validate(origin.l_taskName.text())
+ setName = self.validate(origin.getTaskname())
  if not self.isNodeValid(origin, setName):
  return (
  'Canceled: The selection set "%s" is invalid.'
@@ -711,7 +713,7 @@ def sm_export_exportAppObjects(
  ]
 
  if expType is None:
- expType = origin.cb_outType.currentText()
+ expType = origin.getOutputType()
 
  if expType == ".obj":
  cmds.loadPlugin("objExport", quiet=True)
@@ -948,7 +950,7 @@ def sm_export_exportAppObjects(
 
  if scaledExport:
  cmds.delete(nodes)
- elif origin.chb_convertExport.isChecked():
+ elif origin.getUnitConvert():
  if expType == ".obj":
  QMessageBox.warning(
  self.core.messageParent,
@@ -1058,7 +1060,7 @@ def sm_export_exportAppObjects(
 
  @err_catcher(name=__name__)
  def sm_export_preDelete(self, origin):
- setName = self.validate(origin.l_taskName.text())
+ setName = self.validate(origin.getTaskname())
  try:
  cmds.delete(setName)
  except:
@@ -1085,10 +1087,10 @@ def sm_export_typeChanged(self, origin, idx):
  def sm_export_preExecute(self, origin, startFrame, endFrame):
  warnings = []
 
- if origin.cb_outType.currentText() != "ShotCam":
+ if origin.getOutputType() != "ShotCam":
  if (
- origin.cb_outType.currentText() == ".obj"
- and origin.chb_convertExport.isChecked()
+ origin.getOutputType() == ".obj"
+ and origin.getUnitConvert()
  ):
  warnings.append(
  [
@@ -2302,13 +2304,32 @@ def sm_import_importToApp(self, origin, doImport, update, impFileName):
  mel.eval("FBXImportMode -v merge")
  mel.eval("FBXImportConvertUnitString -v cm")
 
- try:
- importedNodes = cmds.file(impFileName, i=True, returnNewNodes=True)
- except Exception as e:
+ kwargs = {
+ "i": True,
+ "returnNewNodes": True,
+ "importFunction": self.basicImport
+ }
+
+ if fileName[1] in self.importHandlers:
+ kwargs.update(self.importHandlers[fileName[1]])
+
+ result = kwargs["importFunction"](impFileName, kwargs)
+
+ if result and result["result"]:
+ importedNodes = result["nodes"]
+ else:
  importedNodes = []
+ if result:
+ if "error" not in result:
+ return
+
+ error = str(result["error"])
+ else:
+ error = ""
+
  msg = "An error occured while importing the file:\n\n%s\n\n%s" % (
  impFileName,
- str(e),
+ error,
  )
  self.core.popup(msg, title="Import error")
 
@@ -2339,6 +2360,18 @@ def sm_import_importToApp(self, origin, doImport, update, impFileName):
 
  return rDict
 
+ @err_catcher(name=__name__)
+ def basicImport(self, filepath, kwargs):
+ del kwargs["importFunction"]
+ try:
+ importedNodes = cmds.file(filepath, **kwargs)
+ except Exception as e:
+ result = {"result": False, "error": e}
+ return result
+
+ result = {"result": True, "nodes": importedNodes}
+ return result
+
  @err_catcher(name=__name__)
  def createGpuCache(self, filepath, geoPath="|", name=None):
  cmds.loadPlugin("gpuCache.mll", quiet=True)
@@ -2750,7 +2783,10 @@ def sm_saveImports(self, origin, importPaths):
  def sm_readStates(self, origin):
  val = cmds.fileInfo("PrismStates", query=True)
  if len(val) != 0:
- stateStr = val[0].decode('string_escape')
+ if sys.version[0] == "2":
+ stateStr = val[0].decode('string_escape')
+ else:
+ stateStr = str.encode(val[0]).decode('unicode_escape')
 
  # for backwards compatibility with scenes created before v1.3.0
  jsonData = self.core.configs.readJson(data=stateStr)