Merge remote-tracking branch 'upstream/master' into implement-512

avalon/fusion/pipeline.py

@@ -49,7 +49,7 @@ def ls():
             yield container
 
 
-def install(config):
+def install():
     """Install Fusion-specific functionality of avalon-core.
 
     This function is called automatically on calling `api.install(fusion)`.
@@ -76,14 +76,10 @@ def install(config):
     logger.setLevel(logging.DEBUG)
 
 
-def uninstall(config):
+def uninstall():
     """Uninstall Fusion-specific functionality of avalon-core.
 
     This function is called automatically on calling `api.uninstall()`.
-
-    Args:
-        config: configuration module
-
     """
 
     pyblish.api.deregister_host("fusion")

avalon/fusion/workio.py

@@ -39,11 +39,10 @@ def current_file():
     return current_filepath
 
 
-def work_root():
-    from avalon import Session
+def work_root(session):
 
-    work_dir = Session["AVALON_WORKDIR"]
-    scene_dir = Session.get("AVALON_SCENEDIR")
+    work_dir = session["AVALON_WORKDIR"]
+    scene_dir = session.get("AVALON_SCENEDIR")
     if scene_dir:
         return os.path.join(work_dir, scene_dir)
     else:

avalon/houdini/pipeline.py

@@ -24,7 +24,7 @@
 IS_HEADLESS = not hasattr(hou, "ui")
 
 
-def install(config):
+def install():
     """Setup integration
     Register plug-ins and integrate into the host
 
@@ -40,14 +40,10 @@ def install(config):
     self._has_been_setup = True
 
 
-def uninstall(config):
+def uninstall():
     """Uninstall Houdini-specific functionality of avalon-core.
 
     This function is called automatically on calling `api.uninstall()`.
-
-    Args:
-        config: configuration module
-
     """
 
     pyblish.api.deregister_host("hython")

avalon/houdini/workio.py

@@ -48,11 +48,10 @@ def current_file():
     return current_filepath
 
 
-def work_root():
-    from avalon import Session
+def work_root(session):
 
-    work_dir = Session["AVALON_WORKDIR"]
-    scene_dir = Session.get("AVALON_SCENEDIR")
+    work_dir = session["AVALON_WORKDIR"]
+    scene_dir = session.get("AVALON_SCENEDIR")
     if scene_dir:
         return os.path.join(work_dir, scene_dir)
     else:

avalon/io.py

@@ -138,6 +138,14 @@ def _from_environment():
             # Optional path to scenes directory (see Work Files API)
             ("AVALON_SCENEDIR", None),
 
+            # Optional hierarchy for the current Asset. This can be referenced
+            # as `{hierarchy}` in your file templates.
+            # This will be (re-)computed when you switch the context to another
+            # asset. It is computed by checking asset['data']['parents'] and
+            # joining those together with `os.path.sep`.
+            # E.g.: ['ep101', 'scn0010'] -> 'ep101/scn0010'.
+            ("AVALON_HIERARCHY", None),
+
             # Name of current Config
             # TODO(marcus): Establish a suitable default config
             ("AVALON_CONFIG", "no_config"),

avalon/maya/pipeline.py

@@ -33,7 +33,7 @@
 IS_HEADLESS = not hasattr(cmds, "about") or cmds.about(batch=True)
 
 
-def install(config):
+def install():
     """Install Maya-specific functionality of avalon-core.
 
     This function is called automatically on calling `api.install(maya)`.
@@ -90,7 +90,7 @@ def get_main_window():
     return self._parent
 
 
-def uninstall(config):
+def uninstall():
     """Uninstall Maya-specific functionality of avalon-core.
 
     This function is called automatically on calling `api.uninstall()`.
@@ -110,8 +110,7 @@ def _install_menu():
         creator,
         loader,
         publish,
-        sceneinventory,
-        contextmanager
+        sceneinventory
     )
 
     from . import interactive
@@ -125,19 +124,17 @@ def deferred():
                   parent="MayaWindow")
 
         # Create context menu
-        context_label = "{}, {}".format(api.Session["AVALON_ASSET"],
-                                        api.Session["AVALON_TASK"])
-        context_menu = cmds.menuItem("currentContext",
-                                     label=context_label,
-                                     parent=self._menu,
-                                     subMenu=True)
-
-        cmds.menuItem("setCurrentContext",
-                      label="Edit Context..",
-                      parent=context_menu,
-                      command=lambda *args: contextmanager.show(
-                          parent=self._parent
-                      ))
+        context_label = "{}, {}".format(
+            api.Session["AVALON_ASSET"],
+            api.Session["AVALON_TASK"]
+        )
+
+        cmds.menuItem(
+            "currentContext",
+            label=context_label,
+            parent=self._menu,
+            enable=False
+        )
 
         cmds.setParent("..", menu=True)
 

avalon/maya/workio.py

@@ -30,10 +30,33 @@ def current_file():
     return current_filepath
 
 
-def work_root():
-
-    # Base the root on the current Maya workspace.
-    return os.path.join(
-        cmds.workspace(query=True, rootDirectory=True),
-        cmds.workspace(fileRuleEntry="scene")
-    )
+def work_root(session):
+    work_dir = session["AVALON_WORKDIR"]
+    scene_dir = None
+
+    # Query scene file rule from workspace.mel if it exists in WORKDIR
+    # We are parsing the workspace.mel manually as opposed to temporarily
+    # setting the Workspace in Maya in a context manager since Maya had a
+    # tendency to crash on frequently changing the workspace when this
+    # function was called many times as one scrolled through Work Files assets.
+    workspace_mel = os.path.join(work_dir, "workspace.mel")
+    if os.path.exists(workspace_mel):
+        scene_rule = 'workspace -fr "scene" '
+        # We need to use builtins as `open` is overridden by the workio API
+        open_file = __builtins__["open"]
+        with open_file(workspace_mel, "r") as f:
+            for line in f:
+                if line.strip().startswith(scene_rule):
+                    # remainder == "rule";
+                    remainder = line[len(scene_rule):]
+                    # scene_dir == rule
+                    scene_dir = remainder.split('"')[1]
+    else:
+        # We can't query a workspace that does not exist
+        # so we return similar to what we do in other hosts.
+        scene_dir = session.get("AVALON_SCENEDIR")
+
+    if scene_dir:
+        return os.path.join(work_dir, scene_dir)
+    else:
+        return work_dir

avalon/nuke/pipeline.py

@@ -209,7 +209,7 @@ def ls():
             yield container
 
 
-def install(config):
+def install():
     """Install Nuke-specific functionality of avalon-core.
 
     This is where you install menus and register families, data
@@ -241,7 +241,7 @@ def get_main_window():
     return self._parent
 
 
-def uninstall(config):
+def uninstall():
     """Uninstall all that was previously installed
 
     This is where you undo everything that was done in `install()`.
@@ -266,8 +266,7 @@ def _install_menu():
         publish,
         workfiles,
         loader,
-        sceneinventory,
-        contextmanager
+        sceneinventory
     )
 
     # Create menu
@@ -277,11 +276,9 @@ def _install_menu():
     label = "{0}, {1}".format(
         api.Session["AVALON_ASSET"], api.Session["AVALON_TASK"]
     )
-    context_menu = menu.addMenu(label)
-    context_menu.addCommand("Set Context",
-                            lambda: contextmanager.show(
-                                parent=get_main_window())
-                            )
+    context_action = menu.addCommand(label)
+    context_action.setEnabled(False)
+
     menu.addSeparator()
     menu.addCommand("Create...",
                     lambda: creator.show(parent=get_main_window()))

avalon/nuke/workio.py

@@ -42,6 +42,13 @@ def current_file():
     return os.path.normpath(current_file).replace("\\", "/")
 
 
-def work_root():
-    from avalon import Session
-    return os.path.normpath(Session["AVALON_WORKDIR"]).replace("\\", "/")
+def work_root(session):
+
+    work_dir = session["AVALON_WORKDIR"]
+    scene_dir = session.get("AVALON_SCENEDIR")
+    if scene_dir:
+        path = os.path.join(work_dir, scene_dir)
+    else:
+        path = work_dir
+
+    return os.path.normpath(path).replace("\\", "/")