Merge branch 'develop' into feature/unify_subprocess_calls

# Conflicts:
#	pype/plugins/global/publish/extract_burnin.py

pype/plugins/global/publish/cleanup.py

@@ -3,11 +3,33 @@ import shutil
 import pyblish.api
 
 
+def clean_renders(instance):
+    transfers = instance.data.get("transfers", list())
+
+    current_families = instance.data.get("families", list())
+    instance_family = instance.data.get("family", None)
+    dirnames = []
+
+    for src, dest in transfers:
+        if os.path.normpath(src) != os.path.normpath(dest):
+            if instance_family == 'render' or 'render' in current_families:
+                os.remove(src)
+                dirnames.append(os.path.dirname(src))
+
+    # make unique set
+    cleanup_dirs = set(dirnames)
+    for dir in cleanup_dirs:
+        try:
+            os.rmdir(dir)
+        except OSError:
+            # directory is not empty, skipping
+            continue
+
+
 class CleanUp(pyblish.api.InstancePlugin):
     """Cleans up the staging directory after a successful publish.
 
-    The removal will only happen for staging directories which are inside the
-    temporary folder, otherwise the folder is ignored.
+    This will also clean published renders and delete their parent directories.
 
     """
 
@@ -36,3 +58,5 @@ class CleanUp(pyblish.api.InstancePlugin):
 
         self.log.info("Removing temporary folder ...")
         shutil.rmtree(staging_dir)
+        self.log.info("Cleaning renders ...")
+        clean_renders(instance)

pype/plugins/global/publish/collect_filesequences.py

@@ -160,10 +160,13 @@ class CollectRenderedFrames(pyblish.api.ContextPlugin):
 
             # Get family from the data
             families = data.get("families", ["render"])
-            assert isinstance(families, (list, tuple)), "Must be iterable"
-            assert families, "Must have at least a single family"
-            families.append("ftrack")
-            families.append("review")
+            if "render" not in families:
+                families.append("render")
+            if "ftrack" not in families:
+                families.append("ftrack")
+            if "review" not in families:
+                families.append("review")
+
             for collection in collections:
                 instance = context.create_instance(str(collection))
                 self.log.info("Collection: %s" % list(collection))

pype/plugins/global/publish/extract_burnin.py

@@ -17,6 +17,7 @@ class ExtractBurnin(pype.api.Extractor):
     label = "Quicktime with burnins"
     order = pyblish.api.ExtractorOrder + 0.03
     families = ["review", "burnin"]
+    hosts = ["nuke", "maya", "shell"]
     optional = True
 
     def process(self, instance):
@@ -61,10 +62,23 @@ class ExtractBurnin(pype.api.Extractor):
             self.log.debug("__ burnin_data2: {}".format(burnin_data))
 
             json_data = json.dumps(burnin_data)
-            scriptpath = os.path.normpath(os.path.join(os.environ['PYPE_MODULE_ROOT'],
-                                      "pype",
-                                      "scripts",
-                                      "otio_burnin.py"))
+
+            # Get script path.
+            module_path = os.environ['PYPE_MODULE_ROOT']
+
+            # There can be multiple paths in PYPE_MODULE_ROOT, in which case
+            # we just take first one.
+            if os.pathsep in module_path:
+                module_path = module_path.split(os.pathsep)[0]
+
+            scriptpath = os.path.normpath(
+                os.path.join(
+                    module_path,
+                    "pype",
+                    "scripts",
+                    "otio_burnin.py"
+                )
+            )
 
             self.log.debug("__ scriptpath: {}".format(scriptpath))
 

pype/plugins/global/publish/extract_review.py

@@ -20,6 +20,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
     label = "Extract Review"
     order = pyblish.api.ExtractorOrder + 0.02
     families = ["review"]
+    hosts = ["nuke", "maya", "shell"]
 
     def process(self, instance):
         # adding plugin attributes from presets
@@ -109,12 +110,42 @@ class ExtractReview(pyblish.api.InstancePlugin):
 
                             # necessary input data
                             # adds start arg only if image sequence
-                            if "mov" not in repre_new['ext']:
+                            if isinstance(repre["files"], list):
                                 input_args.append("-start_number {0} -framerate {1}".format(
                                     start_frame, fps))
 
                             input_args.append("-i {}".format(full_input_path))
 
+                            for audio in instance.data.get("audio", []):
+                                offset_frames = (
+                                    instance.data.get("startFrameReview") -
+                                    audio["offset"]
+                                )
+                                offset_seconds = offset_frames / fps
+
+                                if offset_seconds > 0:
+                                    input_args.append("-ss")
+                                else:
+                                    input_args.append("-itsoffset")
+
+                                    input_args.append(str(abs(offset_seconds)))
+
+                                    input_args.extend(
+                                        ["-i", audio["filename"]]
+                                    )
+
+                                    # Need to merge audio if there are more
+                                    # than 1 input.
+                                    if len(instance.data["audio"]) > 1:
+                                        input_args.extend(
+                                            [
+                                                "-filter_complex",
+                                                "amerge",
+                                                "-ac",
+                                                "2"
+                                            ]
+                                        )
+
                             output_args = []
                             # preset's output data
                             output_args.extend(profile.get('output', []))
@@ -126,6 +157,9 @@ class ExtractReview(pyblish.api.InstancePlugin):
                                 output_args.append(
                                     "-filter:v drawbox=0:0:iw:round((ih-(iw*(1/{0})))/2):t=fill:c=black,drawbox=0:ih-round((ih-(iw*(1/{0})))/2):iw:round((ih-(iw*(1/{0})))/2):t=fill:c=black".format(lb))
 
+                            # In case audio is longer than video.
+                            output_args.append("-shortest")
+
                             # output filename
                             output_args.append(full_output_path)
                             mov_args = [

pype/plugins/global/publish/integrate_new.py

@@ -403,20 +403,14 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
         self.log.info("Registered {} items".format(len(representations)))
 
     def integrate(self, instance):
-        """Move the files
+        """ Move the files.
 
-        Through `instance.data["transfers"]`
+            Through `instance.data["transfers"]`
 
-        Args:
-            instance: the instance to integrate
+            Args:
+                instance: the instance to integrate
         """
 
-        transfers = instance.data.get("transfers", list())
-
-        for src, dest in transfers:
-            if os.path.normpath(src) != os.path.normpath(dest):
-                self.copy_file(src, dest)
-
         # Produce hardlinked copies
         # Note: hardlink can only be produced between two files on the same
         # server/disk and editing one of the two will edit both files at once.