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

fix copy-from-theme & add copy-user-resources

Browse source
This commit is contained in:
jem 2019-12-16 15:34:34 +01:00
parent 404110092f
commit 55479d72e2
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/cryogen_core/compiler.clj
View file

@ -491,8 +491,10 @@
"Generates all the html and copies over resources specified in the config" "Generates all the html and copies over resources specified in the config"
[] []
(println (green "compiling assets...")) (println (green "compiling assets..."))
(let [{:keys [^String site-url blog-prefix rss-name recent-posts sass-dest keep-files ignored-files previews? (let [{:keys [^String site-url blog-prefix rss-name recent-posts
author-root-uri theme debug? page-model page-root-uri] sass-dest keep-files ignored-files previews?
author-root-uri theme debug? page-model
page-root-uri resources]
:as config} (read-config) :as config} (read-config)
posts (map klipsify (add-prev-next (read-posts config))) posts (map klipsify (add-prev-next (read-posts config)))
posts-by-tag (group-by-tags posts) posts-by-tag (group-by-tags posts)
@ -533,15 +535,19 @@
;; TODO: replace by file-resource-path or classpath-resource-path ;; TODO: replace by file-resource-path or classpath-resource-path
(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)
(cp-io/delete-resource-recursive! "resources/public") (cp-io/delete-resource-recursive! (cp-io/path "resources/public" blog-prefix))
(println (blue "copying theme resources")) (println (blue "copying theme resources"))
;(cryogen-io/copy-resources-from-theme config) ;(cryogen-io/copy-resources-from-theme config)
(cp-io/copy-resources-from-theme! "resources/templates/themes/" (cp-io/copy-resources-from-theme! "resources/"
theme theme
(cp-io/path "resources/public" blog-prefix) (cp-io/path "resources/public" blog-prefix)
ignored-files) ignored-files)
(println (blue "copying resources")) (println (blue "copying resources"))
(cryogen-io/copy-resources config) ;(cryogen-io/copy-resources config)
(cp-io/copy-resources-from-user! "resources/"
resources
(cp-io/path "resources/public" blog-prefix)
ignored-files)
(copy-resources-from-markup-folders config) (copy-resources-from-markup-folders config)
(compile-pages params modelled-pages) (compile-pages params modelled-pages)
(compile-posts params posts) (compile-posts params posts)