meissa/cryogen-core
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

"mob next [ci-skip]"

Browse source
This commit is contained in:
Jan Krebs 2019-12-13 14:18:53 +01:00
parent 88cf7dd3df
commit ea3f626283
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/cryogen_core/classpath_able_io.clj
View file

@ -10,6 +10,16 @@
(:require [clojure.java.io :as io] (:require [clojure.java.io :as io]
[clojure.string :as s])) [clojure.string :as s]))
(def public "resources/public")
(defn path
"Creates path from given parts, ignore empty elements"
[& path-parts]
(->> path-parts
(remove s/blank?)
(s/join "/")
(#(s/replace % #"/+" "/"))))
(defn filter-for-ignore-patterns (defn filter-for-ignore-patterns
[ignore-patterns source-list] [ignore-patterns source-list]
(filter #(not (re-matches ignore-patterns %)) source-list)) (filter #(not (re-matches ignore-patterns %)) source-list))
@ -75,8 +85,8 @@
(do-copy source-file target-file ignore-patterns)))) (do-copy source-file target-file ignore-patterns))))
(defn copy-resources-from-theme (defn copy-resources-from-theme
[fs-prefix theme target-path] [fs-prefix theme target-path ignore-patterns]
(let [theme-path (str "templates/themes/" theme)] (let [theme-path (str "templates/themes/" theme)]
(copy-resources fs-prefix (str theme-path "/css") target-path "") (copy-resources fs-prefix (str theme-path "/css") target-path ignore-patterns)
(copy-resources fs-prefix (str theme-path "/js") target-path "") (copy-resources fs-prefix (str theme-path "/js") target-path ignore-patterns)
(copy-resources fs-prefix (str theme-path "/html/") target-path ""))) (copy-resources fs-prefix (str theme-path "/html/") target-path ignore-patterns)))

7
src/cryogen_core/compiler.clj
View file

@ -8,6 +8,7 @@
[selmer.util :refer [set-custom-resource-path!]] [selmer.util :refer [set-custom-resource-path!]]
[text-decoration.core :refer :all] [text-decoration.core :refer :all]
[cryogen-core.io :as cryogen-io] [cryogen-core.io :as cryogen-io]
[cryogen-core.classpath-able-io :as cp-io]
[cryogen-core.klipse :as klipse] [cryogen-core.klipse :as klipse]
[cryogen-core.markup :as m] [cryogen-core.markup :as m]
[cryogen-core.rss :as rss] [cryogen-core.rss :as rss]
@ -533,8 +534,10 @@
(set-custom-resource-path! (str "file:resources/templates/themes/" theme)) (set-custom-resource-path! (str "file:resources/templates/themes/" theme))
(cryogen-io/wipe-public-folder keep-files) (cryogen-io/wipe-public-folder keep-files)
(println (blue "copying theme resources")) (println (blue "copying theme resources"))
;; TODO: adjust for reading from jar (cp-io/copy-resources-from-theme "resources/templates/themes/"
(cryogen-io/copy-resources-from-theme config) theme
(cp-io/path "resources/public" blog-prefix)
ignored-files)
(println (blue "copying resources")) (println (blue "copying resources"))
(cryogen-io/copy-resources config) (cryogen-io/copy-resources config)
(copy-resources-from-markup-folders config) (copy-resources-from-markup-folders config)

2
test/cryogen_core/classpath_able_io_test.clj
View file

@ -42,7 +42,7 @@
(deftest test-copy-resources-from-theme (deftest test-copy-resources-from-theme
(is (do (is (do
(sut/copy-resources-from-theme "./" theme target) (sut/copy-resources-from-theme "./" theme target "")
(and (verify-dir-exists (and (verify-dir-exists
(str target "/templates/themes/bootstrap4-test/js")) (str target "/templates/themes/bootstrap4-test/js"))
(verify-file-exists (verify-file-exists