Merge pull request #108 from ynput/bugfix/change_outputdir

Job Info Output Directory+Files pass sequence and remap to published workfile if needed

client/ayon_deadline/abstract_submit_deadline.py

@@ -11,6 +11,7 @@
 from datetime import datetime
 from copy import deepcopy
 from typing import Optional
+import clique
 
 import requests
 import pyblish.api
@@ -108,6 +109,10 @@ def process(self, instance):
             context.data["currentFile"],
             job_info.use_published
         )
+        self._append_job_output_paths(
+            instance,
+            self.job_info
+        )
         self.plugin_info = self.get_plugin_info()
 
         self.aux_files = self.get_aux_files()
@@ -157,6 +162,28 @@ def _set_scene_path(self, current_file, use_published):
         self.scene_path = file_path
         self.log.info("Using {} for render/export.".format(file_path))
 
+    def _append_job_output_paths(self, instance, job_info):
+        """Set output part to Job info
+
+        Note: 'expectedFiles' might be remapped after `_set_scene_path`
+            due to remapping workfile to published workfile.
+        Used in JobOutput > Explore output
+        """
+        collections, remainder = clique.assemble(
+            iter_expected_files(instance.data["expectedFiles"]),
+            assume_padded_when_ambiguous=True,
+            patterns=[clique.PATTERNS["frames"]])
+        paths = []
+        for collection in collections:
+            padding = "#" * collection.padding
+            path = collection.format(f"{{head}}{padding}{{tail}}")
+            paths.append(path)
+        paths.extend(remainder)
+
+        for path in paths:
+            job_info.OutputDirectory += os.path.dirname(path)
+            job_info.OutputFilename += os.path.basename(path)
+
     def process_submission(self):
         """Process data for submission.
 
@@ -195,11 +222,6 @@ def get_generic_job_info(self, instance: pyblish.api.Instance):
         if job_info.SecondaryPool != "none":
             job_info.SecondaryPool = job_info.SecondaryPool
 
-        exp = instance.data.get("expectedFiles")
-        for filepath in iter_expected_files(exp):
-            job_info.OutputDirectory += os.path.dirname(filepath)
-            job_info.OutputFilename += os.path.basename(filepath)
-
         # Adding file dependencies.
         if not is_in_tests() and job_info.use_asset_dependencies:
             dependencies = instance.context.data.get("fileDependencies", [])

client/ayon_deadline/plugins/publish/fusion/submit_fusion_deadline.py

@@ -1,9 +1,8 @@
-import os
 from dataclasses import dataclass, field, asdict
+
 import pyblish.api
 
 from ayon_core.pipeline.publish import AYONPyblishPluginMixin
-from ayon_core.pipeline.farm.tools import iter_expected_files
 from ayon_deadline import abstract_submit_deadline
 
 
@@ -110,10 +109,7 @@ def get_job_info(self, job_info=None, **kwargs):
             if saver_instance is instance:
                 continue
 
-            exp = instance.data.get("expectedFiles")
-            for filepath in iter_expected_files(exp):
-                job_info.OutputDirectory += os.path.dirname(filepath)
-                job_info.OutputFilename += os.path.basename(filepath)
+            self._append_job_output_paths(instance, job_info)
 
         return job_info
 

client/ayon_deadline/plugins/publish/nuke/submit_nuke_deadline.py

@@ -73,6 +73,11 @@ def process(self, instance):
         self._set_scene_path(
             context.data["currentFile"], job_info.use_published)
 
+        self._append_job_output_paths(
+            instance,
+            self.job_info
+        )
+
         self.plugin_info = self.get_plugin_info(
             scene_path=self.scene_path,
             render_path=render_path,