Merge branch '2.x/develop' into feature/tiled-exr-to-scanline

pype/plugins/global/load/copy_file.py

@@ -20,8 +20,8 @@ class CopyFile(api.Loader):
     def copy_file_to_clipboard(path):
         from avalon.vendor.Qt import QtCore, QtWidgets
 
-        app = QtWidgets.QApplication.instance()
-        assert app, "Must have running QApplication instance"
+        clipboard = QtWidgets.QApplication.clipboard()
+        assert clipboard, "Must have running QApplication instance"
 
         # Build mime data for clipboard
         data = QtCore.QMimeData()
@@ -29,5 +29,4 @@ class CopyFile(api.Loader):
         data.setUrls([url])
 
         # Set to Clipboard
-        clipboard = app.clipboard()
         clipboard.setMimeData(data)

pype/plugins/global/load/copy_file_path.py

@@ -19,11 +19,10 @@ class CopyFilePath(api.Loader):
 
     @staticmethod
     def copy_path_to_clipboard(path):
-        from avalon.vendor.Qt import QtCore, QtWidgets
+        from avalon.vendor.Qt import QtWidgets
 
-        app = QtWidgets.QApplication.instance()
-        assert app, "Must have running QApplication instance"
+        clipboard = QtWidgets.QApplication.clipboard()
+        assert clipboard, "Must have running QApplication instance"
 
         # Set to Clipboard
-        clipboard = app.clipboard()
         clipboard.setText(os.path.normpath(path))

pype/plugins/global/publish/extract_burnin.py

@@ -25,7 +25,8 @@ class ExtractBurnin(pype.api.Extractor):
         "shell",
         "nukestudio",
         "premiere",
-        "standalonepublisher"
+        "standalonepublisher",
+        "harmony"
     ]
     optional = True
 
@@ -194,11 +195,14 @@ class ExtractBurnin(pype.api.Extractor):
                 if "delete" in new_repre["tags"]:
                     new_repre["tags"].remove("delete")
 
-                # Update name and outputName to be able have multiple outputs
-                # Join previous "outputName" with filename suffix
-                new_name = "_".join([new_repre["outputName"], filename_suffix])
-                new_repre["name"] = new_name
-                new_repre["outputName"] = new_name
+                if len(repre_burnin_defs.keys()) > 1:
+                    # Update name and outputName to be
+                    # able have multiple outputs in case of more burnin presets
+                    # Join previous "outputName" with filename suffix
+                    new_name = "_".join(
+                        [new_repre["outputName"], filename_suffix])
+                    new_repre["name"] = new_name
+                    new_repre["outputName"] = new_name
 
                 # Prepare paths and files for process.
                 self.input_output_paths(new_repre, temp_data, filename_suffix)

pype/plugins/global/publish/extract_hierarchy_avalon.py

@@ -10,6 +10,7 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
     families = ["clip", "shot"]
 
     def process(self, context):
+        # processing starts here
         if "hierarchyContext" not in context.data:
             self.log.info("skipping IntegrateHierarchyToAvalon")
             return
@@ -17,7 +18,29 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
         if not io.Session:
             io.install()
 
-        input_data = context.data["hierarchyContext"]
+        active_assets = []
+        hierarchy_context = context.data["hierarchyContext"]
+        hierarchy_assets = self._get_assets(hierarchy_context)
+
+        # filter only the active publishing insatnces
+        for instance in context:
+            if instance.data.get("publish") is False:
+                continue
+
+            if not instance.data.get("asset"):
+                continue
+
+            active_assets.append(instance.data["asset"])
+
+        # filter out only assets which are activated as isntances
+        new_hierarchy_assets = {k: v for k, v in hierarchy_assets.items()
+                                if k in active_assets}
+
+        # modify the hierarchy context so there are only fitred assets
+        self._set_assets(hierarchy_context, new_hierarchy_assets)
+
+        input_data = context.data["hierarchyContext"] = hierarchy_context
+
         self.project = None
         self.import_to_avalon(input_data)
 
@@ -83,7 +106,6 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
                         for task_name in new_tasks:
                             if task_name not in cur_entity_data["tasks"]:
                                 cur_entity_data["tasks"].append(task_name)
-
                     cur_entity_data.update(data)
                     data = cur_entity_data
                 else:
@@ -150,3 +172,41 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
         entity_id = io.insert_one(item).inserted_id
 
         return io.find_one({"_id": entity_id})
+
+    def _get_assets(self, input_dict):
+        """ Returns only asset dictionary.
+            Usually the last part of deep dictionary which
+            is not having any children
+        """
+        for key in input_dict.keys():
+            # check if child key is available
+            if input_dict[key].get("childs"):
+                # loop deeper
+                return self._get_assets(input_dict[key]["childs"])
+            else:
+                # give the dictionary with assets
+                return input_dict
+
+    def _set_assets(self, input_dict, new_assets=None):
+        """ Modify the hierarchy context dictionary.
+            It will replace the asset dictionary with only the filtred one.
+        """
+        for key in input_dict.keys():
+            # check if child key is available
+            if input_dict[key].get("childs"):
+                # return if this is just for testing purpose and no
+                # new_assets property is avalable
+                if not new_assets:
+                    return True
+
+                # test for deeper inner children availabelity
+                if self._set_assets(input_dict[key]["childs"]):
+                    # if one level deeper is still children available
+                    # then process farther
+                    self._set_assets(input_dict[key]["childs"], new_assets)
+                else:
+                    # or just assign the filtred asset ditionary
+                    input_dict[key]["childs"] = new_assets
+            else:
+                # test didnt find more childs in input dictionary
+                return None

pype/plugins/global/publish/extract_jpeg.py

@@ -81,6 +81,11 @@ class ExtractJpegEXR(pyblish.api.InstancePlugin):
             jpeg_items.append("-i {}".format(full_input_path))
             # output arguments from presets
             jpeg_items.extend(ffmpeg_args.get("output") or [])
+
+            # If its a movie file, we just want one frame.
+            if repre["ext"] == "mov":
+                jpeg_items.append("-vframes 1")
+
             # output file
             jpeg_items.append(full_output_path)
 

pype/plugins/global/publish/integrate_new.py

@@ -6,6 +6,8 @@ import copy
 import clique
 import errno
 import six
+import re
+import shutil
 
 from pymongo import DeleteOne, InsertOne
 import pyblish.api
@@ -680,6 +682,14 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                 instance.data.get('subsetGroup')}}
             )
 
+        # Update families on subset.
+        families = [instance.data["family"]]
+        families.extend(instance.data.get("families", []))
+        io.update_many(
+            {"type": "subset", "_id": io.ObjectId(subset["_id"])},
+            {"$set": {"data.families": families}}
+        )
+
         return subset
 
     def create_version(self, subset, version_number, data=None):
@@ -952,21 +962,37 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
         """
         if integrated_file_sizes:
             for file_url, _file_size in integrated_file_sizes.items():
+                if not os.path.exists(file_url):
+                    self.log.debug(
+                        "File {} was not found.".format(file_url)
+                    )
+                    continue
+
                 try:
                     if mode == 'remove':
-                        self.log.debug("Removing file ...{}".format(file_url))
+                        self.log.debug("Removing file {}".format(file_url))
                         os.remove(file_url)
                     if mode == 'finalize':
-                        self.log.debug("Renaming file ...{}".format(file_url))
-                        import re
-                        os.rename(file_url,
-                                  re.sub('\.{}$'.format(self.TMP_FILE_EXT),
-                                         '',
-                                         file_url)
-                                  )
+                        new_name = re.sub(
+                            r'\.{}$'.format(self.TMP_FILE_EXT),
+                            '',
+                            file_url
+                        )
 
-                except FileNotFoundError:
-                    pass  # file not there, nothing to delete
+                        if os.path.exists(new_name):
+                            self.log.debug(
+                                "Overwriting file {} to {}".format(
+                                    file_url, new_name
+                                )
+                            )
+                            shutil.copy(file_url, new_name)
+                        else:
+                            self.log.debug(
+                                "Renaming file {} to {}".format(
+                                    file_url, new_name
+                                )
+                            )
+                            os.rename(file_url, new_name)
                 except OSError:
                     self.log.error("Cannot {} file {}".format(mode, file_url),
                                    exc_info=True)

pype/plugins/global/publish/submit_publish_job.py

@@ -429,7 +429,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
                                        "to render, don't know what to do "
                                        "with them.")
                 col = rem[0]
-                _, ext = os.path.splitext(col)
+                ext = os.path.splitext(col)[1].lstrip(".")
             else:
                 # but we really expect only one collection.
                 # Nothing else make sense.
@@ -729,7 +729,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
             "resolutionWidth": data.get("resolutionWidth", 1920),
             "resolutionHeight": data.get("resolutionHeight", 1080),
             "multipartExr": data.get("multipartExr", False),
-            "jobBatchName": data.get("jobBatchName", "")
+            "jobBatchName": data.get("jobBatchName", ""),
+            "review": data.get("review", True)
         }
 
         if "prerender" in instance.data["families"]:

pype/plugins/global/publish/validate_intent.py

@@ -0,0 +1,31 @@
+import pyblish.api
+import os
+
+
+class ValidateIntent(pyblish.api.ContextPlugin):
+    """Validate intent of the publish.
+
+    It is required to fill the intent of this publish. Chech the log
+    for more details
+    """
+
+    order = pyblish.api.ValidatorOrder
+
+    label = "Validate Intent"
+    # TODO: this should be off by default and only activated viac config
+    tasks = ["animation"]
+    hosts = ["harmony"]
+    if os.environ.get("AVALON_TASK") not in tasks:
+        active = False
+
+    def process(self, context):
+        msg = (
+            "Please make sure that you select the intent of this publish."
+        )
+
+        intent = context.data.get("intent")
+        self.log.debug(intent)
+        assert intent, msg
+
+        intent_value = intent.get("value")
+        assert intent is not "", msg

pype/plugins/global/publish/validate_version.py

@@ -10,7 +10,7 @@ class ValidateVersion(pyblish.api.InstancePlugin):
     order = pyblish.api.ValidatorOrder
 
     label = "Validate Version"
-    hosts = ["nuke", "maya", "blender"]
+    hosts = ["nuke", "maya", "blender", "standalonepublisher"]
 
     def process(self, instance):
         version = instance.data.get("version")