diff --git a/pype/plugins/houdini/publish/extract_alembic.py b/pype/plugins/houdini/publish/extract_alembic.py index f40f3d2d0e..4910c45aca 100644 --- a/pype/plugins/houdini/publish/extract_alembic.py +++ b/pype/plugins/houdini/publish/extract_alembic.py @@ -20,7 +20,7 @@ class ExtractAlembic(pype.api.Extractor): # Get the filename from the filename parameter output = ropnode.evalParm("filename") staging_dir = os.path.dirname(output) - instance.data["stagingDir"] = staging_dir + # instance.data["stagingDir"] = staging_dir file_name = os.path.basename(output) @@ -37,7 +37,13 @@ class ExtractAlembic(pype.api.Extractor): traceback.print_exc() raise RuntimeError("Render failed: {0}".format(exc)) - if "files" not in instance.data: - instance.data["files"] = [] + if "representations" not in instance.data: + instance.data["representations"] = [] - instance.data["files"].append(file_name) + representation = { + 'name': 'abc', + 'ext': '.abc', + 'files': file_name, + "stagingDir": staging_dir, + } + instance.data["representations"].append(representation) diff --git a/pype/plugins/maya/publish/collect_scene.py b/pype/plugins/maya/publish/collect_scene.py index 43b4c842e3..88c9ed7a47 100644 --- a/pype/plugins/maya/publish/collect_scene.py +++ b/pype/plugins/maya/publish/collect_scene.py @@ -37,16 +37,19 @@ class CollectMayaScene(pyblish.api.ContextPlugin): "label": subset, "publish": False, "family": 'workfile', - "representation": "ma", - "setMembers": [current_file], - "stagingDir": folder + "setMembers": [current_file] }) - data['files'] = [file] + data['representations'] = [{ + 'name': 'ma', + 'ext': '.ma', + 'files': file, + "stagingDir": folder, + }] instance.data.update(data) self.log.info('Collected instance: {}'.format(file)) self.log.info('Scene path: {}'.format(current_file)) - self.log.info('stagin Dir: {}'.format(folder)) - self.log.info('subset: {}'.format(filename)) + self.log.info('staging Dir: {}'.format(folder)) + self.log.info('subset: {}'.format(subset)) diff --git a/pype/plugins/maya/publish/extract_animation.py b/pype/plugins/maya/publish/extract_animation.py index 24d06ac182..30d5dae92b 100644 --- a/pype/plugins/maya/publish/extract_animation.py +++ b/pype/plugins/maya/publish/extract_animation.py @@ -77,9 +77,15 @@ class ExtractAnimation(pype.api.Extractor): endFrame=end, **options) - if "files" not in instance.data: - instance.data["files"] = list() + if "representations" not in instance.data: + instance.data["representations"] = [] - instance.data["files"].append(filename) + representation = { + 'name': 'abc', + 'ext': '.abc', + 'files': filename, + "stagingDir": dirname, + } + instance.data["representations"].append(representation) self.log.info("Extracted {} to {}".format(instance, dirname)) diff --git a/pype/plugins/maya/publish/extract_ass.py b/pype/plugins/maya/publish/extract_ass.py index 14b548b928..0c7ef02b4b 100644 --- a/pype/plugins/maya/publish/extract_ass.py +++ b/pype/plugins/maya/publish/extract_ass.py @@ -21,8 +21,8 @@ class ExtractAssStandin(pype.api.Extractor): def process(self, instance): staging_dir = self.staging_dir(instance) - file_name = "{}.ass".format(instance.name) - file_path = os.path.join(staging_dir, file_name) + filename = "{}.ass".format(instance.name) + file_path = os.path.join(staging_dir, filename) # Write out .ass file self.log.info("Writing: '%s'" % file_path) @@ -37,11 +37,16 @@ class ExtractAssStandin(pype.api.Extractor): boundingBox=True ) + if "representations" not in instance.data: + instance.data["representations"] = [] - if "files" not in instance.data: - instance.data["files"] = list() - - instance.data["files"].append(file_name) + representation = { + 'name': 'ass', + 'ext': '.ass', + 'files': filename, + "stagingDir": staging_dir + } + instance.data["representations"].append(representation) self.log.info("Extracted instance '%s' to: %s" % (instance.name, staging_dir)) diff --git a/pype/plugins/maya/publish/extract_assproxy.py b/pype/plugins/maya/publish/extract_assproxy.py index 87e7b35799..bc807be9b0 100644 --- a/pype/plugins/maya/publish/extract_assproxy.py +++ b/pype/plugins/maya/publish/extract_assproxy.py @@ -33,7 +33,6 @@ class ExtractAssProxy(pype.api.Extractor): else: yield - # Define extract output file path stagingdir = self.staging_dir(instance) filename = "{0}.ma".format(instance.name) @@ -64,10 +63,15 @@ class ExtractAssProxy(pype.api.Extractor): expressions=False, constructionHistory=False) + if "representations" not in instance.data: + instance.data["representations"] = [] - if "files" not in instance.data: - instance.data["files"] = list() - - instance.data["files"].append(filename) + representation = { + 'name': 'ma', + 'ext': '.ma', + 'files': filename, + "stagingDir": stagingdir + } + instance.data["representations"].append(representation) self.log.info("Extracted instance '%s' to: %s" % (instance.name, path)) diff --git a/pype/plugins/maya/publish/extract_camera_alembic.py b/pype/plugins/maya/publish/extract_camera_alembic.py index 90f4954823..01239fd1e8 100644 --- a/pype/plugins/maya/publish/extract_camera_alembic.py +++ b/pype/plugins/maya/publish/extract_camera_alembic.py @@ -70,10 +70,16 @@ class ExtractCameraAlembic(pype.api.Extractor): with avalon.maya.suspended_refresh(): cmds.AbcExport(j=job_str, verbose=False) - if "files" not in instance.data: - instance.data["files"] = list() + if "representations" not in instance.data: + instance.data["representations"] = [] - instance.data["files"].append(filename) + representation = { + 'name': 'abc', + 'ext': '.abc', + 'files': filename, + "stagingDir": dir_path, + } + instance.data["representations"].append(representation) self.log.info("Extracted instance '{0}' to: {1}".format( instance.name, path)) diff --git a/pype/plugins/maya/publish/extract_camera_mayaAscii.py b/pype/plugins/maya/publish/extract_camera_mayaAscii.py index 4a21e7bf58..152acb98fe 100644 --- a/pype/plugins/maya/publish/extract_camera_mayaAscii.py +++ b/pype/plugins/maya/publish/extract_camera_mayaAscii.py @@ -168,10 +168,16 @@ class ExtractCameraMayaAscii(pype.api.Extractor): massage_ma_file(path) - if "files" not in instance.data: - instance.data["files"] = list() + if "representations" not in instance.data: + instance.data["representations"] = [] - instance.data["files"].append(filename) + representation = { + 'name': 'ma', + 'ext': '.ma', + 'files': filename, + "stagingDir": dir_path, + } + instance.data["representations"].append(representation) self.log.info("Extracted instance '{0}' to: {1}".format( instance.name, path)) diff --git a/pype/plugins/maya/publish/extract_maya_ascii_raw.py b/pype/plugins/maya/publish/extract_maya_ascii_raw.py index 70c6f246f6..c8f10d5b9b 100644 --- a/pype/plugins/maya/publish/extract_maya_ascii_raw.py +++ b/pype/plugins/maya/publish/extract_maya_ascii_raw.py @@ -51,9 +51,15 @@ class ExtractMayaAsciiRaw(pype.api.Extractor): constraints=True, expressions=True) - if "files" not in instance.data: - instance.data["files"] = list() + if "representations" not in instance.data: + instance.data["representations"] = [] - instance.data["files"].append(filename) + representation = { + 'name': 'ma', + 'ext': '.ma', + 'files': filename, + "stagingDir": dir_path + } + instance.data["representations"].append(representation) self.log.info("Extracted instance '%s' to: %s" % (instance.name, path)) diff --git a/pype/plugins/maya/publish/extract_model.py b/pype/plugins/maya/publish/extract_model.py index 302a899793..f6d9681222 100644 --- a/pype/plugins/maya/publish/extract_model.py +++ b/pype/plugins/maya/publish/extract_model.py @@ -69,9 +69,15 @@ class ExtractModel(pype.api.Extractor): # Store reference for integration - if "files" not in instance.data: - instance.data["files"] = list() + if "representations" not in instance.data: + instance.data["representations"] = [] - instance.data["files"].append(filename) + representation = { + 'name': 'ma', + 'ext': '.ma', + 'files': filename, + "stagingDir": stagingdir, + } + instance.data["representations"].append(representation) self.log.info("Extracted instance '%s' to: %s" % (instance.name, path)) diff --git a/pype/plugins/maya/publish/extract_pointcache.py b/pype/plugins/maya/publish/extract_pointcache.py index 65982febd8..907dfe0e18 100644 --- a/pype/plugins/maya/publish/extract_pointcache.py +++ b/pype/plugins/maya/publish/extract_pointcache.py @@ -79,9 +79,15 @@ class ExtractAlembic(pype.api.Extractor): endFrame=end, **options) - if "files" not in instance.data: - instance.data["files"] = list() + if "representations" not in instance.data: + instance.data["representations"] = [] - instance.data["files"].append(filename) + representation = { + 'name': 'abc', + 'ext': '.abc', + 'files': filename, + "stagingDir": dirname + } + instance.data["representations"].append(representation) self.log.info("Extracted {} to {}".format(instance, dirname)) diff --git a/pype/plugins/maya/publish/extract_quicktime.py b/pype/plugins/maya/publish/extract_quicktime.py index 16c8c08e52..caabf9560c 100644 --- a/pype/plugins/maya/publish/extract_quicktime.py +++ b/pype/plugins/maya/publish/extract_quicktime.py @@ -123,9 +123,21 @@ class ExtractQuicktime(pype.api.Extractor): self.log.error(ffmpeg_error) raise RuntimeError(ffmpeg_error) - if "files" not in instance.data: - instance.data["files"] = list() - instance.data["files"].append(movieFile) + if "representations" not in instance.data: + instance.data["representations"] = [] + + representation = { + 'name': 'mov', + 'ext': '.mov', + 'files': movieFile, + "stagingDir": stagingdir, + 'startFrame': start, + 'endFrame': end, + 'frameRate': fps, + 'preview': True + } + instance.data["representations"].append(representation) + @contextlib.contextmanager diff --git a/pype/plugins/maya/publish/extract_rig.py b/pype/plugins/maya/publish/extract_rig.py index bc355cc925..713d5e2b59 100644 --- a/pype/plugins/maya/publish/extract_rig.py +++ b/pype/plugins/maya/publish/extract_rig.py @@ -34,9 +34,16 @@ class ExtractRig(pype.api.Extractor): expressions=True, constructionHistory=True) - if "files" not in instance.data: - instance.data["files"] = list() + if "representations" not in instance.data: + instance.data["representations"] = [] + + representation = { + 'name': 'ma', + 'ext': '.ma', + 'files': filename, + "stagingDir": dir_path + } + instance.data["representations"].append(representation) - instance.data["files"].append(filename) self.log.info("Extracted instance '%s' to: %s" % (instance.name, path))