From 0947504a5f365b07c0b27a9037d55d9508d47e90 Mon Sep 17 00:00:00 2001
From: jem <michael.jerger@meissa-gmbh.de>
Date: Tue, 7 Jan 2020 15:24:57 +0100
Subject: [PATCH] use cp resources for selmer

---
 src/cryogen_core/compiler.clj | 28 +++++++++++++++++++---------
 src/cryogen_core/new_io.clj   |  6 ++++++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/cryogen_core/compiler.clj b/src/cryogen_core/compiler.clj
index 3d3309d..700daf6 100644
--- a/src/cryogen_core/compiler.clj
+++ b/src/cryogen_core/compiler.clj
@@ -18,7 +18,9 @@
             [clojure.inspector :as inspector]
             [cryogen-core.toc :as toc]
             [cryogen-core.hierarchic :as hierarchic])
-  (:import java.util.Locale))
+  (:import [java.util Locale]
+           [java.net URI]
+           [java.io File]))
 
 (cache-off!)
 
@@ -540,21 +542,29 @@
                        :rss-uri      (cryogen-io/path "/" blog-prefix rss-name)
                        :site-url     (if (.endsWith site-url "/") (.substring site-url 0 (dec (count site-url))) site-url)})
         file-resource-prefix "resources/"
+        file-target-prefix "target/"
         resource-prefix (str "templates/themes/" theme)
-        file-uri  (:uri
-                   (cp-io/resource-from-cp-or-fs
-                    file-resource-prefix resource-prefix ""
-                    :from-cp false))]
+        resource-file-uri (:uri
+                           (cp-io/resource-from-cp-or-fs
+                            file-resource-prefix resource-prefix ""
+                            :from-cp false))
+        target-file-uri  (URI. (str (.toURI (.getParentFile (.getAbsoluteFile (File. "."))))
+                                    file-target-prefix resource-prefix "/"))]
     (when debug?
       (println (blue "debug: page-model:"))
       (println "\t-->" (cyan page-model))
       (println (blue "debug: prefixes:"))
-      (println "\t-->" (cyan file-uri))
+      (println "\t-->" (cyan resource-file-uri))
+      (println "\t-->" (cyan target-file-uri))
       (println (blue "debug: home-page:"))
       (println "\t-->" (cyan (-> params :home-page))))
-    ;; TODO: 1. Copy theme/html from fs & cp -> target/theme/html
-    ;; TODO: 2. use target/theme as custome-resource-path
-    (set-custom-resource-path! (.toString file-uri))
+    (new-io/delete-resource-recursive! (.getPath target-file-uri))
+    (new-io/copy-html-from-theme! "resources/"
+                                  theme
+                                  (.getPath target-file-uri)
+                                  ignored-files)
+    ;(set-custom-resource-path! (.toString resource-file-uri))
+    (set-custom-resource-path! (.toString target-file-uri))
     ;(cryogen-io/wipe-public-folder keep-files)
     (new-io/delete-resource-recursive! (cp-io/path "resources/public" blog-prefix))
     (println (blue "copying theme resources"))
diff --git a/src/cryogen_core/new_io.clj b/src/cryogen_core/new_io.clj
index f57f002..7c2410b 100644
--- a/src/cryogen_core/new_io.clj
+++ b/src/cryogen_core/new_io.clj
@@ -27,6 +27,12 @@
     (cp-io/copy-resources! fs-prefix (str theme-path "/html") ["404.html"]
                      target-path ignore-patterns)))
 
+(defn copy-html-from-theme!
+  [fs-prefix theme target-path ignore-patterns]
+  (let [theme-path (str "templates/themes/" theme)]
+    (cp-io/copy-resources! fs-prefix theme-path ["html"]
+                           target-path ignore-patterns)))
+
 (defn get-distinct-markup-dirs
   [fs-prefix posts pages ignore-patterns]
   (let [base-path "templates/md"