mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
extract look uses resourcesDir instead of computing itself
This commit is contained in:
parent
6f26d0160c
commit
fcffa08177
1 changed files with 2 additions and 61 deletions
|
|
@ -331,10 +331,9 @@ class ExtractLook(pype.api.Extractor):
|
||||||
maya_path))
|
maya_path))
|
||||||
|
|
||||||
def resource_destination(self, instance, filepath, do_maketx):
|
def resource_destination(self, instance, filepath, do_maketx):
|
||||||
|
|
||||||
anatomy = instance.context.data["anatomy"]
|
anatomy = instance.context.data["anatomy"]
|
||||||
|
|
||||||
destination_dir = self.create_destination_template(instance, anatomy)
|
resources_dir = instance.data["resourcesDir"]
|
||||||
|
|
||||||
# Compute destination location
|
# Compute destination location
|
||||||
basename, ext = os.path.splitext(os.path.basename(filepath))
|
basename, ext = os.path.splitext(os.path.basename(filepath))
|
||||||
|
|
@ -344,7 +343,7 @@ class ExtractLook(pype.api.Extractor):
|
||||||
ext = ".tx"
|
ext = ".tx"
|
||||||
|
|
||||||
return os.path.join(
|
return os.path.join(
|
||||||
destination_dir, "resources", basename + ext
|
resources_dir, basename + ext
|
||||||
)
|
)
|
||||||
|
|
||||||
def _process_texture(self, filepath, do_maketx, staging, linearise, force):
|
def _process_texture(self, filepath, do_maketx, staging, linearise, force):
|
||||||
|
|
@ -408,61 +407,3 @@ class ExtractLook(pype.api.Extractor):
|
||||||
return converted, COPY, texture_hash
|
return converted, COPY, texture_hash
|
||||||
|
|
||||||
return filepath, COPY, texture_hash
|
return filepath, COPY, texture_hash
|
||||||
|
|
||||||
def create_destination_template(self, instance, anatomy):
|
|
||||||
"""Create a filepath based on the current data available
|
|
||||||
|
|
||||||
Example template:
|
|
||||||
{root}/{project}/{silo}/{asset}/publish/{subset}/v{version:0>3}/
|
|
||||||
{subset}.{representation}
|
|
||||||
Args:
|
|
||||||
instance: the instance to publish
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
file path (str)
|
|
||||||
"""
|
|
||||||
|
|
||||||
asset_entity = instance.context["assetEntity"]
|
|
||||||
|
|
||||||
template_data = copy.deepcopy(instance.data["anatomyData"])
|
|
||||||
|
|
||||||
subset_name = instance.data["subset"]
|
|
||||||
self.log.info(subset_name)
|
|
||||||
|
|
||||||
subset = io.find_one({
|
|
||||||
"type": "subset",
|
|
||||||
"name": subset_name,
|
|
||||||
"parent": asset_entity["_id"]
|
|
||||||
})
|
|
||||||
|
|
||||||
# assume there is no version yet, we start at `1`
|
|
||||||
version = None
|
|
||||||
version_number = 1
|
|
||||||
if subset is not None:
|
|
||||||
version = io.find_one(
|
|
||||||
{
|
|
||||||
"type": "version",
|
|
||||||
"parent": subset["_id"]
|
|
||||||
},
|
|
||||||
sort=[("name", -1)]
|
|
||||||
)
|
|
||||||
|
|
||||||
# if there is a subset there ought to be version
|
|
||||||
if version is not None:
|
|
||||||
version_number += version["name"]
|
|
||||||
|
|
||||||
if instance.data.get('version'):
|
|
||||||
version_number = int(instance.data.get('version'))
|
|
||||||
|
|
||||||
anatomy = instance.context.data["anatomy"]
|
|
||||||
padding = int(anatomy.templates['render']['padding'])
|
|
||||||
|
|
||||||
template_data.update({
|
|
||||||
"subset": subset_name,
|
|
||||||
"frame": ("#" * padding),
|
|
||||||
"version": version_number,
|
|
||||||
"representation": "TEMP"
|
|
||||||
})
|
|
||||||
anatomy_filled = anatomy.format(template_data)
|
|
||||||
|
|
||||||
return os.path.dirname(anatomy_filled["publish"]["path"])
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue