Merge branch 'develop' into bugfix/dirmap_get_mappings

ynput · Dec 27, 2024 · 1529cfb · 1529cfb
2 parents 5e503d0 + 57dbd28
commit 1529cfb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/client/ayon_core/pipeline/context_tools.py b/client/ayon_core/pipeline/context_tools.py
@@ -585,9 +585,6 @@ def version_up_current_workfile():
     """Function to increment and save workfile
     """
     host = registered_host()
-    if not host.has_unsaved_changes():
-        print("No unsaved changes, skipping file save..")
-        return
 
     project_name = get_current_project_name()
     folder_path = get_current_folder_path()

diff --git a/client/ayon_core/pipeline/publish/lib.py b/client/ayon_core/pipeline/publish/lib.py
@@ -717,6 +717,7 @@ def get_instance_staging_dir(instance):
     instance.data.update({
         "stagingDir": staging_dir_path,
         "stagingDir_persistent": staging_dir_info.persistent,
+        "stagingDir_custom": staging_dir_info.custom
     })
 
     return staging_dir_path

diff --git a/client/ayon_core/pipeline/staging_dir.py b/client/ayon_core/pipeline/staging_dir.py
@@ -12,6 +12,7 @@
 class StagingDir:
     directory: str
     persistent: bool
+    custom: bool  # Whether the staging dir is a custom staging dir
 
 
 def get_staging_dir_config(
@@ -204,7 +205,8 @@ def get_staging_dir_info(
         dir_template = staging_dir_config["template"]["directory"]
         return StagingDir(
             dir_template.format_strict(ctx_data),
-            staging_dir_config["persistence"],
+            persistent=staging_dir_config["persistence"],
+            custom=True
         )
 
     # no config found but force an output
@@ -216,7 +218,8 @@ def get_staging_dir_info(
                 prefix=prefix,
                 suffix=suffix,
             ),
-            False,
+            persistent=False,
+            custom=False
         )
 
     return None