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

Add todo

Browse source
This commit is contained in:
Jan Krebs 2019-12-19 18:27:16 +01:00
parent d2b7b86e0b
commit 399ed2d8ec
1 changed files with 71 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

138
src/cryogen_core/compiler.clj
View file

@ -40,15 +40,15 @@
at the templates directory." at the templates directory."
[root mu ignored-files] [root mu ignored-files]
(let [assets (cryogen-io/find-assets (let [assets (cryogen-io/find-assets
(cryogen-io/path "templates" (m/dir mu) root) (cryogen-io/path "templates" (m/dir mu) root)
(m/ext mu) (m/ext mu)
ignored-files)] ignored-files)]
(if (seq assets) (if (seq assets)
assets assets
(cryogen-io/find-assets (cryogen-io/find-assets
(cryogen-io/path "templates" root) (cryogen-io/path "templates" root)
(m/ext mu) (m/ext mu)
ignored-files)))) ignored-files))))
(defn find-posts (defn find-posts
"Returns a list of markdown files representing posts under the post root." "Returns a list of markdown files representing posts under the post root."
@ -102,39 +102,39 @@
"Merges the page metadata and content maps, adding :toc if necessary." "Merges the page metadata and content maps, adding :toc if necessary."
[file-name page-meta content] [file-name page-meta content]
(merge (merge
(update-in page-meta [:layout] #(str (name %) ".html")) (update-in page-meta [:layout] #(str (name %) ".html"))
{:file-name file-name {:file-name file-name
:content content :content content
:toc (if-let [toc (:toc page-meta)] :toc (if-let [toc (:toc page-meta)]
(toc/generate-toc content :list-type toc))})) (toc/generate-toc content :list-type toc))}))
(defn parse-page (defn parse-page
"Parses a page/post and returns a map of the content, uri, date etc." "Parses a page/post and returns a map of the content, uri, date etc."
[page config markup] [page config markup]
(let [{:keys [file-name page-meta content]} (page-content page config markup)] (let [{:keys [file-name page-meta content]} (page-content page config markup)]
(merge (merge
(merge-meta-and-content file-name page-meta content) (merge-meta-and-content file-name page-meta content)
{:uri (page-uri file-name :page-root-uri config) {:uri (page-uri file-name :page-root-uri config)
:page-index (:page-index page-meta) :page-index (:page-index page-meta)
:klipse (klipse/merge-configs (:klipse config) (:klipse page-meta))}))) :klipse (klipse/merge-configs (:klipse config) (:klipse page-meta))})))
(defn parse-post (defn parse-post
"Return a map with the given post's information." "Return a map with the given post's information."
[page config markup] [page config markup]
(let [{:keys [file-name page-meta content]} (page-content page config markup)] (let [{:keys [file-name page-meta content]} (page-content page config markup)]
(merge (merge
(merge-meta-and-content file-name page-meta content) (merge-meta-and-content file-name page-meta content)
(let [date (if (:date page-meta) (let [date (if (:date page-meta)
(.parse (java.text.SimpleDateFormat. (:post-date-format config)) (:date page-meta)) (.parse (java.text.SimpleDateFormat. (:post-date-format config)) (:date page-meta))
(parse-post-date file-name (:post-date-format config))) (parse-post-date file-name (:post-date-format config)))
archive-fmt (java.text.SimpleDateFormat. (:archive-group-format config "yyyy MMMM") (Locale/getDefault)) archive-fmt (java.text.SimpleDateFormat. (:archive-group-format config "yyyy MMMM") (Locale/getDefault))
formatted-group (.format archive-fmt date)] formatted-group (.format archive-fmt date)]
{:date date {:date date
:formatted-archive-group formatted-group :formatted-archive-group formatted-group
:parsed-archive-group (.parse archive-fmt formatted-group) :parsed-archive-group (.parse archive-fmt formatted-group)
:uri (page-uri file-name :post-root-uri config) :uri (page-uri file-name :post-root-uri config)
:tags (set (:tags page-meta)) :tags (set (:tags page-meta))
:klipse (klipse/merge-configs (:klipse config) (:klipse page-meta))})))) :klipse (klipse/merge-configs (:klipse config) (:klipse page-meta))}))))
(defn read-posts (defn read-posts
"Returns a sequence of maps representing the data from markdown files of posts. "Returns a sequence of maps representing the data from markdown files of posts.
@ -142,11 +142,11 @@
[config] [config]
(->> (m/markups) (->> (m/markups)
(mapcat (mapcat
(fn [mu] (fn [mu]
(->> (->>
(find-posts config mu) (find-posts config mu)
(pmap #(parse-post % config mu)) (pmap #(parse-post % config mu))
(remove #(= (:draft? %) true))))) (remove #(= (:draft? %) true)))))
(sort-by :date) (sort-by :date)
reverse reverse
(drop-while #(and (:hide-future-posts? config) (.after (:date %) (java.util.Date.)))))) (drop-while #(and (:hide-future-posts? config) (.after (:date %) (java.util.Date.))))))
@ -157,10 +157,10 @@
[config] [config]
(->> (m/markups) (->> (m/markups)
(mapcat (mapcat
(fn [mu] (fn [mu]
(->> (->>
(find-pages config mu) (find-pages config mu)
(map #(parse-page % config mu))))) (map #(parse-page % config mu)))))
(sort-by :page-index))) (sort-by :page-index)))
(defn tag-post (defn tag-post
@ -212,8 +212,8 @@
[pages] [pages]
(map (fn [[prev target next]] (map (fn [[prev target next]]
(assoc target (assoc target
:prev (if prev (dissoc prev :content) nil) :prev (if prev (dissoc prev :content) nil)
:next (if next (dissoc next :content) nil))) :next (if next (dissoc next :content) nil)))
(partition 3 1 (flatten [nil pages nil])))) (partition 3 1 (flatten [nil pages nil]))))
(defn group-pages (defn group-pages
@ -253,8 +253,7 @@
:servlet-context (cryogen-io/path "/" blog-prefix "/") :servlet-context (cryogen-io/path "/" blog-prefix "/")
:page page :page page
:uri uri}))) :uri uri})))
(compile-pages params (:children page))) (compile-pages params (:children page)))))
))
(defn compile-posts (defn compile-posts
"Compiles all the posts into html and spits them out into the public folder" "Compiles all the posts into html and spits them out into the public folder"
@ -359,17 +358,17 @@
(doseq [{:keys [index posts prev next]} previews (doseq [{:keys [index posts prev next]} previews
:let [index-page? (= 1 index)]] :let [index-page? (= 1 index)]]
(write-html (write-html
(if index-page? (page-uri "index.html" params) (if index-page? (page-uri "index.html" params)
(page-uri (cryogen-io/path "p" (str index ".html")) params)) (page-uri (cryogen-io/path "p" (str index ".html")) params))
params params
(render-file "/html/previews.html" (render-file "/html/previews.html"
(merge params (merge params
{:active-page "preview" {:active-page "preview"
:home (when index-page? true) :home (when index-page? true)
:servlet-context (cryogen-io/path "/" blog-prefix "/") :servlet-context (cryogen-io/path "/" blog-prefix "/")
:posts posts :posts posts
:prev-uri prev :prev-uri prev
:next-uri next}))))))) :next-uri next})))))))
(defn compile-index (defn compile-index
"Compiles the index page into html and spits it out into the public folder" "Compiles the index page into html and spits it out into the public folder"
@ -444,9 +443,9 @@
(let [folders (->> (markup-entries post-root page-root) (let [folders (->> (markup-entries post-root page-root)
(filter template-dir?))] (filter template-dir?))]
(cryogen-io/copy-resources (cryogen-io/copy-resources
(merge config (merge config
{:resources folders {:resources folders
:ignored-files (map #(re-pattern-from-ext (m/ext %)) (m/markups))})))) :ignored-files (map #(re-pattern-from-ext (m/ext %)) (m/markups))}))))
(defn read-config (defn read-config
"Reads the config file" "Reads the config file"
@ -469,12 +468,11 @@
(update-in [:post-date-format] (fnil str "yyyy-MM-dd")) (update-in [:post-date-format] (fnil str "yyyy-MM-dd"))
(update-in [:keep-files] (fnil seq [])) (update-in [:keep-files] (fnil seq []))
(update-in [:ignored-files] (fnil seq [#"^\.#.*" #".*\.swp$"])) (update-in [:ignored-files] (fnil seq [#"^\.#.*" #".*\.swp$"]))
(update-in [:page-model] (fnil keyword :flat)) (update-in [:page-model] (fnil keyword :flat)))]
)]
(merge (merge
config config
{:page-root-uri (root-uri :page-root-uri config) {:page-root-uri (root-uri :page-root-uri config)
:post-root-uri (root-uri :post-root-uri config)})) :post-root-uri (root-uri :post-root-uri config)}))
(catch Exception _ (catch Exception _
(throw (IllegalArgumentException. "Failed to parse config.edn"))))) (throw (IllegalArgumentException. "Failed to parse config.edn")))))
@ -545,9 +543,11 @@
(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/" (cp-io/copy-resources-from-user! "resources/"
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)
(compile-pages params modelled-pages) (compile-pages params modelled-pages)
(compile-posts params posts) (compile-posts params posts)
@ -576,10 +576,10 @@
(defn compile-assets-timed [] (defn compile-assets-timed []
(time (time
(try (try
(compile-assets) (compile-assets)
(catch Exception e (catch Exception e
(if (or (instance? IllegalArgumentException e) (if (or (instance? IllegalArgumentException e)
(instance? clojure.lang.ExceptionInfo e)) (instance? clojure.lang.ExceptionInfo e))
(println (red "Error:") (yellow (.getMessage e))) (println (red "Error:") (yellow (.getMessage e)))
(write-exception e)))))) (write-exception e))))))