From 7e24a411df81fc2ecc47862a6387bf5c208e386e Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Wed, 28 Feb 2024 12:23:51 +0100
Subject: [PATCH] Fix issue with empty silo dirs being created on apply

---
 src/repo.rs | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/repo.rs b/src/repo.rs
index 7ccded8..9b76840 100644
--- a/src/repo.rs
+++ b/src/repo.rs
@@ -42,9 +42,7 @@ impl SiloRepo {
     }
 
     pub fn apply(&self) -> Result<()> {
-        let cwd = env::current_dir()
-            .into_diagnostic()
-            .context("get current dir")?;
+        let cwd = dirs::home_dir().unwrap_or(env::current_dir().into_diagnostic()?);
         let ctx = ApplyContext {
             config: self.config.clone(),
         };
@@ -141,16 +139,14 @@ impl DirEntry {
 
     fn apply(&self, ctx: &ApplyContext, cwd: &Path) -> Result<()> {
         match self {
-            DirEntry::File(file) => file.apply(ctx, cwd),
+            DirEntry::File(file) => {
+                ensure_cwd(cwd)?;
+                file.apply(ctx, cwd)
+            }
             DirEntry::Dir(p, children) => {
                 let cwd = if p != cwd {
                     let cwd = cwd.join(p.file_name().unwrap());
-                    if !cwd.exists() {
-                        log::info!("Creating {cwd:?}");
-                        fs::create_dir_all(&cwd)
-                            .into_diagnostic()
-                            .with_context(|| format!("Creating directory {cwd:?}"))?;
-                    }
+                    ensure_cwd(&cwd)?;
                     cwd
                 } else {
                     p.to_owned()
@@ -162,15 +158,8 @@ impl DirEntry {
             }
             DirEntry::Root(_, data, children) => {
                 let rendered_path = templating::render(&data.path, &ctx.config.template_context)?;
-
                 let cwd = PathBuf::from(rendered_path);
 
-                if !cwd.exists() {
-                    log::info!("Creating {cwd:?}");
-                    fs::create_dir_all(&cwd)
-                        .into_diagnostic()
-                        .with_context(|| format!("Creating directory {cwd:?}"))?;
-                }
                 for child in children {
                     child.apply(ctx, &cwd)?;
                 }
@@ -303,3 +292,13 @@ fn confirm_write(diff_tool: &str, a: &Path, b: &Path) -> Result<bool> {
         .interact()
         .into_diagnostic()
 }
+
+fn ensure_cwd(cwd: &Path) -> Result<(), miette::ErrReport> {
+    if cwd.exists() {
+        return Ok(());
+    }
+    log::info!("Creating {cwd:?}");
+    fs::create_dir_all(&cwd)
+        .into_diagnostic()
+        .with_context(|| format!("Creating directory {cwd:?}"))
+}