Merge branch 'develop' of https://github.com/ynput/ayon-core into enhancement/raise_publisher_ui_on_show_tool

.github/workflows/release_trigger.yml

@@ -0,0 +1,12 @@
+name: 🚀 Release Trigger
+
+on:
+  workflow_dispatch:
+
+jobs:
+  call-release-trigger:
+    uses: ynput/ops-repo-automation/.github/workflows/release_trigger.yml@main
+    secrets:
+      token: ${{ secrets.YNPUT_BOT_TOKEN }}
+      email: ${{ secrets.CI_EMAIL }}
+      user: ${{ secrets.CI_USER }}

client/ayon_core/hooks/pre_ocio_hook.py

@@ -19,7 +19,8 @@ class OCIOEnvHook(PreLaunchHook):
         "nuke",
         "hiero",
         "resolve",
-        "openrv"
+        "openrv",
+        "cinema4d"
     }
     launch_types = set()
 

client/ayon_core/lib/path_tools.py

@@ -81,7 +81,10 @@ def collect_frames(files):
         dict: {'/folder/product_v001.0001.png': '0001', ....}
     """
 
-    patterns = [clique.PATTERNS["frames"]]
+    # clique.PATTERNS["frames"] supports only `.1001.exr` not `_1001.exr` so
+    # we use a customized pattern.
+    pattern = "[_.](?P<index>(?P<padding>0*)\\d+)\\.\\D+\\d?$"
+    patterns = [pattern]
     collections, remainder = clique.assemble(
         files, minimum_items=1, patterns=patterns)
 

client/ayon_core/pipeline/constants.py

@@ -9,6 +9,7 @@ AVALON_INSTANCE_ID = "pyblish.avalon.instance"
 HOST_WORKFILE_EXTENSIONS = {
     "blender": [".blend"],
     "celaction": [".scn"],
+    "cinema4d": [".c4d"],
     "tvpaint": [".tvpp"],
     "fusion": [".comp"],
     "harmony": [".zip"],

client/ayon_core/plugins/load/delivery.py

@@ -230,6 +230,11 @@ class DeliveryOptionsDialog(QtWidgets.QDialog):
                 self.log
             ]
 
+            # TODO: This will currently incorrectly detect 'resources'
+            #  that are published along with the publish, because those should
+            #  not adhere to the template directly but are ingested in a
+            #  customized way. For example, maya look textures or any publish
+            #  that directly adds files into `instance.data["transfers"]`
             src_paths = []
             for repre_file in repre["files"]:
                 src_path = self.anatomy.fill_root(repre_file["path"])
@@ -261,7 +266,18 @@ class DeliveryOptionsDialog(QtWidgets.QDialog):
                     frame = dst_frame
 
                 if frame is not None:
-                    anatomy_data["frame"] = frame
+                    if repre["context"].get("frame"):
+                        anatomy_data["frame"] = frame
+                    elif repre["context"].get("udim"):
+                        anatomy_data["udim"] = frame
+                    else:
+                        # Fallback
+                        self.log.warning(
+                            "Representation context has no frame or udim"
+                            " data. Supplying sequence frame to '{frame}'"
+                            " formatting data."
+                        )
+                        anatomy_data["frame"] = frame
                 new_report_items, uploaded = deliver_single_file(*args)
                 report_items.update(new_report_items)
                 self._update_progress(uploaded)

client/ayon_core/plugins/publish/integrate.py

@@ -509,8 +509,11 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
         if not is_sequence_representation:
             files = [files]
 
-        if any(os.path.isabs(fname) for fname in files):
-            raise KnownPublishError("Given file names contain full paths")
+        for fname in files:
+            if os.path.isabs(fname):
+                raise KnownPublishError(
+                    f"Representation file names contains full paths: {fname}"
+                )
 
         if not is_sequence_representation:
             return

client/ayon_core/plugins/publish/validate_file_saved.py

@@ -36,7 +36,8 @@ class ValidateCurrentSaveFile(pyblish.api.ContextPlugin):
 
     label = "Validate File Saved"
     order = pyblish.api.ValidatorOrder - 0.1
-    hosts = ["fusion", "houdini", "max", "maya", "nuke", "substancepainter"]
+    hosts = ["fusion", "houdini", "max", "maya", "nuke", "substancepainter",
+             "cinema4d"]
     actions = [SaveByVersionUpAction, ShowWorkfilesAction]
 
     def process(self, context):