Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

[QUAD] Enhancement: Properly propagate project name in Workfile Template Builder #6339

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions openpype/pipeline/workfile/workfile_template_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand All @@ -879,7 +887,11 @@ 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):
self._project_name = name

@property
def log(self):
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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"])],
Expand All @@ -1639,7 +1653,7 @@ def _get_representations(self, placeholder):
}

return list(get_representations(
project_name,
self.project_name,
context_filters=context_filters
))

Expand Down
Loading