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

add experimental theme support

Browse source
This commit is contained in:
Albert Lai 2015-06-14 18:23:58 +08:00
parent 717b2dc370
commit 7c443a8b5c
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/cryogen_core/compiler.clj
View file

@ -1,5 +1,6 @@
(ns cryogen-core.compiler (ns cryogen-core.compiler
(:require [selmer.parser :refer [cache-off! render-file]] (:require [selmer.parser :refer [cache-off! render-file]]
[selmer.util :refer [set-custom-resource-path!]]
[cryogen-core.io :refer [cryogen-core.io :refer
[get-resource find-assets create-folder wipe-public-folder copy-resources [get-resource find-assets create-folder wipe-public-folder copy-resources
copy-images-from-markdown-folders]] copy-images-from-markdown-folders]]
@ -196,7 +197,7 @@
(doseq [{:keys [uri] :as page} pages] (doseq [{:keys [uri] :as page} pages]
(println "\t-->" (cyan uri)) (println "\t-->" (cyan uri))
(spit (str public uri) (spit (str public uri)
(render-file "templates/html/layouts/page.html" (render-file "page.html"
(merge params (merge params
{:servlet-context "../" {:servlet-context "../"
:page page :page page
@ -211,7 +212,7 @@
(doseq [post posts] (doseq [post posts]
(println "\t-->" (cyan (:uri post))) (println "\t-->" (cyan (:uri post)))
(spit (str public (:uri post)) (spit (str public (:uri post))
(render-file (str "templates/html/layouts/" (:layout post)) (render-file (str (:layout post))
(merge params (merge params
{:servlet-context "../" {:servlet-context "../"
:post post :post post
@ -228,7 +229,7 @@
(let [{:keys [name uri]} (tag-info params tag)] (let [{:keys [name uri]} (tag-info params tag)]
(println "\t-->" (cyan uri)) (println "\t-->" (cyan uri))
(spit (str public uri) (spit (str public uri)
(render-file "templates/html/layouts/tag.html" (render-file "tag.html"
(merge params (merge params
{:servlet-context "../" {:servlet-context "../"
:name name :name name
@ -240,7 +241,7 @@
[{:keys [blog-prefix disqus?] :as params}] [{:keys [blog-prefix disqus?] :as params}]
(println (blue "compiling index")) (println (blue "compiling index"))
(spit (str public blog-prefix "/index.html") (spit (str public blog-prefix "/index.html")
(render-file "templates/html/layouts/home.html" (render-file "home.html"
(merge params (merge params
{:home true {:home true
:disqus? disqus? :disqus? disqus?
@ -252,7 +253,7 @@
[{:keys [blog-prefix] :as params} posts] [{:keys [blog-prefix] :as params} posts]
(println (blue "compiling archives")) (println (blue "compiling archives"))
(spit (str public blog-prefix "/archives.html") (spit (str public blog-prefix "/archives.html")
(render-file "templates/html/layouts/archives.html" (render-file "archives.html"
(merge params (merge params
{:archives true {:archives true
:groups (group-for-archive posts) :groups (group-for-archive posts)
@ -263,6 +264,16 @@
[posts config] [posts config]
(map #(update-in % [:tags] (partial map (partial tag-info config))) posts)) (map #(update-in % [:tags] (partial map (partial tag-info config))) posts))
(defn copy-resources-from-theme
"Copy resources from theme"
[config]
(let [theme-path (str "themes/" (:theme config))]
(copy-resources
(merge config
{:resources [(str theme-path "/css")
(str theme-path "/js")]}))))
(defn read-config (defn read-config
"Reads the config file" "Reads the config file"
[] []
@ -306,9 +317,13 @@
:archives-uri (str blog-prefix "/archives.html") :archives-uri (str blog-prefix "/archives.html")
:index-uri (str blog-prefix "/index.html") :index-uri (str blog-prefix "/index.html")
:rss-uri (str blog-prefix "/" rss-name) :rss-uri (str 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)
:site-theme-path (str "file:resources/templates/themes/" (:theme config) "/html/layouts/")})]
(set-custom-resource-path! (:site-theme-path params))
(wipe-public-folder keep-files) (wipe-public-folder keep-files)
(println (blue "copying theme resources"))
(copy-resources-from-theme config)
(println (blue "copying resources")) (println (blue "copying resources"))
(copy-resources config) (copy-resources config)
(copy-images-from-markdown-folders config) (copy-images-from-markdown-folders config)

2
src/cryogen_core/io.clj
View file

@ -62,7 +62,7 @@
(defn copy-resources [{:keys [blog-prefix resources ignored-files]}] (defn copy-resources [{:keys [blog-prefix resources ignored-files]}]
(doseq [resource resources] (doseq [resource resources]
(let [src (str "resources/templates/" resource) (let [src (str "resources/templates/" resource)
target (str public blog-prefix "/" resource)] target (str public blog-prefix "/" (fs/base-name resource))]
(cond (cond
(not (.exists (io/file src))) (not (.exists (io/file src)))
(throw (IllegalArgumentException. (str "resource " src " not found"))) (throw (IllegalArgumentException. (str "resource " src " not found")))