From 8d41902b1a8a480d71e4ec56afee7326991c9313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej@samohel.cz>
Date: Fri, 26 Jul 2019 14:00:30 +0200
Subject: [PATCH] feat: deleting rendered frames from working area after
 publishing

---
 .../global/publish/collect_filesequences.py   | 11 +++++---
 pype/plugins/global/publish/integrate_new.py  | 25 ++++++++++++++++---
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/pype/plugins/global/publish/collect_filesequences.py b/pype/plugins/global/publish/collect_filesequences.py
index ed48404a98..8b87068a09 100644
--- a/pype/plugins/global/publish/collect_filesequences.py
+++ b/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))
diff --git a/pype/plugins/global/publish/integrate_new.py b/pype/plugins/global/publish/integrate_new.py
index 0d077ca65e..3070a1f759 100644
--- a/pype/plugins/global/publish/integrate_new.py
+++ b/pype/plugins/global/publish/integrate_new.py
@@ -403,19 +403,36 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
         self.log.info("Registered {} items".format(len(representations)))
 
     def integrate(self, instance):
-        """Move the files
+        """ Move the files. If files are in render family, they will be
+            deleted after copy.
 
-        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())
 
+        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):
                 self.copy_file(src, 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
 
         # Produce hardlinked copies
         # Note: hardlink can only be produced between two files on the same