fix: make import files relative to plan file

Author: michiel

sample/kvm_control_flow_plan.yaml

@@ -1,10 +1,10 @@
 import:
   profiles:
-    - filename: "sample/kvm_control_flow/nodes.csv"
+    - filename: "kvm_control_flow/nodes.csv"
       filetype: "Nodes"
-    - filename: "sample/kvm_control_flow/links.csv"
+    - filename: "kvm_control_flow/links.csv"
       filetype: "Edges"
-    - filename: "sample/kvm_control_flow/layers.csv"
+    - filename: "kvm_control_flow/layers.csv"
       filetype: "Layers"
 
 export:

src/generate_commands.rs

@@ -39,7 +39,7 @@ pub fn generate_sample(dir: String) -> () {
 
     fn write_dir_contents(dir: &Dir, target_path: &Path) {
         for file in dir.files() {
-            let relative_path = file.path();
+            let relative_path = file.path().strip_prefix(dir.path()).unwrap();
             let target_file_path = target_path.join(relative_path);
 
             if let Some(parent) = target_file_path.parent() {
@@ -56,7 +56,8 @@ pub fn generate_sample(dir: String) -> () {
         }
 
         for sub_dir in dir.dirs() {
-            let sub_dir_path = target_path.join(sub_dir.path());
+            let relative_path = sub_dir.path().strip_prefix(dir.path()).unwrap();
+            let sub_dir_path = target_path.join(relative_path);
             if let Err(e) = fs::create_dir_all(&sub_dir_path) {
                 error!("Failed to create subdirectory: {:?}", e);
                 return;

src/main.rs

@@ -70,9 +70,6 @@ fn main() -> Result<()> {
     match args.command {
         Commands::Run { plan } => {
             info!("Running plan: {}", plan);
-            let plan_file_path = plan;
-            let path_content = fs::read_to_string(&plan_file_path)?;
-            let plan: plan::Plan = serde_yaml::from_str(&path_content)?;
             plan_execution::execute_plan(plan)?;
         }
         Commands::Init { plan } => {

src/plan_execution.rs

@@ -25,8 +25,13 @@ fn load_file(file_path: &str) -> Result<DataFrame, anyhow::Error> {
     Ok(df)
 }
 
-pub fn execute_plan(plan: Plan) -> Result<()> {
+pub fn execute_plan(plan: String) -> Result<()> {
     info!("Executing plan");
+
+    let plan_file_path = std::path::Path::new(&plan);
+    let path_content = std::fs::read_to_string(&plan_file_path)?;
+    let plan: Plan = serde_yaml::from_str(&path_content)?;
+
     debug!("Executing plan: {:?}", plan);
 
     let mut graph = Graph::default();
@@ -35,11 +40,13 @@ pub fn execute_plan(plan: Plan) -> Result<()> {
         .profiles
         .iter()
         .try_for_each(|profile| -> Result<(), Box<dyn std::error::Error>> {
+            let import_file_path = plan_file_path.parent().unwrap().join(&profile.filename);
             info!(
                 "Importing file: {} as {:?}",
-                profile.filename, profile.filetype
+                import_file_path.display(),
+                profile.filetype
             );
-            let df = load_file(&profile.filename)?;
+            let df = load_file(import_file_path.to_str().unwrap())?;
             match profile.filetype {
                 ImportFileType::Nodes => {
                     data_loader::verify_nodes_df(&df)?;