Merge pull request #109 from pypeclub/feature/merge_upstream_021920

Feature/merge upstream 021920 (GetAvalon update 19. Feb 2020)

Author: mkolar

avalon/blender/ops.py

@@ -10,7 +10,6 @@
 import bpy
 import bpy.utils.previews
 
-from ..tools.contextmanager.app import App as contextmanager_window
 from ..tools.creator.app import Window as creator_window
 from ..tools.loader.app import Window as loader_window
 from ..tools.workfiles.app import Window as workfiles_window
@@ -134,7 +133,10 @@ def execute(self, context):
                 self._app.store_window(self.bl_idname, window)
             self._window = window
 
-        if not isinstance(self._window, (QtWidgets.QDialog, ModuleType)):
+        if not isinstance(
+            self._window,
+            (QtWidgets.QMainWindow, QtWidgets.QDialog, ModuleType)
+        ):
             raise AttributeError(
                 "`window` should be a `QDialog or module`. Got: {}".format(
                     str(type(window))
@@ -178,14 +180,6 @@ def before_window_show(self):
         return
 
 
-class LaunchContextManager(LaunchQtApp):
-    """Launch Avalon Context Manager."""
-
-    bl_idname = "wm.avalon_contextmanager"
-    bl_label = "Set Avalon Context..."
-    _window_class = contextmanager_window
-
-
 class LaunchCreator(LaunchQtApp):
     """Launch Avalon Creator."""
 
@@ -242,13 +236,13 @@ class LaunchWorkFiles(LaunchQtApp):
     _window_class = workfiles_window
 
     def execute(self, context):
-        self._init_kwargs = {
-            "root": str(Path(
-                os.environ.get("AVALON_WORKDIR", ""),
-                os.environ.get("AVALON_SCENEDIR", ""),
-            ))
-        }
-        return super().execute(context)
+        result = super().execute(context)
+        self._window.set_context({
+            "asset": api.Session["AVALON_ASSET"],
+            "silo": api.Session["AVALON_SILO"],
+            "task": api.Session["AVALON_TASK"]
+        })
+        return result
 
     def before_window_show(self):
         self._window.root = str(Path(
@@ -279,7 +273,11 @@ def draw(self, context):
         asset = api.Session['AVALON_ASSET']
         task = api.Session['AVALON_TASK']
         context_label = f"{asset}, {task}"
-        layout.operator(LaunchContextManager.bl_idname, text=context_label)
+        context_label_item = layout.row()
+        context_label_item.operator(
+            LaunchWorkFiles.bl_idname, text=context_label
+        )
+        context_label_item.enabled = False
         layout.separator()
         layout.operator(LaunchCreator.bl_idname, text="Create...")
         layout.operator(LaunchLoader.bl_idname, text="Load...")
@@ -302,7 +300,6 @@ def draw_avalon_menu(self, context):
 
 
 classes = [
-    LaunchContextManager,
     LaunchCreator,
     LaunchLoader,
     LaunchPublisher,

avalon/blender/workio.py

@@ -62,13 +62,11 @@ def file_extensions() -> List[str]:
     return [".blend"]
 
 
-def work_root() -> str:
+def work_root(session: dict) -> str:
     """Return the default root to browse for work files."""
 
-    from .. import api
-
-    work_dir = api.Session["AVALON_WORKDIR"]
-    scene_dir = api.Session.get("AVALON_SCENEDIR")
+    work_dir = session["AVALON_WORKDIR"]
+    scene_dir = session.get("AVALON_SCENEDIR")
     if scene_dir:
         return str(Path(work_dir, scene_dir))
     return work_dir

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,9 @@ def current_file():
     return current_filepath
 
 
-def work_root():
-    from avalon import Session
-
-    work_dir = Session["AVALON_WORKDIR"]
-    scene_dir = Session.get("AVALON_SCENEDIR")
+def work_root(session):
+    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,9 @@ def current_file():
     return current_filepath
 
 
-def work_root():
-    from avalon import Session
-
-    work_dir = Session["AVALON_WORKDIR"]
-    scene_dir = Session.get("AVALON_SCENEDIR")
+def work_root(session):
+    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

@@ -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()`.
@@ -111,8 +111,7 @@ def _install_menu():
         loader,
         publish,
         sceneinventory,
-        libraryloader,
-        contextmanager
+        libraryloader
     )
 
     from . import interactive
@@ -126,19 +125,16 @@ 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

@@ -254,7 +254,7 @@ def install():
     pyblish.register_host("nuke")
 
 
-def uninstall(config):
+def uninstall():
     """Uninstall all that was previously installed
 
     This is where you undo everything that was done in `install()`.
@@ -280,19 +280,26 @@ def _install_menu():
         workfiles,
         loader,
         sceneinventory,
-        contextmanager,
         libraryloader
     )
-
+    from ..vendor.Qt import QtWidgets
+
+    main_window = None
+    for widget in QtWidgets.QApplication.topLevelWidgets():
+        if widget.isWindow():
+            if widget.parentWidget() is None:
+                if widget.windowTitle() != '':
+                    main_window = widget
+                    break
     # Create menu
     menubar = nuke.menu("Nuke")
     menu = menubar.addMenu(api.Session["AVALON_LABEL"])
 
     label = "{0}, {1}".format(
         api.Session["AVALON_ASSET"], api.Session["AVALON_TASK"]
     )
-    context_menu = menu.addMenu(label)
-    context_menu.addCommand("Set Context", contextmanager.show)
+    context_action = menu.addCommand(label)
+    context_action.setEnabled(False)
 
     menu.addSeparator()
     menu.addCommand("Work Files...",
@@ -306,7 +313,10 @@ def _install_menu():
         "Load...", command=lambda *args:
         loader.show(use_context=True)
     )
-    menu.addCommand("Publish...", publish.show)
+    menu.addCommand(
+        "Publish...",
+        lambda *args: publish.show(parent=main_window)
+    )
     menu.addCommand("Manage...", sceneinventory.show)
     menu.addCommand("Library...", libraryloader.show)