General: Expose cleanup plugin settings

openpype/plugins/publish/cleanup.py

@@ -37,12 +37,11 @@ class CleanUp(pyblish.api.InstancePlugin):
         "shell"
     ]
     exclude_families = ["clip"]
-    optional = True
     active = True
 
     # Presets
-    paterns = None  # list of regex paterns
-    remove_temp_renders = True
+    paterns = None  # list of regex patterns
+    remove_temp_renders = False
 
     def process(self, instance):
         """Plugin entry point."""
@@ -114,10 +113,10 @@ def clean_renders(self, instance, skip_cleanup_filepaths):
             src = os.path.normpath(src)
             dest = os.path.normpath(dest)
 
-            # add src dir into clearing dir paths (regex paterns)
+            # add src dir into clearing dir paths (regex patterns)
             transfers_dirs.append(os.path.dirname(src))
 
-            # add dest dir into clearing dir paths (regex paterns)
+            # add dest dir into clearing dir paths (regex patterns)
             transfers_dirs.append(os.path.dirname(dest))
 
             if src in skip_cleanup_filepaths:
@@ -140,7 +139,7 @@ def clean_renders(self, instance, skip_cleanup_filepaths):
                     # add dir for cleanup
                     dirnames.append(os.path.dirname(src))
 
-        # clean by regex paterns
+        # clean by regex patterns
         # make unique set
         transfers_dirs = set(transfers_dirs)
 
@@ -158,7 +157,7 @@ def clean_renders(self, instance, skip_cleanup_filepaths):
 
             self.log.debug("__ files: `{}`".format(files))
 
-            # remove all files which match regex patern
+            # remove all files which match regex pattern
             for f in files:
                 if os.path.normpath(f) in skip_cleanup_filepaths:
                     continue

openpype/plugins/publish/cleanup_explicit.py

@@ -18,7 +18,6 @@ class ExplicitCleanUp(pyblish.api.ContextPlugin):
 
     order = pyblish.api.IntegratorOrder + 10
     label = "Explicit Clean Up"
-    optional = True
     active = True
 
     def process(self, context):

openpype/settings/defaults/project_settings/global.json

@@ -334,11 +334,15 @@
             ]
         },
         "CleanUp": {
+            "enabled": true,
             "paterns": [],
             "remove_temp_renders": false
         },
         "CleanUpFarm": {
             "enabled": false
+        },
+        "ExplicitCleanUp": {
+            "enabled": true
         }
     },
     "tools": {

openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json

@@ -977,11 +977,17 @@
             "key": "CleanUp",
             "label": "Clean Up",
             "is_group": true,
+            "checkbox_key": "enabled",
             "children": [
+                {
+                    "type": "boolean",
+                    "key": "enabled",
+                    "label": "Enabled"
+                },
                 {
                     "type": "list",
                     "key": "paterns",
-                    "label": "Paterrns (regex)",
+                    "label": "Patterns (regex)",
                     "object_type": {
                         "type": "text"
                     }
@@ -996,18 +1002,33 @@
         },
         {
           "type": "dict",
-          "collapsible": false,
+          "collapsible": true,
           "key": "CleanUpFarm",
           "label": "Clean Up Farm",
           "is_group": true,
           "checkbox_key": "enabled",
           "children": [
-              {
-                  "type": "boolean",
-                  "key": "enabled",
-                  "label": "Enabled"
-              }
-          ]
+                {
+                    "type": "boolean",
+                    "key": "enabled",
+                    "label": "Enabled"
+                }
+            ]
+        },
+        {
+            "type": "dict",
+            "collapsible": true,
+            "key": "ExplicitCleanUp",
+            "label": "Explicit Clean Up",
+            "is_group": true,
+            "checkbox_key": "enabled",
+            "children": [
+                {
+                    "type": "boolean",
+                    "key": "enabled",
+                    "label": "Enabled"
+                }
+            ]
         }
     ]
 }