Merge pull request #19 from ynput/chore/new_publisher_pyblish_combo

Use Publisher instead of pyblish pype

client/ayon_harmony/api/TB_sceneOpened.js

@@ -395,22 +395,6 @@ function start() {
     var action = menu.addAction('Create...');
     action.triggered.connect(self.onCreator);
 
-
-    /**
-     * Show Workfiles
-     */
-    self.onWorkfiles = function() {
-        app.ayonClient.send({
-            'module': 'ayon_harmony.api.lib',
-            'method': 'show',
-            'args': ['workfiles']
-        }, false);
-    };
-    if (app.ayonMenu == null) {
-        action = menu.addAction('Workfiles...');
-        action.triggered.connect(self.onWorkfiles);
-    }
-
     /**
      * Show Loader
      */
@@ -434,7 +418,7 @@ function start() {
         app.ayonClient.send({
             'module': 'ayon_harmony.api.lib',
             'method': 'show',
-            'args': ['publish']
+            'args': ['publisher']
         }, false);
     };
     // add Publisher item to menu
@@ -460,19 +444,19 @@ function start() {
     }
 
     /**
-      * Show Subset Manager
-      */
-    self.onSubsetManage = function() {
+     * Show Workfiles
+     */
+    self.onWorkfiles = function() {
         app.ayonClient.send({
             'module': 'ayon_harmony.api.lib',
             'method': 'show',
-            'args': ['subsetmanager']
+            'args': ['workfiles']
         }, false);
     };
-    // add Subset Manager item to menu
     if (app.ayonMenu == null) {
-        action = menu.addAction('Subset Manager...');
-        action.triggered.connect(self.onSubsetManage);
+        menu.addSeparator();
+        action = menu.addAction('Workfiles...');
+        action.triggered.connect(self.onWorkfiles);
     }
 
      /**
@@ -488,8 +472,10 @@ function start() {
             false
           );
     };
+
     // add Set Scene Settings
     if (app.ayonMenu == null) {
+        menu.addSeparator();
         action = menu.addAction('Set Scene Settings...');
         action.triggered.connect(self.onSetSceneSettings);
     }
@@ -504,8 +490,8 @@ function start() {
             'args': ['experimental_tools']
         }, false);
     };
-    // add Subset Manager item to menu
     if (app.ayonMenu == null) {
+        menu.addSeparator();
         action = menu.addAction('Experimental Tools...');
         action.triggered.connect(self.onExperimentalTools);
     }

client/ayon_harmony/api/__init__.py

@@ -5,7 +5,7 @@
 """
 from .pipeline import (
     ls,
-    install,
+    HarmonyHost,
     list_instances,
     remove_instance,
     select_instance,
@@ -16,7 +16,6 @@
     check_inventory,
     application_launch,
     export_template,
-    on_pyblish_instance_toggled,
     inject_ayon_js,
 )
 
@@ -49,7 +48,7 @@
 __all__ = [
     # pipeline
     "ls",
-    "install",
+    "HarmonyHost",
     "list_instances",
     "remove_instance",
     "select_instance",
@@ -60,7 +59,6 @@
     "check_inventory",
     "application_launch",
     "export_template",
-    "on_pyblish_instance_toggled",
     "inject_ayon_js",
 
     # lib

client/ayon_harmony/api/lib.py

@@ -186,9 +186,9 @@ def launch(application_path, *args):
 
     """
     from ayon_core.pipeline import install_host
-    from ayon_harmony import api as harmony
+    from ayon_harmony.api import HarmonyHost
 
-    install_host(harmony)
+    install_host(HarmonyHost())
 
     ProcessContext.port = random.randrange(49152, 65535)
     os.environ["AYON_HARMONY_PORT"] = str(ProcessContext.port)
@@ -401,6 +401,8 @@ def show(tool_name):
     kwargs = {}
     if tool_name == "loader":
         kwargs["use_context"] = True
+    elif tool_name == "publisher":
+        kwargs["tab"] = "publish"
 
     ProcessContext.execute_in_main_thread(
         lambda: host_tools.show_tool_by_name(tool_name, **kwargs)

client/ayon_harmony/api/pipeline.py

@@ -5,6 +5,11 @@
 import pyblish.api
 
 from ayon_core.lib import register_event_callback
+from ayon_core.host import (
+    HostBase,
+    IWorkfileHost,
+    ILoadHost,
+)
 from ayon_core.pipeline import (
     register_loader_plugin_path,
     register_creator_plugin_path,
@@ -18,6 +23,14 @@
 from ayon_harmony import HARMONY_ADDON_ROOT
 import ayon_harmony.api as harmony
 
+from .workio import (
+    open_file,
+    save_file,
+    current_file,
+    has_unsaved_changes,
+    file_extensions,
+    work_root
+)
 
 log = logging.getLogger("ayon_harmony")
 
@@ -28,6 +41,53 @@
 INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory")
 
 
+class HarmonyHost(HostBase, IWorkfileHost, ILoadHost):
+    name = "harmony"
+
+    def install(self):
+        """Install Pype as host config."""
+        print("Installing AYON Harmony Host ...")
+
+        pyblish.api.register_host("harmony")
+        pyblish.api.register_plugin_path(PUBLISH_PATH)
+        register_loader_plugin_path(LOAD_PATH)
+        register_creator_plugin_path(CREATE_PATH)
+
+        register_event_callback("application.launched", application_launch)
+
+    def uninstall(self):
+        pyblish.api.deregister_plugin_path(PUBLISH_PATH)
+        deregister_loader_plugin_path(LOAD_PATH)
+        deregister_creator_plugin_path(CREATE_PATH)
+
+    def open_workfile(self, filepath):
+        return open_file(filepath)
+
+    def save_workfile(self, filepath=None):
+        return save_file(filepath)
+
+    def work_root(self, session):
+        return work_root(session)
+
+    def get_current_workfile(self):
+        return current_file()
+
+    def workfile_has_unsaved_changes(self):
+        return has_unsaved_changes()
+
+    def get_workfile_extensions(self):
+        return file_extensions()
+
+    def get_containers(self):
+        return ls()
+
+    # def get_context_data(self):
+    #     raise NotImplementedError()
+    #
+    # def update_context_data(self, data, changes):
+    #     raise NotImplementedError()
+
+
 def set_scene_settings(settings):
     """Set correct scene settings in Harmony.
 
@@ -246,6 +306,7 @@ def list_instances(remove_orphaned=True):
         Returns:
             (list) of dictionaries matching instances format
     """
+    # TODO: Remove this, refactor to new style Creators instead
     objects = harmony.get_scene_data() or {}
     instances = []
     for key, data in objects.items():
@@ -284,6 +345,7 @@ def remove_instance(instance):
         Args:
             instance (dict): instance representation from subsetmanager model
     """
+    # TODO: Remove this, refactor to new style Creators instead
     node = instance.get("uuid")
     harmony.remove(node)
     harmony.delete_node(node)
@@ -296,6 +358,7 @@ def select_instance(instance):
         Args:
             instance (dict): instance representation from subsetmanager model
     """
+    # TODO: Remove this, refactor to new style Creators instead
     harmony.select_nodes([instance.get("uuid")])
 
 

client/ayon_harmony/api/plugin.py

@@ -10,6 +10,7 @@ class Creator(LegacyCreator):
     If the selection is used, the selected nodes will be connected to the
     created node.
     """
+    # TODO: Refactor to the new creator API
 
     defaults = ["Main"]
     node_type = "COMPOSITE"