From 3d2a39b592ae11a96bbb1f293d632110629e034a Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 7 Jan 2022 22:45:42 +0100 Subject: [PATCH] trigger before save event as first thing --- openpype/pipeline/lib/events.py | 11 +++-------- openpype/tools/workfiles/app.py | 6 +++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/openpype/pipeline/lib/events.py b/openpype/pipeline/lib/events.py index d9920b38e3..05dea20e8c 100644 --- a/openpype/pipeline/lib/events.py +++ b/openpype/pipeline/lib/events.py @@ -45,12 +45,7 @@ class BaseEvent(object): class BeforeWorkfileSave(BaseEvent): """Before workfile changes event data.""" - def __init__(self, new_workfile, workdir): - data = { - "workfile_path": new_workfile, - "workdir_path": workdir - } - super(BeforeWorkfileSave, self).__init__("before.workfile.save", data) - - self.workfile_path = new_workfile + def __init__(self, filename, workdir): + super(BeforeWorkfileSave, self).__init__("before.workfile.save") + self.filename = filename self.workdir_path = workdir diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py index 703d077448..92cb23b619 100644 --- a/openpype/tools/workfiles/app.py +++ b/openpype/tools/workfiles/app.py @@ -654,6 +654,9 @@ class FilesWidget(QtWidgets.QWidget): if not work_file: return + # Trigger before save event + BeforeWorkfileSave.emit(work_file, self._workdir_path) + # Initialize work directory if it has not been initialized before if not os.path.exists(self._workfiles_root): log.debug("Initializing Work Directory: %s", self._workfiles_root) @@ -670,9 +673,6 @@ class FilesWidget(QtWidgets.QWidget): file_path = os.path.join( os.path.normpath(self._workfiles_root), work_file ) - - BeforeWorkfileSave.emit(file_path, self._workdir_path) - self._enter_session() # Make sure we are in the right session self.host.save_file(file_path)