allow for multiple taps and targets in directory

dashbook · Mar 22, 2024 · 2b2c798 · 2b2c798
1 parent e5d3cd7
commit 2b2c798
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/dashtool/src/build/build_dag.rs b/dashtool/src/build/build_dag.rs
@@ -208,10 +208,8 @@ pub(super) async fn build_dag<'repo>(
                             .await?;
                     }
                     Some(false) => {
-                        let parent_path = Path::new(&path).parent().ok_or(Error::Anyhow(
-                            anyhow!("target.json must be inside a subfolder."),
-                        ))?;
-                        let tap_path = parent_path.join("tap.json");
+                        let tap_path =
+                            path.trim_end_matches("target.json").to_string() + "tap.json";
                         let tap_json: JsonValue =
                             serde_json::from_str(&fs::read_to_string(&tap_path)?)?;
                         let mut target_json: JsonValue =

diff --git a/dashtool/src/build/update_dag.rs b/dashtool/src/build/update_dag.rs
@@ -35,10 +35,7 @@ pub(super) fn update_dag(diff: &[Change], dag: Option<Dag>, branch: &str) -> Res
     }
 
     for path in singers {
-        let parent_path = Path::new(&path).parent().ok_or(Error::Anyhow(anyhow!(
-            "target.json must be inside a subfolder."
-        )))?;
-        let tap_path = parent_path.join("tap.json");
+        let tap_path = path.trim_end_matches("target.json").to_string() + "tap.json";
         let tap_json: JsonValue = serde_json::from_str(&fs::read_to_string(&tap_path)?)?;
         let mut target_json: JsonValue = serde_json::from_str(&fs::read_to_string(path)?)?;
         target_json["branch"] = branch.to_string().into();