moved enable review from creator into publish collector

openpype/hosts/traypublisher/api/plugin.py

@@ -2,10 +2,7 @@ from openpype.pipeline import (
     Creator,
     CreatedInstance
 )
-from openpype.lib import (
-    FileDef,
-    BoolDef,
-)
+from openpype.lib import FileDef
 
 from .pipeline import (
     list_instances,
@@ -43,7 +40,6 @@ class TrayPublishCreator(Creator):
 class SettingsCreator(TrayPublishCreator):
     create_allow_context_change = True
 
-    enable_review = False
     extensions = []
 
     def collect_instances(self):
@@ -67,19 +63,15 @@ class SettingsCreator(TrayPublishCreator):
         self._add_instance_to_context(new_instance)
 
     def get_instance_attr_defs(self):
-        output = []
-
-        file_def = FileDef(
-            "filepath",
-            folders=False,
-            extensions=self.extensions,
-            allow_sequences=self.allow_sequences,
-            label="Filepath",
-        )
-        output.append(file_def)
-        if self.enable_review:
-            output.append(BoolDef("review", label="Review"))
-        return output
+        return [
+            FileDef(
+                "filepath",
+                folders=False,
+                extensions=self.extensions,
+                allow_sequences=self.allow_sequences,
+                label="Filepath",
+            )
+        ]
 
     @classmethod
     def from_settings(cls, item_data):
@@ -97,7 +89,6 @@ class SettingsCreator(TrayPublishCreator):
                 "icon": item_data["icon"],
                 "description": item_data["description"],
                 "detailed_description": item_data["detailed_description"],
-                "enable_review": item_data["enable_review"],
                 "extensions": item_data["extensions"],
                 "allow_sequences": item_data["allow_sequences"],
                 "default_variants": item_data["default_variants"]

openpype/hosts/traypublisher/plugins/publish/collect_review_family.py

@@ -0,0 +1,31 @@
+import pyblish.api
+from openpype.lib import BoolDef
+from openpype.pipeline import OpenPypePyblishPluginMixin
+
+
+class CollectReviewFamily(
+    pyblish.api.InstancePlugin, OpenPypePyblishPluginMixin
+):
+    """Add review family."""
+
+    label = "Collect Review Family"
+    order = pyblish.api.CollectorOrder - 0.49
+
+    hosts = ["traypublisher"]
+    families = [
+        "image",
+        "render",
+        "plate",
+        "review"
+    ]
+
+    def process(self, instance):
+        values = self.get_attr_values_from_data(instance.data)
+        if values.get("add_review_family"):
+            instance.data["families"].append("review")
+
+    @classmethod
+    def get_attribute_defs(cls):
+        return [
+            BoolDef("add_review_family", label="Review", default=True)
+        ]

openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py

@@ -22,10 +22,6 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
         repres = instance.data["representations"]
 
         creator_attributes = instance.data["creator_attributes"]
-
-        if creator_attributes.get("review"):
-            instance.data["families"].append("review")
-
         filepath_item = creator_attributes["filepath"]
         self.log.info(filepath_item)
         filepaths = [
@@ -34,6 +30,7 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
         ]
 
         instance.data["sourceFilepaths"] = filepaths
+        instance.data["stagingDir"] = filepath_item["directory"]
 
         filenames = filepath_item["filenames"]
         ext = os.path.splitext(filenames[0])[-1]
@@ -46,3 +43,7 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
             "stagingDir": filepath_item["directory"],
             "files": filenames
         })
+
+        self.log.debug("Created Simple Settings instance {}".format(
+            instance.data
+        ))

openpype/settings/defaults/project_settings/traypublisher.json

@@ -8,7 +8,6 @@
             "default_variants": [
                 "Main"
             ],
-            "enable_review": false,
             "description": "Publish workfile backup",
             "detailed_description": "",
             "allow_sequences": true,

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

@@ -45,12 +45,6 @@
                             "type": "text"
                         }
                     },
-                    {
-                        "type": "boolean",
-                        "key": "enable_review",
-                        "label": "Enable review",
-                        "tooltip": "Allow to create review from source file/s.\nFiles must be supported to be able create review."
-                    },
                     {
                         "type": "separator"
                     },