From 2f5494cc76e25e4e5b7bdc3e743da0e279d8c256 Mon Sep 17 00:00:00 2001
From: Mustafa-Zarkash <mustafataherzaky@outlook.com>
Date: Fri, 15 Sep 2023 17:02:49 +0300
Subject: [PATCH] make few publisher attributes and methods public

---
 openpype/hosts/houdini/api/lib.py  | 34 +++++++++++++++---------------
 openpype/tools/publisher/window.py | 14 ++++++++++++
 openpype/tools/utils/host_tools.py | 12 +++++++----
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/openpype/hosts/houdini/api/lib.py b/openpype/hosts/houdini/api/lib.py
index 7e346d7285..688916a507 100644
--- a/openpype/hosts/houdini/api/lib.py
+++ b/openpype/hosts/houdini/api/lib.py
@@ -657,21 +657,22 @@ def get_color_management_preferences():
     }
 
 
-def publisher_show_and_publish():
+def publisher_show_and_publish(comment = ""):
     """Open publisher window and trigger publishing action."""
 
     main_window = get_main_window()
     publisher_window = get_tool_by_name(
         tool_name="publisher",
-        parent=main_window
+        parent=main_window,
+        reset_on_show=False
     )
 
     publisher_window.set_current_tab("publish")
     publisher_window.make_sure_is_visible()
-    publisher_window._reset_on_show = False
-
-    publisher_window._controller.reset()
-    publisher_window._controller.publish()
+    publisher_window.reset_on_show = False
+    publisher_window.set_comment_input_text(comment)
+    publisher_window.reset()
+    publisher_window.click_publish()
 
 
 def self_publish():
@@ -689,19 +690,18 @@ def self_publish():
 
         active = current_node == node_path
         instance["active"] = active
-
-        if active:
-            result, comment = hou.ui.readInput(
-                "Add Publish Note",
-                buttons=("Ok", "Cancel"),
-                title="Publish Note",
-                close_choice=1
-            )
-            if not result:
-                instance.data["comment"] = comment
+        hou.node(node_path).parm("active").set(active)
 
     context.save_changes()
-    publisher_show_and_publish()
+
+    result, comment = hou.ui.readInput(
+        "Add Publish Note",
+        buttons=("Ok", "Cancel"),
+        title="Publish Note",
+        close_choice=1
+    )
+
+    publisher_show_and_publish(comment)
 
 
 def add_self_publish_button(node):
diff --git a/openpype/tools/publisher/window.py b/openpype/tools/publisher/window.py
index 39e78c01bb..9214c0a43f 100644
--- a/openpype/tools/publisher/window.py
+++ b/openpype/tools/publisher/window.py
@@ -388,6 +388,20 @@ class PublisherWindow(QtWidgets.QDialog):
     def controller(self):
         return self._controller
 
+    @property
+    def reset_on_show(self):
+        return self._reset_on_show
+
+    @reset_on_show.setter
+    def reset_on_show(self, value):
+        self._reset_on_show = value
+
+    def set_comment_input_text(self, text=""):
+        self._comment_input.setText(text)
+
+    def click_publish(self):
+        self._on_publish_clicked()
+
     def make_sure_is_visible(self):
         if self._window_is_visible:
             self.setWindowState(QtCore.Qt.WindowActive)
diff --git a/openpype/tools/utils/host_tools.py b/openpype/tools/utils/host_tools.py
index 2ebc973a47..3e891e1847 100644
--- a/openpype/tools/utils/host_tools.py
+++ b/openpype/tools/utils/host_tools.py
@@ -261,7 +261,7 @@ class HostToolsHelper:
             dialog.activateWindow()
             dialog.showNormal()
 
-    def get_publisher_tool(self, parent=None, controller=None):
+    def get_publisher_tool(self, parent=None, controller=None, reset_on_show=None):
         """Create, cache and return publisher window."""
 
         if self._publisher_tool is None:
@@ -271,15 +271,19 @@ class HostToolsHelper:
             ILoadHost.validate_load_methods(host)
 
             publisher_window = PublisherWindow(
-                controller=controller, parent=parent or self._parent
+                controller=controller,
+                parent=parent or self._parent,
+                reset_on_show=reset_on_show
             )
             self._publisher_tool = publisher_window
 
         return self._publisher_tool
 
-    def show_publisher_tool(self, parent=None, controller=None, tab=None):
+    def show_publisher_tool(
+        self, parent=None, controller=None, reset_on_show=None, tab=None
+    ):
         with qt_app_context():
-            window = self.get_publisher_tool(parent, controller)
+            window = self.get_publisher_tool(parent, controller, reset_on_show)
             if tab:
                 window.set_current_tab(tab)
             window.make_sure_is_visible()