mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-25 21:32:15 +01:00
Simplify get workdir
This commit is contained in:
Roy Nieterau
parent
a37c982a38
commit
5436cf08d5
2 changed files with 16 additions and 50 deletions
|
|
@ -1,16 +1,11 @@
|
|||
import functools
|
||||
import os
|
||||
import uuid
|
||||
import time
|
||||
import tempfile
|
||||
import logging
|
||||
from ayon_core.client import (
|
||||
get_project,
|
||||
get_asset_by_name,
|
||||
)
|
||||
from ayon_core.pipeline import Anatomy
|
||||
from string import Formatter
|
||||
|
||||
from . import CommunicationWrapper
|
||||
from ayon_core.pipeline.template_data import get_template_data
|
||||
|
||||
|
||||
log = logging.getLogger("zbrush.lib")
|
||||
|
|
@ -88,37 +83,8 @@ def execute_zscript_and_wait(zscript,
|
|||
)
|
||||
|
||||
|
||||
def find_first_filled_path(path):
|
||||
if not path:
|
||||
return ""
|
||||
|
||||
fields = set()
|
||||
for item in Formatter().parse(path):
|
||||
_, field_name, format_spec, conversion = item
|
||||
if not field_name:
|
||||
continue
|
||||
conversion = "!{}".format(conversion) if conversion else ""
|
||||
format_spec = ":{}".format(format_spec) if format_spec else ""
|
||||
orig_key = "{{{}{}{}}}".format(
|
||||
field_name, conversion, format_spec)
|
||||
fields.add(orig_key)
|
||||
|
||||
for field in fields:
|
||||
path = path.split(field, 1)[0]
|
||||
return path
|
||||
|
||||
|
||||
def get_workdir(project_name, asset_name, task_name):
|
||||
project = get_project(project_name)
|
||||
asset = get_asset_by_name(project_name, asset_name)
|
||||
|
||||
data = get_template_data(project, asset, task_name)
|
||||
|
||||
anatomy = Anatomy(project_name)
|
||||
workdir = anatomy.templates_obj["work"]["folder"].format(data)
|
||||
|
||||
# Remove any potential un-formatted parts of the path
|
||||
valid_workdir = find_first_filled_path(workdir)
|
||||
def get_workdir():
|
||||
return os.environ["AYON_WORKDIR"]
|
||||
|
||||
# Path is not filled at all
|
||||
if not valid_workdir:
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ class ZbrushHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
|
|||
project_name = get_current_context()["project_name"]
|
||||
folder_path = get_current_context()["folder_path"]
|
||||
task_name = get_current_context()["task_name"]
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
txt_dir = os.path.join(
|
||||
work_dir, ".zbrush_metadata").replace(
|
||||
"\\", "/"
|
||||
|
|
@ -213,7 +213,7 @@ def write_context_metadata(metadata_key, context):
|
|||
project_name = get_current_context()["project_name"]
|
||||
folder_path = get_current_context()["folder_path"]
|
||||
task_name = get_current_context()["task_name"]
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
json_dir = os.path.join(
|
||||
work_dir, ".zbrush_metadata", metadata_key).replace(
|
||||
"\\", "/"
|
||||
|
|
@ -241,7 +241,7 @@ def write_workfile_metadata(metadata_key, data=None):
|
|||
if current_file:
|
||||
current_file = os.path.splitext(
|
||||
os.path.basename(current_file))[0].strip()
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
json_dir = os.path.join(
|
||||
work_dir, ".zbrush_metadata",
|
||||
current_file, metadata_key).replace(
|
||||
|
|
@ -288,7 +288,7 @@ def write_load_metadata(metadata_key, data):
|
|||
if current_file:
|
||||
current_file = os.path.splitext(
|
||||
os.path.basename(current_file))[0].strip()
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
name = next((d["name"] for d in data), None)
|
||||
json_dir = os.path.join(
|
||||
work_dir, ".zbrush_metadata",
|
||||
|
|
@ -310,7 +310,7 @@ def get_load_context_metadata(metadata_key):
|
|||
project_name = get_current_context()["project_name"]
|
||||
folder_path = get_current_context()["folder_path"]
|
||||
task_name = get_current_context()["task_name"]
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
json_dir = os.path.join(
|
||||
work_dir, ".zbrush_metadata", metadata_key).replace(
|
||||
"\\", "/"
|
||||
|
|
@ -338,7 +338,7 @@ def get_load_workfile_metadata(metadata_key):
|
|||
if current_file:
|
||||
current_file = os.path.splitext(
|
||||
os.path.basename(current_file))[0].strip()
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
json_dir = os.path.join(
|
||||
work_dir, ".zbrush_metadata",
|
||||
current_file, metadata_key).replace(
|
||||
|
|
@ -368,7 +368,7 @@ def get_instance_workfile_metadata(metadata_key):
|
|||
if current_file:
|
||||
current_file = os.path.splitext(
|
||||
os.path.basename(current_file))[0].strip()
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
json_dir = os.path.join(
|
||||
work_dir, ".zbrush_metadata",
|
||||
current_file, metadata_key).replace(
|
||||
|
|
@ -391,7 +391,7 @@ def remove_container_data(name):
|
|||
if current_file:
|
||||
current_file = os.path.splitext(
|
||||
os.path.basename(current_file))[0].strip()
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
json_dir = os.path.join(
|
||||
work_dir, ".zbrush_metadata",
|
||||
current_file, ZBRUSH_SECTION_NAME_CONTAINERS).replace(
|
||||
|
|
@ -408,7 +408,7 @@ def remove_tmp_data():
|
|||
project_name = get_current_context()["project_name"]
|
||||
folder_path = get_current_context()["folder_path"]
|
||||
task_name = get_current_context()["task_name"]
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
for name in [ZBRUSH_METADATA_CREATE_CONTEXT,
|
||||
ZBRUSH_SECTION_NAME_INSTANCES,
|
||||
ZBRUSH_SECTION_NAME_CONTAINERS]:
|
||||
|
|
@ -433,7 +433,7 @@ def copy_ayon_data(filepath):
|
|||
if current_file:
|
||||
current_file = os.path.splitext(
|
||||
os.path.basename(current_file))[0].strip()
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
for name in [ZBRUSH_METADATA_CREATE_CONTEXT,
|
||||
ZBRUSH_SECTION_NAME_INSTANCES,
|
||||
ZBRUSH_SECTION_NAME_CONTAINERS]:
|
||||
|
|
@ -461,7 +461,7 @@ def set_current_file(filepath=None):
|
|||
project_name = get_current_context()["project_name"]
|
||||
folder_path = get_current_context()["folder_path"]
|
||||
task_name = get_current_context()["task_name"]
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
txt_dir = os.path.join(
|
||||
work_dir, ".zbrush_metadata").replace(
|
||||
"\\", "/"
|
||||
|
|
@ -491,7 +491,7 @@ def imprint(container, representation_id):
|
|||
if current_file:
|
||||
current_file = os.path.splitext(
|
||||
os.path.basename(current_file))[0].strip()
|
||||
work_dir = get_workdir(project_name, folder_path, task_name)
|
||||
work_dir = get_workdir()
|
||||
json_dir = os.path.join(
|
||||
work_dir, ".zbrush_metadata",
|
||||
current_file, ZBRUSH_SECTION_NAME_CONTAINERS).replace(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue