From ec5d679f477d1c4ad41e352eb4899c2cd7450d38 Mon Sep 17 00:00:00 2001 From: teesloane Date: Fri, 27 Mar 2020 22:28:54 -0400 Subject: [PATCH] Fix: only copy assets if folder doesn't exist And delete _firn properly when running repl tests. --- src/firn/build.clj | 9 ++++++--- test/firn/core_test.clj | 9 +++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/firn/build.clj b/src/firn/build.clj index 937363e9..77b627a9 100644 --- a/src/firn/build.clj +++ b/src/firn/build.clj @@ -10,7 +10,7 @@ [firn.util :as u]) (:gen-class)) -(defn- prepare-config +(defn prepare-config "Takes a path to files (or CWD) and makes a config with it." [{:keys [path]}] (let [path (if (empty? path) (.getPath fs/*cwd*) path) @@ -63,8 +63,11 @@ org-files (u/find-files-by-ext files-dir "org") ;; could bail if this is empty... layouts-map (u/file-list->key-file-map layout-files)] - (fs/mkdir (config :out-dirname)) - (fs/copy-dir (config :media-dir) (config :out-media-dir)) + (fs/mkdir (config :out-dirname)) ;; make _site + + (when-not (fs/exists? (config :out-media-dir)) + (fs/copy-dir (config :media-dir) (config :out-media-dir))) + (assoc config :org-files org-files :layouts layouts-map :partials partials-map))) diff --git a/test/firn/core_test.clj b/test/firn/core_test.clj index b63da652..5e63f4d4 100644 --- a/test/firn/core_test.clj +++ b/test/firn/core_test.clj @@ -21,13 +21,14 @@ (defn main-runner [dir-to-build] - (fs/delete-dir (config-sample :firn-dir)) - (build/all-files {:path dir-to-build})) + (let [config (build/prepare-config {:path dir-to-build})] + (fs/delete-dir (config :firn-dir)) + (build/all-files {:path dir-to-build}))) (main-runner wiki-dir) -(main-runner test-dir) +;; (main-runner test-dir) -(build/new-site {:path test-dir}) +;; (build/new-site {:path test-dir}) ;; (def sample