Merge branch 'develop'

Author: iLLiCiTiT

.gitignore

@@ -1,4 +1,5 @@
 *.egg-info
+*.dist-info
 dist
 cover
 .coverage

avalon/__main__.py

@@ -1,10 +1,14 @@
 import argparse
 
-from . import pipeline
+from . import pipeline, version
 
 
-if __name__ == '__main__':
+def main():
     parser = argparse.ArgumentParser()
+    parser.add_argument("--version", action="store_true", help=(
+        "Print version and exit"))
+    parser.add_argument("--root",
+                        help="Absolute path to root directory of assets")
     parser.add_argument("--creator", action="store_true",
                         help="Launch Instance Creator in standalone mode")
     parser.add_argument("--loader", action="store_true",
@@ -13,14 +17,16 @@
                         help="Launch Manager in standalone mode")
     parser.add_argument("--projectmanager", action="store_true",
                         help="Launch Manager in standalone mode")
-    parser.add_argument("--root",
-                        help="Absolute path to root directory of assets")
 
     args, unknown = parser.parse_known_args()
     host = pipeline.debug_host()
     pipeline.register_host(host)
 
-    if args.creator:
+    if args.version:
+        print("avalon==%s" % version.version)
+        exit(0)
+
+    elif args.creator:
         from .tools import creator
         creator.show(debug=True)
 
@@ -35,3 +41,10 @@
     elif args.projectmanager:
         from .tools import projectmanager
         projectmanager.cli(unknown)
+
+    else:
+        parser.print_help()
+
+
+if __name__ == '__main__':
+    main()

avalon/aport/__init__.py

@@ -0,0 +1,19 @@
+"""Public API
+
+Anything that isn't defined here is INTERNAL and unreliable for external use.
+
+"""
+
+from .pipeline import (
+    install,
+    uninstall,
+    reload_pipeline,
+    ls
+)
+
+__all__ = [
+    "install",
+    "uninstall",
+    "reload_pipeline",
+    "ls"
+]

avalon/aport/pipeline.py

@@ -0,0 +1,99 @@
+import os
+import importlib
+from pyblish import api as pyblish
+from avalon import api
+import logging
+
+
+log = logging.getLogger(__name__)
+
+AVALON_CONFIG = os.environ["AVALON_CONFIG"]
+
+
+def ls():
+    pass
+
+
+def reload_pipeline():
+    """Attempt to reload pipeline at run-time.
+
+    CAUTION: This is primarily for development and debugging purposes.
+
+    """
+
+    import importlib
+
+    api.uninstall()
+
+    for module in ("avalon.io",
+                   "avalon.lib",
+                   "avalon.pipeline",
+                   "avalon.api",
+                   "avalon.tools",
+
+                   "avalon.tools.loader.app",
+                   "avalon.tools.creator.app",
+                   "avalon.tools.manager.app",
+
+                   "avalon.aport",
+                   "avalon.aport.pipeline",
+                   "{}".format(AVALON_CONFIG)
+                   ):
+        log.info("Reloading module: {}...".format(module))
+        module = importlib.import_module(module)
+        reload(module)
+
+    import avalon.aport
+    api.install(avalon.aport)
+
+
+def install(config):
+    """Install Aport-specific functionality of avalon-core.
+
+    This is where you install menus and register families, data
+    and loaders into Aport.
+
+    It is called automatically when installing via `api.install(avalon.aport)`.
+
+    See the Maya equivalent for inspiration on how to implement this.
+
+    """
+
+    pyblish.register_host("aport")
+    # Trigger install on the config's "aport" package
+    config = find_host_config(config)
+
+    if hasattr(config, "install"):
+        config.install()
+
+    log.info("config.aport installed")
+
+
+def find_host_config(config):
+    try:
+        config = importlib.import_module(config.__name__ + ".aport")
+    except ImportError as exc:
+        if str(exc) != "No module name {}".format(
+                config.__name__ + ".aport"):
+            raise
+        config = None
+
+    return config
+
+
+def uninstall(config):
+    """Uninstall all tha was installed
+
+    This is where you undo everything that was done in `install()`.
+    That means, removing menus, deregistering families and  data
+    and everything. It should be as though `install()` was never run,
+    because odds are calling this function means the user is interested
+    in re-installing shortly afterwards. If, for example, he has been
+    modifying the menu or registered families.
+
+    """
+    config = find_host_config(config)
+    if hasattr(config, "uninstall"):
+        config.uninstall()
+
+    pyblish.deregister_host("aport")

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)