From b49ebe618676684d94398287a1b4d40d5c992eff Mon Sep 17 00:00:00 2001 From: Lukas Schondorff Date: Fri, 13 Dec 2019 11:41:16 +0100 Subject: [PATCH] renamed copy-dir --- src/cryogen_core/classpath_able_io.clj | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/cryogen_core/classpath_able_io.clj b/src/cryogen_core/classpath_able_io.clj index fb26ed0..70f1faa 100644 --- a/src/cryogen_core/classpath_able_io.clj +++ b/src/cryogen_core/classpath_able_io.clj @@ -33,7 +33,7 @@ file-from-fs) (catch Exception e nil)))) - + (defn file-from-cp-or-filesystem [fs-prefix resource-path] (let [from-fs (file-from-fs fs-prefix resource-path)] @@ -42,12 +42,12 @@ (file-from-cp resource-path)))) (defn copy-file - [source-file ;first element of (.list source-dir) + [source-file target-file] (do (io/make-parents target-file) (io/copy source-file target-file))) -(defn copy-dir +(defn do-copy [source-dir target-dir ignore-patterns] (loop [source-list (.list source-dir) file-path-prefix [""]] @@ -70,15 +70,9 @@ (let [source-file (file-from-cp-or-filesystem fs-prefix source-path) target-file (io/file target-path source-path) is-source-dir? (.isDirectory source-file)] - (cond - (nil? source-file) + (if (nil? source-file) (throw (IllegalArgumentException. (str "resource " source-path " not found"))) - is-source-dir? - (copy-dir source-file target-file ignore-patterns) - :else (copy-file source-file target-file) - ;; TODO: Call copy-file fct. - take care on parameter. - ))) - + (do-copy source-file target-file ignore-patterns)))) (defn copy-resources-from-theme [fs-prefix theme target-path] @@ -86,4 +80,3 @@ (copy-resources fs-prefix (str theme-path "/css") target-path "") (copy-resources fs-prefix (str theme-path "/js") target-path "") (copy-resources fs-prefix (str theme-path "/html/404.html") target-path ""))) -