From a0617e84938e002a8c656b1f6c5f117ab04ffa5d Mon Sep 17 00:00:00 2001 From: Airyzz <36567925+Airyzz@users.noreply.github.com> Date: Sun, 2 Feb 2025 15:53:38 +1030 Subject: [PATCH] Update direct.rs --- src/core/version_control/direct.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/core/version_control/direct.rs b/src/core/version_control/direct.rs index 5e1e4cd..42cc358 100644 --- a/src/core/version_control/direct.rs +++ b/src/core/version_control/direct.rs @@ -18,6 +18,9 @@ pub struct VersionControlConfigDirect { #[serde(skip_serializing_if = "BTreeMap::is_empty", default)] export_overrides: BTreeMap, + #[serde(skip_serializing_if = "Vec::is_empty", default)] + pub overrides_order: Vec, + #[serde(flatten)] common: CommonVersionControlConfig, } @@ -35,9 +38,15 @@ impl VersionControl for VersionControlConfigDirect { let element_name = args.common.element.clone().unwrap(); let shot = args.common.shot.clone(); + let using_path_override = self.export_overrides.contains_key(&args.file_format); + + let config = &mut self.common.clone(); + if using_path_override && !self.overrides_order.is_empty() { + config.path_order = self.overrides_order.clone() + } + let (path, file_name) = - match resolve_element_path(project, dept, asset_name, element_name, shot, &self.common) - { + match resolve_element_path(project, dept, asset_name, element_name, shot, &config) { Ok(val) => val, Err(err) => { error!("Failed to resolve path");