From 4504078481da5cf0ebf7128cf7fdc3062d3c926e Mon Sep 17 00:00:00 2001
From: Kaa Maurice <kaalium@gmail.com>
Date: Mon, 15 Aug 2022 16:28:33 +0200
Subject: [PATCH 1/2] publisher collect current workfile as publishable
 representation

---
 .../plugins/publish/collect_current_file.py   | 71 +++++++++++++++++--
 1 file changed, 67 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/blender/plugins/publish/collect_current_file.py b/openpype/hosts/blender/plugins/publish/collect_current_file.py
index 72976c490b..1ca28f67f6 100644
--- a/openpype/hosts/blender/plugins/publish/collect_current_file.py
+++ b/openpype/hosts/blender/plugins/publish/collect_current_file.py
@@ -1,6 +1,23 @@
+import os
 import bpy
 
 import pyblish.api
+from openpype.pipeline import legacy_io
+from openpype.hosts.blender.api import workio
+
+
+class SaveWorkfiledAction(pyblish.api.Action):
+    """Save Workfile."""
+    label = "Save Workfile"
+    on = "failed"
+    icon = "save"
+
+    def process(self, context, plugin):
+        current_file = workio.current_file()
+        if current_file:
+            workio.save_file(current_file)
+        else:
+            bpy.ops.wm.avalon_workfiles()
 
 
 class CollectBlenderCurrentFile(pyblish.api.ContextPlugin):
@@ -8,12 +25,58 @@ class CollectBlenderCurrentFile(pyblish.api.ContextPlugin):
 
     order = pyblish.api.CollectorOrder - 0.5
     label = "Blender Current File"
-    hosts = ['blender']
+    hosts = ["blender"]
+    actions = [SaveWorkfiledAction]
 
     def process(self, context):
         """Inject the current working file"""
-        current_file = bpy.data.filepath
-        context.data['currentFile'] = current_file
+        current_file = workio.current_file()
+        has_unsaved_changes = workio.has_unsaved_changes()
 
-        assert current_file != '', "Current file is empty. " \
+        context.data["currentFile"] = current_file
+
+        assert current_file, (
+            "Current file is empty. Save the file before continuing."
+        )
+
+        assert not has_unsaved_changes, (
+            "Current file has unsaved changes. "
             "Save the file before continuing."
+        )
+
+        folder, file = os.path.split(current_file)
+        filename, ext = os.path.splitext(file)
+
+        task = legacy_io.Session["AVALON_TASK"]
+
+        data = {}
+
+        # create instance
+        instance = context.create_instance(name=filename)
+        subset = "workfile" + task.capitalize()
+
+        data.update({
+            "subset": subset,
+            "asset": os.getenv("AVALON_ASSET", None),
+            "label": subset,
+            "publish": True,
+            "family": "workfile",
+            "families": ["workfile"],
+            "setMembers": [current_file],
+            "frameStart": bpy.context.scene.frame_start,
+            "frameEnd": bpy.context.scene.frame_end,
+        })
+
+        data["representations"] = [{
+            "name": ext.lstrip("."),
+            "ext": ext.lstrip("."),
+            "files": file,
+            "stagingDir": folder,
+        }]
+
+        instance.data.update(data)
+
+        self.log.info("Collected instance: {}".format(file))
+        self.log.info("Scene path: {}".format(current_file))
+        self.log.info("staging Dir: {}".format(folder))
+        self.log.info("subset: {}".format(subset))

From f9182cb0f9979179f4b0647e915d630e635b81e7 Mon Sep 17 00:00:00 2001
From: Kaa Maurice <kaalium@gmail.com>
Date: Tue, 23 Aug 2022 17:58:19 +0200
Subject: [PATCH 2/2] remove unsaved changes check

---
 .../blender/plugins/publish/collect_current_file.py  | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/openpype/hosts/blender/plugins/publish/collect_current_file.py b/openpype/hosts/blender/plugins/publish/collect_current_file.py
index 1ca28f67f6..c3097a0694 100644
--- a/openpype/hosts/blender/plugins/publish/collect_current_file.py
+++ b/openpype/hosts/blender/plugins/publish/collect_current_file.py
@@ -13,11 +13,7 @@ class SaveWorkfiledAction(pyblish.api.Action):
     icon = "save"
 
     def process(self, context, plugin):
-        current_file = workio.current_file()
-        if current_file:
-            workio.save_file(current_file)
-        else:
-            bpy.ops.wm.avalon_workfiles()
+        bpy.ops.wm.avalon_workfiles()
 
 
 class CollectBlenderCurrentFile(pyblish.api.ContextPlugin):
@@ -31,7 +27,6 @@ class CollectBlenderCurrentFile(pyblish.api.ContextPlugin):
     def process(self, context):
         """Inject the current working file"""
         current_file = workio.current_file()
-        has_unsaved_changes = workio.has_unsaved_changes()
 
         context.data["currentFile"] = current_file
 
@@ -39,11 +34,6 @@ class CollectBlenderCurrentFile(pyblish.api.ContextPlugin):
             "Current file is empty. Save the file before continuing."
         )
 
-        assert not has_unsaved_changes, (
-            "Current file has unsaved changes. "
-            "Save the file before continuing."
-        )
-
         folder, file = os.path.split(current_file)
         filename, ext = os.path.splitext(file)