From c9e714a7afc37f98c9cb4792fa42b53b1b2272c3 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 12:00:21 +0200
Subject: [PATCH] implemented tray publisher host using HostBase

---
 openpype/hosts/traypublisher/api/__init__.py | 16 +-----
 openpype/hosts/traypublisher/api/pipeline.py | 60 ++++++++++----------
 openpype/tools/traypublisher/window.py       | 13 +++--
 3 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/openpype/hosts/traypublisher/api/__init__.py b/openpype/hosts/traypublisher/api/__init__.py
index c461c0c526..4e7284b09a 100644
--- a/openpype/hosts/traypublisher/api/__init__.py
+++ b/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",
 )
diff --git a/openpype/hosts/traypublisher/api/pipeline.py b/openpype/hosts/traypublisher/api/pipeline.py
index 954a0bae47..2d9db7801e 100644
--- a/openpype/hosts/traypublisher/api/pipeline.py
+++ b/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)
diff --git a/openpype/tools/traypublisher/window.py b/openpype/tools/traypublisher/window.py
index 5934c4aa8a..cc33287091 100644
--- a/openpype/tools/traypublisher/window.py
+++ b/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()