Skip to content

Allow seperate path order for overriden exports in direct vc #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Airyzz merged 1 commit into from
Feb 2, 2025
Merged

Allow seperate path order for overriden exports in direct vc #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/core/version_control/direct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ pub struct VersionControlConfigDirect {
#[serde(skip_serializing_if = "BTreeMap::is_empty", default)]
export_overrides: BTreeMap<String, String>,

#[serde(skip_serializing_if = "Vec::is_empty", default)]
pub overrides_order: Vec<String>,

#[serde(flatten)]
common: CommonVersionControlConfig,
}
Expand All @@ -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");
Expand Down