From 8934fba38883963349d5773de9dd3c7535bd35fc Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 30 Jul 2020 17:45:05 +0200
Subject: [PATCH 1/3] make png and jpeg configurable in config

---
 pype/plugins/photoshop/publish/extract_image.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pype/plugins/photoshop/publish/extract_image.py b/pype/plugins/photoshop/publish/extract_image.py
index 1bb13bce6b..6dfccdc4f2 100644
--- a/pype/plugins/photoshop/publish/extract_image.py
+++ b/pype/plugins/photoshop/publish/extract_image.py
@@ -13,6 +13,7 @@ class ExtractImage(pype.api.Extractor):
     label = "Extract Image"
     hosts = ["photoshop"]
     families = ["image"]
+    formats = ["png", "jpg"]
 
     def process(self, instance):
 
@@ -32,10 +33,12 @@ class ExtractImage(pype.api.Extractor):
                     if layer.id not in extract_ids:
                         layer.Visible = False
 
-                save_options = {
-                    "png": photoshop.com_objects.PNGSaveOptions(),
-                    "jpg": photoshop.com_objects.JPEGSaveOptions()
-                }
+                save_options = {}
+                if "png" in self.formats:
+                    save_options["png"] = photoshop.com_objects.PNGSaveOptions()
+                if "jpg" in self.formats:
+                    save_options["jpg"] = photoshop.com_objects.JPEGSaveOptions()
+
                 file_basename = os.path.splitext(
                     photoshop.app().ActiveDocument.Name
                 )[0]

From 7394e7284a7ccef06e9c2321088bc0cb7a314b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?=
 <33513211+antirotor@users.noreply.github.com>
Date: Sun, 2 Aug 2020 23:08:55 +0200
Subject: [PATCH 2/3] disable undo/redo during extraction, fix frame num

---
 pype/hosts/harmony/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pype/hosts/harmony/__init__.py b/pype/hosts/harmony/__init__.py
index 3cae695852..d1a9c3ae17 100644
--- a/pype/hosts/harmony/__init__.py
+++ b/pype/hosts/harmony/__init__.py
@@ -151,6 +151,7 @@ def application_launch():
 def export_template(backdrops, nodes, filepath):
     func = """function func(args)
     {
+        scene.beginUndoRedoAccum("Publish: export template");
         // Add an extra node just so a new group can be created.
         var temp_node = node.add("Top", "temp_note", "NOTE", 0, 0, 0);
         var template_group = node.createGroup(temp_node, "temp_group");
@@ -168,7 +169,7 @@ def export_template(backdrops, nodes, filepath):
         };
 
         // Copy-paste the selected nodes into the new group.
-        var drag_object = copyPaste.copy(args[1], 1, frame.numberOf, "");
+        var drag_object = copyPaste.copy(args[1], 1, frame.numberOf(), "");
         copyPaste.pasteNewNodes(drag_object, template_group, "");
 
         // Select all nodes within group and export as template.
@@ -179,6 +180,7 @@ def export_template(backdrops, nodes, filepath):
         // created during the process.
         Action.perform("onActionUpToParent()", "Node View");
         node.deleteNode(template_group, true, true);
+        scene.cancelUndoRedoAccum();
     }
     func
     """

From 0f32a6d056a48c5102d07c023ea335f81224b63a Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej@samohel.cz>
Date: Tue, 4 Aug 2020 13:57:41 +0200
Subject: [PATCH 3/3] use Action.perform copy() to copy nodes

---
 pype/hosts/harmony/__init__.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pype/hosts/harmony/__init__.py b/pype/hosts/harmony/__init__.py
index d1a9c3ae17..d4b7d91fdb 100644
--- a/pype/hosts/harmony/__init__.py
+++ b/pype/hosts/harmony/__init__.py
@@ -151,28 +151,31 @@ def application_launch():
 def export_template(backdrops, nodes, filepath):
     func = """function func(args)
     {
-        scene.beginUndoRedoAccum("Publish: export template");
-        // Add an extra node just so a new group can be created.
+
         var temp_node = node.add("Top", "temp_note", "NOTE", 0, 0, 0);
         var template_group = node.createGroup(temp_node, "temp_group");
         node.deleteNode( template_group + "/temp_note" );
 
-        // This will make Node View to focus on the new group.
+        selection.clearSelection();
+        for (var f = 0; f < args[1].length; f++)
+        {
+            selection.addNodeToSelection(args[1][f]);
+        }
+
+        Action.perform("copy()", "Node View");
+
         selection.clearSelection();
         selection.addNodeToSelection(template_group);
         Action.perform("onActionEnterGroup()", "Node View");
+        Action.perform("paste()", "Node View");
 
         // Recreate backdrops in group.
         for (var i = 0 ; i < args[0].length; i++)
         {
+            MessageLog.trace(args[0][i]);
             Backdrop.addBackdrop(template_group, args[0][i]);
         };
 
-        // Copy-paste the selected nodes into the new group.
-        var drag_object = copyPaste.copy(args[1], 1, frame.numberOf(), "");
-        copyPaste.pasteNewNodes(drag_object, template_group, "");
-
-        // Select all nodes within group and export as template.
         Action.perform( "selectAll()", "Node View" );
         copyPaste.createTemplateFromSelection(args[2], args[3]);
 
@@ -180,7 +183,6 @@ def export_template(backdrops, nodes, filepath):
         // created during the process.
         Action.perform("onActionUpToParent()", "Node View");
         node.deleteNode(template_group, true, true);
-        scene.cancelUndoRedoAccum();
     }
     func
     """