use extracted workdir function in prelaunch hook

This commit is contained in:
iLLiCiTiT 2021-01-06 11:09:47 +01:00
parent 5b6b708090
commit 6e328609ca

View file

@ -11,7 +11,9 @@ from pype.api import (
from pype.lib import (
env_value_to_bool,
PreLaunchHook,
ApplicationLaunchFailed
ApplicationLaunchFailed,
get_workdir_data,
get_workdir_with_workdir_data,
)
import acre
@ -140,8 +142,8 @@ class GlobalHostDataHook(PreLaunchHook):
)
return
workdir_data = self._prepare_workdir_data(
project_doc, asset_doc, task_name
workdir_data = get_workdir_data(
project_doc, asset_doc, task_name, self.host_name
)
self.data["workdir_data"] = workdir_data
@ -149,8 +151,7 @@ class GlobalHostDataHook(PreLaunchHook):
anatomy = self.data["anatomy"]
try:
anatomy_filled = anatomy.format(workdir_data)
workdir = os.path.normpath(anatomy_filled["work"]["folder"])
workdir = get_workdir_with_workdir_data(workdir_data, anatomy)
if not os.path.exists(workdir):
self.log.debug(
"Creating workdir folder: \"{}\"".format(workdir)
@ -180,21 +181,6 @@ class GlobalHostDataHook(PreLaunchHook):
self.prepare_last_workfile(workdir)
def _prepare_workdir_data(self, project_doc, asset_doc, task_name):
hierarchy = "/".join(asset_doc["data"]["parents"])
data = {
"project": {
"name": project_doc["name"],
"code": project_doc["data"].get("code")
},
"task": task_name,
"asset": asset_doc["name"],
"app": self.host_name,
"hierarchy": hierarchy
}
return data
def prepare_last_workfile(self, workdir):
"""last workfile workflow preparation.