Merge pull request #4263 from ynput/enhancement/online-family-improvements

openpype/hosts/traypublisher/plugins/create/create_online.py

@@ -7,8 +7,8 @@ exists under selected asset.
 """
 from pathlib import Path
 
-from openpype.client import get_subset_by_name, get_asset_by_name
-from openpype.lib.attribute_definitions import FileDef
+# from openpype.client import get_subset_by_name, get_asset_by_name
+from openpype.lib.attribute_definitions import FileDef, BoolDef
 from openpype.pipeline import (
     CreatedInstance,
     CreatorError
@@ -23,7 +23,8 @@ class OnlineCreator(TrayPublishCreator):
     label = "Online"
     family = "online"
     description = "Publish file retaining its original file name"
-    extensions = [".mov", ".mp4", ".mxf", ".m4v", ".mpg"]
+    extensions = [".mov", ".mp4", ".mxf", ".m4v", ".mpg", ".exr",
+                  ".dpx", ".tif", ".png", ".jpg"]
 
     def get_detail_description(self):
         return """# Create file retaining its original file name.
@@ -49,13 +50,17 @@ class OnlineCreator(TrayPublishCreator):
 
         origin_basename = Path(files[0]).stem
 
+        # disable check for existing subset with the same name
+        """
         asset = get_asset_by_name(
             self.project_name, instance_data["asset"], fields=["_id"])
+
         if get_subset_by_name(
                 self.project_name, origin_basename, asset["_id"],
                 fields=["_id"]):
             raise CreatorError(f"subset with {origin_basename} already "
                                "exists in selected asset")
+        """
 
         instance_data["originalBasename"] = origin_basename
         subset_name = origin_basename
@@ -69,15 +74,29 @@ class OnlineCreator(TrayPublishCreator):
                                        instance_data, self)
         self._store_new_instance(new_instance)
 
+    def get_instance_attr_defs(self):
+        return [
+            BoolDef(
+                "add_review_family",
+                default=True,
+                label="Review"
+            )
+        ]
+
     def get_pre_create_attr_defs(self):
         return [
             FileDef(
                 "representation_file",
                 folders=False,
                 extensions=self.extensions,
-                allow_sequences=False,
+                allow_sequences=True,
                 single_item=True,
                 label="Representation",
+            ),
+            BoolDef(
+                "add_review_family",
+                default=True,
+                label="Review"
             )
         ]
 

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

@@ -12,12 +12,18 @@ class CollectOnlineFile(pyblish.api.InstancePlugin):
 
     def process(self, instance):
         file = Path(instance.data["creator_attributes"]["path"])
+        review = instance.data["creator_attributes"]["add_review_family"]
+        instance.data["review"] = review
+        if "review" not in instance.data["families"]:
+            instance.data["families"].append("review")
+        self.log.info(f"Adding review: {review}")
 
         instance.data["representations"].append(
             {
                 "name": file.suffix.lstrip("."),
                 "ext": file.suffix.lstrip("."),
                 "files": file.name,
-                "stagingDir": file.parent.as_posix()
+                "stagingDir": file.parent.as_posix(),
+                "tags": ["review"] if review else []
             }
         )

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

@@ -20,6 +20,8 @@ class ValidateOnlineFile(OptionalPyblishPluginMixin,
     optional = True
 
     def process(self, instance):
+        if not self.is_active(instance.data):
+            return
         project_name = instance.context.data["projectName"]
         asset_id = instance.data["assetEntity"]["_id"]
         subset = get_subset_by_name(

openpype/plugins/publish/extract_thumbnail.py

@@ -19,7 +19,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
     order = pyblish.api.ExtractorOrder
     families = [
         "imagesequence", "render", "render2d", "prerender",
-        "source", "clip", "take"
+        "source", "clip", "take", "online"
     ]
     hosts = ["shell", "fusion", "resolve", "traypublisher"]
     enabled = False