Merge pull request #3504 from pypeclub/bugfix/traypublisher_fill_host_name

TrayPublisher: Make sure host name is filled

openpype/hosts/traypublisher/api/__init__.py

@@ -1,20 +1,8 @@
 from .pipeline import (
-    install,
-    ls,
-
-    set_project_name,
-    get_context_title,
-    get_context_data,
-    update_context_data,
+    TrayPublisherHost,
 )
 
 
 __all__ = (
-    "install",
-    "ls",
-
-    "set_project_name",
-    "get_context_title",
-    "get_context_data",
-    "update_context_data",
+    "TrayPublisherHost",
 )

openpype/hosts/traypublisher/api/pipeline.py

@@ -9,6 +9,8 @@ from openpype.pipeline import (
     register_creator_plugin_path,
     legacy_io,
 )
+from openpype.host import HostBase, INewPublisher
+
 
 ROOT_DIR = os.path.dirname(os.path.dirname(
     os.path.abspath(__file__)
@@ -17,6 +19,35 @@ PUBLISH_PATH = os.path.join(ROOT_DIR, "plugins", "publish")
 CREATE_PATH = os.path.join(ROOT_DIR, "plugins", "create")
 
 
+class TrayPublisherHost(HostBase, INewPublisher):
+    name = "traypublisher"
+
+    def install(self):
+        os.environ["AVALON_APP"] = self.name
+        legacy_io.Session["AVALON_APP"] = self.name
+
+        pyblish.api.register_host("traypublisher")
+        pyblish.api.register_plugin_path(PUBLISH_PATH)
+        register_creator_plugin_path(CREATE_PATH)
+
+    def get_context_title(self):
+        return HostContext.get_project_name()
+
+    def get_context_data(self):
+        return HostContext.get_context_data()
+
+    def update_context_data(self, data, changes):
+        HostContext.save_context_data(data, changes)
+
+    def set_project_name(self, project_name):
+        # TODO Deregister project specific plugins and register new project
+        #   plugins
+        os.environ["AVALON_PROJECT"] = project_name
+        legacy_io.Session["AVALON_PROJECT"] = project_name
+        legacy_io.install()
+        HostContext.set_project_name(project_name)
+
+
 class HostContext:
     _context_json_path = None
 
@@ -150,32 +181,3 @@ def get_context_data():
 
 def update_context_data(data, changes):
     HostContext.save_context_data(data)
-
-
-def get_context_title():
-    return HostContext.get_project_name()
-
-
-def ls():
-    """Probably will never return loaded containers."""
-    return []
-
-
-def install():
-    """This is called before a project is known.
-
-    Project is defined with 'set_project_name'.
-    """
-    os.environ["AVALON_APP"] = "traypublisher"
-
-    pyblish.api.register_host("traypublisher")
-    pyblish.api.register_plugin_path(PUBLISH_PATH)
-    register_creator_plugin_path(CREATE_PATH)
-
-
-def set_project_name(project_name):
-    # TODO Deregister project specific plugins and register new project plugins
-    os.environ["AVALON_PROJECT"] = project_name
-    legacy_io.Session["AVALON_PROJECT"] = project_name
-    legacy_io.install()
-    HostContext.set_project_name(project_name)

openpype/hosts/traypublisher/api/plugin.py

@@ -37,6 +37,21 @@ class TrayPublishCreator(Creator):
         # Use same attributes as for instance attrobites
         return self.get_instance_attr_defs()
 
+    def _store_new_instance(self, new_instance):
+        """Tray publisher specific method to store instance.
+
+        Instance is stored into "workfile" of traypublisher and also add it
+        to CreateContext.
+
+        Args:
+            new_instance (CreatedInstance): Instance that should be stored.
+        """
+
+        # Host implementation of storing metadata about instance
+        HostContext.add_instance(new_instance.data_to_store())
+        # Add instance to current context
+        self._add_instance_to_context(new_instance)
+
 
 class SettingsCreator(TrayPublishCreator):
     create_allow_context_change = True
@@ -58,10 +73,8 @@ class SettingsCreator(TrayPublishCreator):
         data["settings_creator"] = True
         # Create new instance
         new_instance = CreatedInstance(self.family, subset_name, data, self)
-        # Host implementation of storing metadata about instance
-        HostContext.add_instance(new_instance.data_to_store())
-        # Add instance to current context
-        self._add_instance_to_context(new_instance)
+
+        self._store_new_instance(new_instance)
 
     def get_instance_attr_defs(self):
         return [

openpype/pipeline/create/creator_plugins.py

@@ -102,6 +102,10 @@ class BaseCreator:
 
         return self.create_context.project_name
 
+    @property
+    def host(self):
+        return self.create_context.host
+
     def get_group_label(self):
         """Group label under which are instances grouped in UI.
 

openpype/tools/traypublisher/window.py

@@ -12,9 +12,7 @@ from openpype.pipeline import (
     install_host,
     AvalonMongoDB,
 )
-from openpype.hosts.traypublisher import (
-    api as traypublisher
-)
+from openpype.hosts.traypublisher.api import TrayPublisherHost
 from openpype.tools.publisher import PublisherWindow
 from openpype.tools.utils.constants import PROJECT_NAME_ROLE
 from openpype.tools.utils.models import (
@@ -111,9 +109,13 @@ class StandaloneOverlayWidget(QtWidgets.QFrame):
         if project_name:
             self._set_project(project_name)
 
+    @property
+    def host(self):
+        return self._publisher_window.controller.host
+
     def _set_project(self, project_name):
         self._project_name = project_name
-        traypublisher.set_project_name(project_name)
+        self.host.set_project_name(project_name)
         self.setVisible(False)
         self.project_selected.emit(project_name)
 
@@ -190,7 +192,8 @@ class TrayPublishWindow(PublisherWindow):
 
 
 def main():
-    install_host(traypublisher)
+    host = TrayPublisherHost()
+    install_host(host)
     app = QtWidgets.QApplication([])
     window = TrayPublishWindow()
     window.show()