Merged in tokejepsen/pype/change/non_versioned_work_folders (pull request #220)

Change/non versioned work folders

Approved-by: Milan Kolar <milan@orbi.tools>

pype/nuke/lib.py

@@ -191,10 +191,19 @@ def create_write_node(name, data):
 
     # build file path to workfiles
     fpath = str(anatomy_filled["work"]["folder"]).replace("\\", "/")
-    fpath = '{work}/renders/v{version}/{subset}.{frame}.{ext}'.format(
-        work=fpath, version=data["version"], subset=data["subset"],
+    pattern = "{work}/renders/nuke/{subset}/{subset}.{frame}.{ext}"
+    # Workfile paths can be configured to have host name in file path.
+    # In this case we want to avoid duplicate folder names.
+    if "nuke" in fpath.lower():
+        pattern = pattern.replace("nuke/", "")
+
+    fpath = pattern.format(
+        work=fpath,
+        version=data["version"],
+        subset=data["subset"],
         frame=data["frame"],
-        ext=data["nuke_dataflow_writes"]["file_type"])
+        ext=data["nuke_dataflow_writes"]["file_type"]
+    )
 
     # create directory
     if not os.path.isdir(os.path.dirname(fpath)):

pype/plugins/maya/publish/submit_maya_deadline.py

@@ -51,7 +51,7 @@ def get_renderer_variables(renderlayer=None):
         # returns an index number.
         filename_base = os.path.basename(filename_0)
         extension = os.path.splitext(filename_base)[-1].strip(".")
-        filename_prefix = "<Scene>/<RenderLayer>/<RenderLayer>"
+        filename_prefix = cmds.getAttr("defaultRenderGlobals.imageFilePrefix")
 
     return {"ext": extension,
             "filename_prefix": filename_prefix,
@@ -77,8 +77,19 @@ def preview_fname(folder, scene, layer, padding, ext):
 
     """
 
-    # Following hardcoded "<Scene>/<Scene>_<Layer>/<Layer>"
-    output = "{scene}/{layer}/{layer}.{number}.{ext}".format(
+    fileprefix = cmds.getAttr("defaultRenderGlobals.imageFilePrefix")
+    output = fileprefix + ".{number}.{ext}"
+    # RenderPass is currently hardcoded to "beauty" because its not important
+    # for the deadline submission, but we will need something to replace
+    # "<RenderPass>".
+    mapping = {
+        "<Scene>": "{scene}",
+        "<RenderLayer>": "{layer}",
+        "RenderPass": "beauty"
+    }
+    for key, value in mapping.items():
+        output = output.replace(key, value)
+    output = output.format(
         scene=scene,
         layer=layer,
         number="#" * padding,

pype/plugins/maya/publish/validate_rendersettings.py

@@ -1,4 +1,7 @@
-import maya.cmds as cmds
+import os
+
+from maya import cmds, mel
+import pymel.core as pm
 
 import pyblish.api
 import pype.api
@@ -9,9 +12,9 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
     """Validates the global render settings
 
     * File Name Prefix must be as followed:
-        * vray: <Scene>/<Layer>/<Layer>
-        * arnold: <Scene>/<RenderLayer>/<RenderLayer>
-        * default: <Scene>/<RenderLayer>/<RenderLayer>
+        * vray: maya/<Layer>/<Layer>
+        * arnold: maya/<RenderLayer>/<RenderLayer>
+        * default: maya/<RenderLayer>/<RenderLayer>
 
     * Frame Padding must be:
         * default: 4
@@ -34,8 +37,8 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
     actions = [pype.api.RepairAction]
 
     DEFAULT_PADDING = 4
-    RENDERER_PREFIX = {"vray": "<Scene>/<Layer>/<Layer>"}
-    DEFAULT_PREFIX = "<Scene>/<RenderLayer>/<RenderLayer>_<RenderPass>"
+    RENDERER_PREFIX = {"vray": "maya/<Layer>/<Layer>"}
+    DEFAULT_PREFIX = "maya/<RenderLayer>/<RenderLayer>_<RenderPass>"
 
     def process(self, instance):
 
@@ -66,8 +69,8 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
             cls.log.error("Animation needs to be enabled. Use the same "
                           "frame for start and end to render single frame")
 
-        fname_prefix = cls.RENDERER_PREFIX.get(renderer,
-                                               cls.DEFAULT_PREFIX)
+        fname_prefix = cls.get_prefix(renderer)
+
         if prefix != fname_prefix:
             invalid = True
             cls.log.error("Wrong file name prefix: %s (expected: %s)"
@@ -80,6 +83,21 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
 
         return invalid
 
+    @classmethod
+    def get_prefix(cls, renderer):
+        prefix = cls.RENDERER_PREFIX.get(renderer, cls.DEFAULT_PREFIX)
+        # maya.cmds and pymel.core return only default project directory and
+        # not the current one but only default.
+        output_path = os.path.join(
+            mel.eval("workspace -q -rd;"), pm.workspace.fileRules["images"]
+        )
+        # Workfile paths can be configured to have host name in file path.
+        # In this case we want to avoid duplicate folder names.
+        if "maya" in output_path.lower():
+            prefix = prefix.replace("maya/", "")
+
+        return prefix
+
     @classmethod
     def repair(cls, instance):
 
@@ -94,7 +112,7 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
             node = render_attrs["node"]
             prefix_attr = render_attrs["prefix"]
 
-            fname_prefix = cls.RENDERER_PREFIX.get(renderer, cls.DEFAULT_PREFIX)
+            fname_prefix = cls.get_prefix(renderer)
             cmds.setAttr("{}.{}".format(node, prefix_attr),
                          fname_prefix, type="string")