diff --git a/pype/plugins/nukestudio/publish/collect_plates.py b/pype/plugins/nukestudio/publish/collect_plates.py index 9f6aa5539c..d1073f923a 100644 --- a/pype/plugins/nukestudio/publish/collect_plates.py +++ b/pype/plugins/nukestudio/publish/collect_plates.py @@ -26,6 +26,7 @@ class CollectPlates(api.InstancePlugin): family = dict(tag["metadata"]).get("tag.family", "") if family.lower() == "plate": tagged = True + break if not tagged: self.log.debug( @@ -39,7 +40,7 @@ class CollectPlates(api.InstancePlugin): for key, value in instance.data.iteritems(): data[key] = value - data["family"] = "plate" + data["family"] = family.lower() data["families"] = ["ftrack"] data["source"] = data["sourcePath"] @@ -48,10 +49,12 @@ class CollectPlates(api.InstancePlugin): tag_data = dict(tag["metadata"]) if "tag.subset" in tag_data: subset = tag_data["tag.subset"] - data["subset"] = "plate" + subset.title() + data["subset"] = data["family"] + subset.title() - data["label"] += " - {} - ({})".format( - subset, os.path.splitext(data["sourcePath"])[1] + data["name"] = data["subset"] + "_" + data["asset"] + + data["label"] = "{} - {} - ({})".format( + data['asset'], data["subset"], os.path.splitext(data["sourcePath"])[1] ) # Timeline data. @@ -93,7 +96,7 @@ class CollectPlates(api.InstancePlugin): } ) - self.log.debug("Creating instance with data: {}".format(data)) + self.log.debug("Creating instance with name: {}".format(data["name"])) instance.context.create_instance(**data) @@ -166,7 +169,7 @@ class CollectPlatesData(api.InstancePlugin): colorspace = item.sourceMediaColourTransform() # get sequence from context, and fps - fps = float(str(instance.data["fps"])) + fps = instance.data["fps"] # test output self.log.debug("__ handles: {}".format(handles)) diff --git a/pype/plugins/nukestudio/publish/collect_shots.py b/pype/plugins/nukestudio/publish/collect_shots.py index 8e02f4d27a..969aed9933 100644 --- a/pype/plugins/nukestudio/publish/collect_shots.py +++ b/pype/plugins/nukestudio/publish/collect_shots.py @@ -34,7 +34,11 @@ class CollectShots(api.ContextPlugin): data["families"] = [] data["frameStart"] = instance.data.get("frameStart", 1) - data["label"] += " - tasks: {} - assetbuilds: {}".format( + data["subset"] = data["family"] + "Main" + + data["name"] = data["subset"] + "_" + data["asset"] + + data["label"] = data["asset"] + " - " + data["subset"] + " - tasks: {} - assetbuilds: {}".format( data["tasks"], [x["name"] for x in data.get("assetbuilds", [])] ) @@ -67,5 +71,5 @@ class CollectShots(api.ContextPlugin): data["fps"] = sequence.framerate() # Create instance. - self.log.debug("Creating instance with: {}".format(data)) + self.log.debug("Creating instance with: {}".format(data["name"])) instance.context.create_instance(**data)