Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Webpublisher - added configurable tags + defaults

Browse source
This commit is contained in:
Petr Kalis 2021-08-19 14:22:42 +02:00
parent 932ae5fbb4
commit c6dad89b34
3 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
openpype/hosts/webpublisher/plugins/publish/collect_published_files.py
View file

@ -75,7 +75,7 @@ class CollectPublishedFiles(pyblish.api.ContextPlugin):
is_sequence = len(task_data["files"]) > 1
_, extension = os.path.splitext(task_data["files"][0])
family, families, subset_template = self._get_family(
family, families, subset_template, tags = self._get_family(
self.task_type_to_family,
task_type,
is_sequence,
@ -100,7 +100,7 @@ class CollectPublishedFiles(pyblish.api.ContextPlugin):
if is_sequence:
instance.data["representations"] = self._process_sequence(
task_data["files"], task_dir
task_data["files"], task_dir, tags
)
instance.data["frameStart"] = \
instance.data["representations"][0]["frameStart"]
@ -108,7 +108,7 @@ class CollectPublishedFiles(pyblish.api.ContextPlugin):
instance.data["representations"][0]["frameEnd"]
else:
instance.data["representations"] = self._get_single_repre(
task_dir, task_data["files"]
task_dir, task_data["files"], tags
)
self.log.info("instance.data:: {}".format(instance.data))
@ -122,19 +122,19 @@ class CollectPublishedFiles(pyblish.api.ContextPlugin):
subset = subset_template.format(**prepare_template_data(fill_pairs))
return subset
def _get_single_repre(self, task_dir, files):
def _get_single_repre(self, task_dir, files, tags):
_, ext = os.path.splitext(files[0])
repre_data = {
"name": ext[1:],
"ext": ext[1:],
"files": files[0],
"stagingDir": task_dir,
"tags": ["review"]
"tags": tags
}
self.log.info("single file repre_data.data:: {}".format(repre_data))
return [repre_data]
def _process_sequence(self, files, task_dir):
def _process_sequence(self, files, task_dir, tags):
"""Prepare reprentations for sequence of files."""
collections, remainder = clique.assemble(files)
assert len(collections) == 1, \
@ -150,7 +150,7 @@ class CollectPublishedFiles(pyblish.api.ContextPlugin):
"ext": ext[1:],
"files": files,
"stagingDir": task_dir,
"tags": ["review"]
"tags": tags
}
self.log.info("sequences repre_data.data:: {}".format(repre_data))
return [repre_data]
@ -165,7 +165,7 @@ class CollectPublishedFiles(pyblish.api.ContextPlugin):
extension (str): without '.'
Returns:
(family, [families], subset_template_name) tuple
(family, [families], subset_template_name, tags) tuple
AssertionError if not matching family found
"""
task_obj = settings.get(task_type)
@ -187,7 +187,8 @@ class CollectPublishedFiles(pyblish.api.ContextPlugin):
return found_family, \
content["families"], \
content["subset_template_name"]
content["subset_template_name"], \
content["tags"]
def _get_version(self, asset_name, subset_name):
"""Returns version number or 0 for 'asset' and 'subset'"""

16
openpype/settings/defaults/project_settings/webpublisher.json
View file

@ -9,6 +9,7 @@
"tvp"
],
"families": [],
"tags": [],
"subset_template_name": ""
},
"render": {
@ -22,6 +23,9 @@
"families": [
"review"
],
"tags": [
"ftrackreview"
],
"subset_template_name": ""
}
},
@ -32,6 +36,7 @@
"aep"
],
"families": [],
"tags": [],
"subset_template_name": ""
},
"render": {
@ -45,6 +50,9 @@
"families": [
"review"
],
"tags": [
"ftrackreview"
],
"subset_template_name": ""
}
},
@ -55,6 +63,7 @@
"psd"
],
"families": [],
"tags": [],
"subset_template_name": ""
},
"image": {
@ -69,6 +78,9 @@
"families": [
"review"
],
"tags": [
"ftrackreview"
],
"subset_template_name": ""
}
},
@ -79,6 +91,7 @@
"tvp"
],
"families": [],
"tags": [],
"subset_template_name": "{family}{Variant}"
},
"render": {
@ -92,6 +105,9 @@
"families": [
"review"
],
"tags": [
"ftrackreview"
],
"subset_template_name": "{family}{Variant}"
}
},

4
openpype/settings/entities/schemas/projects_schema/schema_project_webpublisher.json
View file

@ -48,6 +48,10 @@
"label": "Families",
"object_type": "text"
},
{
"type": "schema",
"name": "schema_representation_tags"
},
{
"type": "text",
"key": "subset_template_name",