mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 21:04:40 +01:00
Merge branch 'develop' into bugfix/maya_look_sg_typo
This commit is contained in:
Roy Nieterau
GitHub
commit
ff40a2af24
2 changed files with 88 additions and 38 deletions
|
|
@ -92,9 +92,9 @@ class ValidateRigContents(pyblish.api.InstancePlugin,
|
|||
"""Validate missing objectsets in rig sets
|
||||
|
||||
Args:
|
||||
instance (str): instance
|
||||
required_objsets (list): list of objectset names
|
||||
rig_sets (list): list of rig sets
|
||||
instance (pyblish.api.Instance): instance
|
||||
required_objsets (list[str]): list of objectset names
|
||||
rig_sets (list[str]): list of rig sets
|
||||
|
||||
Raises:
|
||||
PublishValidationError: When the error is raised, it will show
|
||||
|
|
@ -114,15 +114,15 @@ class ValidateRigContents(pyblish.api.InstancePlugin,
|
|||
Check if all rig set members are within the hierarchy of the rig root
|
||||
|
||||
Args:
|
||||
instance (str): instance
|
||||
content (list): list of content from rig sets
|
||||
instance (pyblish.api.Instance): instance
|
||||
content (list[str]): list of content from rig sets
|
||||
|
||||
Raises:
|
||||
PublishValidationError: It means no dag nodes in
|
||||
the rig instance
|
||||
|
||||
Returns:
|
||||
list: invalid hierarchy
|
||||
List[str]: invalid hierarchy
|
||||
"""
|
||||
# Ensure there are at least some transforms or dag nodes
|
||||
# in the rig instance
|
||||
|
|
@ -145,15 +145,13 @@ class ValidateRigContents(pyblish.api.InstancePlugin,
|
|||
|
||||
@classmethod
|
||||
def validate_geometry(cls, set_members):
|
||||
"""
|
||||
Checks if the node types of the set members valid
|
||||
"""Checks if the node types of the set members valid
|
||||
|
||||
Args:
|
||||
set_members: list of nodes of the controls_set
|
||||
hierarchy: list of nodes which reside under the root node
|
||||
set_members (list[str]): nodes of the out_set
|
||||
|
||||
Returns:
|
||||
errors (list)
|
||||
list[str]: Nodes of invalid types.
|
||||
"""
|
||||
|
||||
# Validate all shape types
|
||||
|
|
@ -167,18 +165,17 @@ class ValidateRigContents(pyblish.api.InstancePlugin,
|
|||
if cmds.nodeType(shape) not in cls.accepted_output:
|
||||
invalid.append(shape)
|
||||
|
||||
return invalid
|
||||
|
||||
@classmethod
|
||||
def validate_controls(cls, set_members):
|
||||
"""
|
||||
Checks if the control set members are allowed node types.
|
||||
Checks if the node types of the set members valid
|
||||
"""Checks if the node types of the set members are valid for controls.
|
||||
|
||||
Args:
|
||||
set_members: list of nodes of the controls_set
|
||||
hierarchy: list of nodes which reside under the root node
|
||||
set_members (list[str]): list of nodes of the controls_set
|
||||
|
||||
Returns:
|
||||
errors (list)
|
||||
list: Controls of disallowed node types.
|
||||
"""
|
||||
|
||||
# Validate control types
|
||||
|
|
@ -194,7 +191,7 @@ class ValidateRigContents(pyblish.api.InstancePlugin,
|
|||
"""Get the target objectsets and rig sets nodes
|
||||
|
||||
Args:
|
||||
instance (str): instance
|
||||
instance (pyblish.api.Instance): instance
|
||||
|
||||
Returns:
|
||||
tuple: 2-tuple of list of objectsets,
|
||||
|
|
@ -253,11 +250,10 @@ class ValidateSkeletonRigContents(ValidateRigContents):
|
|||
"""Get the target objectsets and rig sets nodes
|
||||
|
||||
Args:
|
||||
instance (str): instance
|
||||
instance (pyblish.api.Instance): instance
|
||||
|
||||
Returns:
|
||||
tuple: 2-tuple of list of objectsets,
|
||||
list of rig sets nodes
|
||||
tuple: 2-tuple of list of objectsets, list of rig sets nodes
|
||||
"""
|
||||
objectsets = ["skeletonMesh_SET"]
|
||||
skeleton_mesh_nodes = instance.data.get("skeleton_mesh", [])
|
||||
|
|
|
|||
|
|
@ -25,7 +25,14 @@ from ayon_core.tools.workfiles.abstract import (
|
|||
|
||||
|
||||
class CommentMatcher(object):
|
||||
"""Use anatomy and work file data to parse comments from filenames"""
|
||||
"""Use anatomy and work file data to parse comments from filenames.
|
||||
|
||||
Args:
|
||||
extensions (set[str]): Set of extensions.
|
||||
file_template (AnatomyStringTemplate): File template.
|
||||
data (dict[str, Any]): Data to fill the template with.
|
||||
|
||||
"""
|
||||
def __init__(self, extensions, file_template, data):
|
||||
self.fname_regex = None
|
||||
|
||||
|
|
@ -199,6 +206,22 @@ class WorkareaModel:
|
|||
def _get_last_workfile_version(
|
||||
self, workdir, file_template, fill_data, extensions
|
||||
):
|
||||
"""
|
||||
|
||||
Todos:
|
||||
Validate if logic of this function is correct. It does return
|
||||
last version + 1 which might be wrong.
|
||||
|
||||
Args:
|
||||
workdir (str): Workdir path.
|
||||
file_template (str): File template.
|
||||
fill_data (dict[str, Any]): Fill data.
|
||||
extensions (set[str]): Extensions.
|
||||
|
||||
Returns:
|
||||
int: Next workfile version.
|
||||
|
||||
"""
|
||||
version = get_last_workfile_with_version(
|
||||
workdir, file_template, fill_data, extensions
|
||||
)[1]
|
||||
|
|
@ -225,8 +248,21 @@ class WorkareaModel:
|
|||
root,
|
||||
current_filename,
|
||||
):
|
||||
"""Get comments from root directory.
|
||||
|
||||
Args:
|
||||
file_template (AnatomyStringTemplate): File template.
|
||||
extensions (set[str]): Extensions.
|
||||
fill_data (dict[str, Any]): Fill data.
|
||||
root (str): Root directory.
|
||||
current_filename (str): Current filename.
|
||||
|
||||
Returns:
|
||||
Tuple[list[str], Union[str, None]]: Comment hints and current
|
||||
comment.
|
||||
|
||||
"""
|
||||
current_comment = None
|
||||
comment_hints = set()
|
||||
filenames = []
|
||||
if root and os.path.exists(root):
|
||||
for filename in os.listdir(root):
|
||||
|
|
@ -239,10 +275,11 @@ class WorkareaModel:
|
|||
filenames.append(filename)
|
||||
|
||||
if not filenames:
|
||||
return comment_hints, current_comment
|
||||
return [], current_comment
|
||||
|
||||
matcher = CommentMatcher(extensions, file_template, fill_data)
|
||||
|
||||
comment_hints = set()
|
||||
for filename in filenames:
|
||||
comment = matcher.parse_comment(filename)
|
||||
if comment:
|
||||
|
|
@ -259,18 +296,18 @@ class WorkareaModel:
|
|||
return directory_template.format_strict(fill_data).normalized()
|
||||
|
||||
def get_workarea_save_as_data(self, folder_id, task_id):
|
||||
folder = None
|
||||
task = None
|
||||
folder_entity = None
|
||||
task_entity = None
|
||||
if folder_id:
|
||||
folder = self._controller.get_folder_entity(
|
||||
folder_entity = self._controller.get_folder_entity(
|
||||
self.project_name, folder_id
|
||||
)
|
||||
if task_id:
|
||||
task = self._controller.get_task_entity(
|
||||
self.project_name, task_id
|
||||
)
|
||||
if folder_entity and task_id:
|
||||
task_entity = self._controller.get_task_entity(
|
||||
self.project_name, task_id
|
||||
)
|
||||
|
||||
if not folder or not task:
|
||||
if not folder_entity or not task_entity:
|
||||
return {
|
||||
"template_key": None,
|
||||
"template_has_version": None,
|
||||
|
|
@ -302,10 +339,11 @@ class WorkareaModel:
|
|||
|
||||
file_template = anatomy.get_template_item(
|
||||
"work", template_key, "file"
|
||||
).template
|
||||
)
|
||||
file_template_str = file_template.template
|
||||
|
||||
template_has_version = "{version" in file_template
|
||||
template_has_comment = "{comment" in file_template
|
||||
template_has_version = "{version" in file_template_str
|
||||
template_has_comment = "{comment" in file_template_str
|
||||
|
||||
comment_hints, comment = self._get_comments_from_root(
|
||||
file_template,
|
||||
|
|
@ -315,7 +353,8 @@ class WorkareaModel:
|
|||
current_filename,
|
||||
)
|
||||
last_version = self._get_last_workfile_version(
|
||||
workdir, file_template, fill_data, extensions)
|
||||
workdir, file_template_str, fill_data, extensions
|
||||
)
|
||||
|
||||
return {
|
||||
"template_key": template_key,
|
||||
|
|
@ -338,19 +377,34 @@ class WorkareaModel:
|
|||
version,
|
||||
comment,
|
||||
):
|
||||
"""Fill workarea filepath based on context.
|
||||
|
||||
Args:
|
||||
folder_id (str): Folder id.
|
||||
task_id (str): Task id.
|
||||
extension (str): File extension.
|
||||
use_last_version (bool): Use last version.
|
||||
version (int): Version number.
|
||||
comment (str): Comment.
|
||||
|
||||
Returns:
|
||||
WorkareaFilepathResult: Workarea filepath result.
|
||||
|
||||
"""
|
||||
anatomy = self._controller.project_anatomy
|
||||
fill_data = self._prepare_fill_data(folder_id, task_id)
|
||||
|
||||
template_key = self._get_template_key(fill_data)
|
||||
|
||||
workdir = self._get_workdir(anatomy, template_key, fill_data)
|
||||
|
||||
file_template = anatomy.get_template_item(
|
||||
"work", template_key, "file"
|
||||
).template
|
||||
)
|
||||
|
||||
if use_last_version:
|
||||
version = self._get_last_workfile_version(
|
||||
workdir, file_template, fill_data, self._extensions
|
||||
workdir, file_template.template, fill_data, self._extensions
|
||||
)
|
||||
fill_data["version"] = version
|
||||
fill_data["ext"] = extension.lstrip(".")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue