Merged in feature/PYPE-252-delete-rendered-frames-after-publish (pull request #229)

deleting rendered frames from working area after publishing

Approved-by: Milan Kolar <milan@orbi.tools>

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/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.