Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions integration/blender/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ def execute(self, context):
result = conduct.export(data.department, export.format, data.asset, name, data.shot)

locals = {}
globals = {}

script = result['script']
exec(script, locals, globals)
exec(script, globals(), locals)

for item in globals:
instance = globals[item]
for item in locals:
instance = locals[item]

if not inspect.isclass(instance):
continue
Expand Down
35 changes: 32 additions & 3 deletions src/core/version_control/direct.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
use core::fmt;
use std::{collections::BTreeMap, path::PathBuf};

use crate::core::{
commands::ExportArgs, element::resolved_element_data::ResolvedElementData, project,
version_control::common::resolve_element_path,
};

use super::{ExportError, ExportResult, VersionControl, VersionControlFile};
use log::{error, info};
use path_absolutize::Absolutize;
use serde::{Deserialize, Serialize};

#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct VersionControlConfigDirect {}
pub struct VersionControlConfigDirect {
#[serde(skip_serializing_if = "BTreeMap::is_empty", default)]
export_overrides: BTreeMap<String, String>,
}

impl VersionControl for VersionControlConfigDirect {
fn export(
Expand All @@ -32,9 +39,31 @@ impl VersionControl for VersionControlConfigDirect {
}
};

info!("Resolved path: {}", &path.to_str().unwrap());

let mut dir = project.get_root_directory();
dir.push("export");
dir.push(path);

match self.export_overrides.get(&args.file_format) {
Some(override_str) => {
info!("Found override path: {}", override_str);
let override_path = PathBuf::from(override_str);
if override_path.is_relative() {
info!("Override path is relative");
dir.push(override_str);
dir = dir.absolutize().unwrap().to_path_buf();

info!("dir after relative override: {}", dir.to_str().unwrap());
} else {
info!("Override path is absolute")
}

dir.push(path);
}
None => {
dir.push("export");
dir.push(path);
}
}

info!("Exporting to: {}", dir.to_str().unwrap());
info!("Recommended file name: {}", file_name);
Expand Down
Loading