Fix #388 conflicts

avalon/fusion/__init__.py

@@ -15,7 +15,15 @@
     get_current_comp,
     comp_lock_and_undo_chunk
 
+)
 
+from .workio import (
+    open,
+    save,
+    current_file,
+    has_unsaved_changes,
+    file_extensions,
+    work_root
 )
 
 from .lib import (
@@ -33,6 +41,14 @@
     "get_current_comp",
     "comp_lock_and_undo_chunk",
 
+    # Workfiles API
+    "open",
+    "save",
+    "current_file",
+    "has_unsaved_changes",
+    "file_extensions",
+    "work_root",
+
     "maintained_selection"
 
 ]

avalon/fusion/workio.py

@@ -0,0 +1,50 @@
+"""Host API required Work Files tool"""
+import sys
+import os
+
+
+def file_extensions():
+    return [".comp"]
+
+
+def has_unsaved_changes():
+    from avalon.fusion.pipeline import get_current_comp
+
+    comp = get_current_comp()
+    return comp.GetAttrs()["COMPB_Modified"]
+
+
+def save(filepath):
+    from avalon.fusion.pipeline import get_current_comp
+
+    comp = get_current_comp()
+    comp.Save(filepath)
+
+
+def open(filepath):
+    # Hack to get fusion, see avalon.fusion.pipeline.get_current_comp()
+    fusion = getattr(sys.modules["__main__"], "fusion", None)
+
+    return fusion.LoadComp(filepath)
+
+
+def current_file():
+    from avalon.fusion.pipeline import get_current_comp
+
+    comp = get_current_comp()
+    current_filepath = comp.GetAttrs()["COMPS_FileName"]
+    if not current_filepath:
+        return None
+
+    return current_filepath
+
+
+def work_root():
+    from avalon import api
+
+    work_dir = api.Session["AVALON_WORKDIR"]
+    scene_dir = api.Session.get("AVALON_SCENEDIR")
+    if scene_dir:
+        return os.path.join(work_dir, scene_dir)
+    else:
+        return work_dir

avalon/houdini/__init__.py

@@ -9,6 +9,15 @@
 
 )
 
+from .workio import (
+    open,
+    save,
+    current_file,
+    has_unsaved_changes,
+    file_extensions,
+    work_root
+)
+
 from .lib import (
     lsattr,
     lsattrs,
@@ -28,11 +37,19 @@
     "ls",
     "containerise",
 
-    # Utility functions
-    "maintained_selection",
+    # Workfiles API
+    "open",
+    "save",
+    "current_file",
+    "has_unsaved_changes",
+    "file_extensions",
+    "work_root",
 
+    # Utility functions
     "lsattr",
     "lsattrs",
     "read",
+
+    "maintained_selection",
     "unique_name"
 ]

avalon/houdini/lib.py

@@ -174,9 +174,11 @@ def maintained_selection():
     try:
         yield
     finally:
+        # Clear the selection
+        # todo: does hou.clearAllSelected() do the same?
+        for node in hou.selectedNodes():
+            node.setSelected(on=False)
+
         if previous_selection:
             for node in previous_selection:
                 node.setSelected(on=True)
-        else:
-            for node in previous_selection:
-                node.setSelected(on=False)

avalon/houdini/pipeline.py

@@ -20,7 +20,7 @@
 self._parent = None
 self._events = dict()
 
-AVALON_CONTAINERS = "AVALON_CONTAINERS"
+AVALON_CONTAINERS = "/obj/AVALON_CONTAINERS"
 IS_HEADLESS = not hasattr(hou, "ui")
 
 
@@ -30,6 +30,7 @@ def install(config):
 
     """
 
+    print("Registering callbacks")
     _register_callbacks()
 
     pyblish.api.register_host("houdini")
@@ -151,15 +152,11 @@ def containerise(name,
                  context,
                  loader=None,
                  suffix=""):
-    """Bundle `nodes` into an assembly and imprint it with metadata
+    """Bundle `nodes` into a subnet and imprint it with metadata
 
     Containerisation enables a tracking of version, author and origin
     for loaded assets.
 
-    In Houdini it is not possible to next goemetry nodes in geometry nodes
-    directly. To counter this we place a Object Network node calles ROOT
-    in the HOUDINI_CONTAINERS node.
-
     Arguments:
         name (str): Name of resulting assembly
         namespace (str): Namespace under which to host container
@@ -173,16 +170,18 @@ def containerise(name,
 
     """
 
-    # Get main object network node
-    obj_network = hou.node("/obj")
+    # Ensure AVALON_CONTAINERS subnet exists
+    subnet = hou.node(AVALON_CONTAINERS)
+    if subnet is None:
+        obj_network = hou.node("/obj")
+        subnet = obj_network.createNode("subnet",
+                                        node_name="AVALON_CONTAINERS")
 
-    # Check if the AVALON_CONTAINERS exists
-    main_container = obj_network.node(AVALON_CONTAINERS)
-    if main_container is None:
-        main_container = obj_network.createNode("subnet",
-                                                node_name="AVALON_CONTAINERS")
+    # Create proper container name
+    container_name = "{}_{}".format(name, suffix or "CON")
+    container = hou.node("/obj/{}".format(name))
+    container.setName(container_name)
 
-    container = obj_network.node(name)
     data = {
         "schema": "avalon-core:container-2.0",
         "id": AVALON_CONTAINER_ID,
@@ -195,10 +194,9 @@ def containerise(name,
     lib.imprint(container, data)
 
     # "Parent" the container under the container network
-    hou.moveNodesTo([container], main_container)
+    hou.moveNodesTo([container], subnet)
 
-    # Get the container and set good position
-    main_container.node(name).moveToGoodPosition()
+    subnet.node(container_name).moveToGoodPosition()
 
     return container
 
@@ -265,7 +263,7 @@ class Creator(api.Creator):
     """
 
     def __init__(self, *args, **kwargs):
-        api.Creator.__init__(self, *args, **kwargs)
+        super(Creator, self).__init__(*args, **kwargs)
         self.nodes = list()
 
     def process(self):
@@ -302,25 +300,24 @@ def process(self):
             node_type = "geometry"
 
         # Get out node
-        out = hou.node("out")
-        instance = out.createNode(node_type, node_name=self.data["subset"])
+        out = hou.node("/out")
+        instance = out.createNode(node_type, node_name=self.name)
         instance.moveToGoodPosition()
 
         lib.imprint(instance, self.data)
 
         return instance
 
 
-def _on_scene_open(*args):
-    api.emit("open", *[])
-
-
-def _on_scene_new(*args):
-    api.emit("new", *[])
-
-
-def _on_scene_save(*args):
-    api.emit("save", *[])
+def on_file_event_callback(event):
+    if event == hou.hipFileEventType.AfterLoad:
+        api.emit("open", [event])
+    elif event == hou.hipFileEventType.AfterSave:
+        api.emit("save", [event])
+    elif event == hou.hipFileEventType.BeforeSave:
+        api.emit("before_save", [event])
+    elif event == hou.hipFileEventType.AfterClear:
+        api.emit("new", [event])
 
 
 def on_houdini_initialize():
@@ -340,8 +337,6 @@ def _register_callbacks():
         except RuntimeError as e:
             logger.info(e)
 
-    self._events[_on_scene_save] = hou.hipFile.addEventCallback(_on_scene_save)
-
-    self._events[_on_scene_new] = hou.hipFile.addEventCallback(_on_scene_new)
-
-    self._events[_on_scene_open] = hou.hipFile.addEventCallback(_on_scene_open)
+    self._events[on_file_event_callback] = hou.hipFile.addEventCallback(
+        on_file_event_callback
+    )

avalon/houdini/workio.py

@@ -0,0 +1,59 @@
+"""Host API required Work Files tool"""
+import os
+
+import hou
+
+
+def file_extensions():
+    return [".hip", ".hiplc", ".hipnc"]
+
+
+def has_unsaved_changes():
+    return hou.hipFile.hasUnsavedChanges()
+
+
+def save(filepath):
+
+    # Force forwards slashes to avoid segfault
+    filepath = filepath.replace("\\", "/")
+
+    hou.hipFile.save(file_name=filepath,
+                     save_to_recent_files=True)
+
+    return filepath
+
+
+def open(filepath):
+
+    # Force forwards slashes to avoid segfault
+    filepath = filepath.replace("\\", "/")
+
+    hou.hipFile.load(filepath,
+                     suppress_save_prompt=True,
+                     ignore_load_warnings=False)
+
+    return filepath
+
+
+def current_file():
+
+    current_filepath = hou.hipFile.path()
+    if (os.path.basename(current_filepath) == "untitled.hip" and
+            not os.path.exists(current_filepath)):
+        # By default a new scene in houdini is saved in the current
+        # working directory as "untitled.hip" so we need to capture
+        # that and consider it 'not saved' when it's in that state.
+        return None
+
+    return current_filepath
+
+
+def work_root():
+    from avalon import api
+
+    work_dir = api.Session["AVALON_WORKDIR"]
+    scene_dir = api.Session.get("AVALON_SCENEDIR")
+    if scene_dir:
+        return os.path.join(work_dir, scene_dir)
+    else:
+        return work_dir

avalon/inventory.py

@@ -326,6 +326,7 @@ def _save_config_1_0(project_name, data):
     config["tasks"] = data.get("tasks", [])
     config["template"].update(data.get("template", {}))
     config["families"] = data.get("families", [])
+    config["groups"] = data.get("groups", [])
 
     schema.validate(document)
 

avalon/io.py

@@ -135,6 +135,9 @@ def _from_environment():
             # Path to working directory
             ("AVALON_WORKDIR", None),
 
+            # Optional path to scenes directory (see Work Files API)
+            ("AVALON_SCENEDIR", None),
+
             # Name of current Config
             # TODO(marcus): Establish a suitable default config
             ("AVALON_CONFIG", "no_config"),

avalon/maya/__init__.py

@@ -26,6 +26,15 @@
 
 )
 
+from .workio import (
+    open,
+    save,
+    current_file,
+    has_unsaved_changes,
+    file_extensions,
+    work_root
+)
+
 from .lib import (
     export_alembic,
     lsattr,
@@ -61,6 +70,15 @@
     "is_locked",
     "lock_ignored",
 
+    # Workfiles API
+    "open",
+    "save",
+    "current_file",
+    "has_unsaved_changes",
+    "file_extensions",
+    "work_root",
+
+    # Utility functions
     "export_alembic",
     "lsattr",
     "lsattrs",