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

wip

Browse source
This commit is contained in:
jem 2019-12-27 13:09:26 +01:00
parent e3bc96ce4e
commit 297f37c469
1 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/cryogen_core/compiler.clj
View file

@ -493,30 +493,31 @@
sass-dest keep-files ignored-files previews? sass-dest keep-files ignored-files previews?
author-root-uri theme debug? page-model author-root-uri theme debug? page-model
page-root-uri resources] page-root-uri resources]
:as config} (read-config) :as config}
posts (read-config)
posts
(map klipsify (add-prev-next (read-posts config))) (map klipsify (add-prev-next (read-posts config)))
posts-by-tag posts-by-tag
(group-by-tags posts) (group-by-tags posts)
posts posts
(tag-posts posts config) (tag-posts posts config)
latest-posts latest-posts
(->> posts (take recent-posts) vec) (->> posts (take recent-posts) vec)
klipsified-pages klipsified-pages
(map klipsify (read-pages config)) (map klipsify (read-pages config))
modelled-pages modelled-pages
(cond (cond
(= page-model :flat) klipsified-pages (= page-model :flat) klipsified-pages
(= page-model :hierarchic) (hierarchic/build-hierarchic-map page-root-uri klipsified-pages)) (= page-model :hierarchic) (hierarchic/build-hierarchic-map page-root-uri klipsified-pages))
home-page home-page
(->> modelled-pages (->> modelled-pages
(filter #(boolean (:home? %))) (filter #(boolean (:home? %)))
(first)) (first))
other-pages other-pages
(->> modelled-pages (->> modelled-pages
(remove #{home-page}) (remove #{home-page})
(add-prev-next)) (add-prev-next))
params params
(merge config (merge config
{:today (java.util.Date.) {:today (java.util.Date.)
:title (:site-title config) :title (:site-title config)
@ -532,18 +533,29 @@
:tags-uri (page-uri "tags.html" config) :tags-uri (page-uri "tags.html" config)
:rss-uri (cryogen-io/path "/" blog-prefix rss-name) :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)}) :site-url (if (.endsWith site-url "/") (.substring site-url 0 (dec (count site-url))) site-url)})
file-resource-path file-resource-prefix
(str "file:resources/templates/themes/" theme) "resources/"
classpath-resource-path resource-prefix
(str "templates/themes/" theme)] (str "templates/themes/" theme)
file-uri
(:uri
(cp-io/resource-from-cp-or-fs
file-resource-prefix resource-prefix ""
:from-cp false))
cp-uri
(:uri
(cp-io/resource-from-cp-or-fs
file-resource-prefix resource-prefix ""
:from-fs false))]
(when debug? (when debug?
(println (blue "debug: page-model:")) (println (blue "debug: page-model:"))
(println "\t-->" (cyan page-model)) (println "\t-->" (cyan page-model))
(println (blue "debug: prefixes:"))
(println "\t-->" (cyan file-uri))
(println (blue "debug: home-page:")) (println (blue "debug: home-page:"))
(println "\t-->" (cyan (-> params :home-page)))) (println "\t-->" (cyan (-> params :home-page))))
;; TODO: replace by file-resource-path or classpath-resource-path ;; TODO: inline in compile* fns
(println file-resource-path) (set-custom-resource-path! (.toString file-uri))
(set-custom-resource-path! file-resource-path)
;(cryogen-io/wipe-public-folder keep-files) ;(cryogen-io/wipe-public-folder keep-files)
(cp-io/delete-resource-recursive! (cp-io/path "resources/public" blog-prefix)) (cp-io/delete-resource-recursive! (cp-io/path "resources/public" blog-prefix))
(println (blue "copying theme resources")) (println (blue "copying theme resources"))
@ -558,8 +570,6 @@
resources resources
(cp-io/path "resources/public" blog-prefix) (cp-io/path "resources/public" blog-prefix)
ignored-files) ignored-files)
;TODO: replace this
; Nur directories kopieren
;(copy-resources-from-markup-folders config) ;(copy-resources-from-markup-folders config)
(cp-io/create-dirs-from-markup-folders! "resources/" (cp-io/create-dirs-from-markup-folders! "resources/"
(:posts config) (:posts config)
@ -568,6 +578,7 @@
ignored-files) ignored-files)
; TODO: Hier weitermachen ; TODO: Hier weitermachen
(compile-pages params modelled-pages) (compile-pages params modelled-pages)
;(compile-pages params modelled-pages file-uri cp-uri)
(compile-posts params posts) (compile-posts params posts)
(compile-tags params posts-by-tag) (compile-tags params posts-by-tag)
(compile-tags-page params) (compile-tags-page params)