From 6bb622e4fcdbbf306d4a78583e8f15b7864e82d7 Mon Sep 17 00:00:00 2001 From: Cyprien CAILLOT Date: Wed, 11 Sep 2024 16:08:42 +0200 Subject: [PATCH 1/2] Enhancement: Properly propagate project name in Workfile Template Builder --- .../workfile/workfile_template_builder.py | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 3096d22518b..e5fc44f8e1b 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -123,11 +123,18 @@ def __init__(self, host): self._linked_asset_docs = None self._task_type = None + if isinstance(self._host, HostBase): + self._project_name = self._host.get_current_project_name() + else: + self._project_name = os.getenv("AVALON_PROJECT") + @property def project_name(self): - if isinstance(self._host, HostBase): - return self._host.get_current_project_name() - return os.getenv("AVALON_PROJECT") + return self._project_name + + @project_name.setter + def project_name(self, name): + self._project_name = name @property def current_asset_name(self): @@ -866,6 +873,7 @@ class PlaceholderPlugin(object): def __init__(self, builder): self._builder = builder + self._project_name = self.builder.project_name @property def builder(self): @@ -881,6 +889,10 @@ def builder(self): def project_name(self): return self._builder.project_name + @project_name.setter + def project_name(self, name): + self._project_name = name + @property def log(self): """Dynamically created logger for the plugin.""" @@ -1599,7 +1611,7 @@ def _get_representations(self, placeholder): if "folder_path" in placeholder.data: return [] - project_name = self.builder.project_name + self.project_name = self.builder.project_name current_asset_doc = self.builder.current_asset_doc linked_asset_docs = self.builder.linked_asset_docs @@ -1630,6 +1642,8 @@ def _get_representations(self, placeholder): } else: + if builder_type != "all_assets": + self.project_name = builder_type context_filters = { "asset": [re.compile(placeholder.data["asset"])], "subset": [re.compile(placeholder.data["subset"])], @@ -1639,7 +1653,7 @@ def _get_representations(self, placeholder): } return list(get_representations( - project_name, + self.project_name, context_filters=context_filters )) From 7fb374f6c9bdf042177b5466e935db5a506b1525 Mon Sep 17 00:00:00 2001 From: Cyprien CAILLOT Date: Wed, 11 Sep 2024 16:09:59 +0200 Subject: [PATCH 2/2] Enhancement: Properly propagate project name in Workfile Template Builder --- openpype/pipeline/workfile/workfile_template_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index e5fc44f8e1b..b02d12762c0 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -887,7 +887,7 @@ def builder(self): @property def project_name(self): - return self._builder.project_name + return self._project_name @project_name.setter def project_name(self, name):