This commit is contained in:
@@ -16,14 +16,22 @@
|
|||||||
|
|
||||||
(def ^:dynamic *worker*)
|
(def ^:dynamic *worker*)
|
||||||
|
|
||||||
(defn worker [& {:keys [preamble]}]
|
(def ^:private prelude-file
|
||||||
|
(fs/create-temp-file {:prefix "doerg-prelude-"
|
||||||
|
:suffix ".tex"}))
|
||||||
|
|
||||||
|
(defn worker []
|
||||||
(let [doerg-temml-worker (::cfg/doerg-temml-worker cfg/*cfg*)]
|
(let [doerg-temml-worker (::cfg/doerg-temml-worker cfg/*cfg*)]
|
||||||
|
(when-not (fs/exists? prelude-file)
|
||||||
|
(-> "net/deertopia/doerg/prelude.tex"
|
||||||
|
io/resource
|
||||||
|
io/input-stream
|
||||||
|
(io/copy prelude-file)))
|
||||||
(p/process
|
(p/process
|
||||||
{:shutdown p/destroy-tree
|
{:shutdown p/destroy-tree
|
||||||
:err (l/log-stream :info "temml/err")}
|
:err (l/log-stream :info "temml/err")}
|
||||||
doerg-temml-worker
|
doerg-temml-worker
|
||||||
"--preamble"
|
"--preamble" prelude-file)))
|
||||||
"resources/net/deertopia/doerg/prelude.tex")))
|
|
||||||
|
|
||||||
(defn close-worker [tw]
|
(defn close-worker [tw]
|
||||||
(.close (:in tw)))
|
(.close (:in tw)))
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
[reitit.ring.coercion]
|
[reitit.ring.coercion]
|
||||||
[reitit.core :as r]
|
[reitit.core :as r]
|
||||||
[reitit.ring]
|
[reitit.ring]
|
||||||
[reitit.ring.middleware.exception]
|
[reitit.ring.middleware.exception :as reitit-exception]
|
||||||
[ring.util.response :as response]
|
[ring.util.response :as response]
|
||||||
[spec-tools.spell]
|
[spec-tools.spell]
|
||||||
[reitit.spec]
|
[reitit.spec]
|
||||||
@@ -39,17 +39,18 @@
|
|||||||
|
|
||||||
(defn node-by-slug [{{{:keys [slug]} :path} :parameters}]
|
(defn node-by-slug [{{{:keys [slug]} :path} :parameters}]
|
||||||
(-> (hiccup/html {}
|
(-> (hiccup/html {}
|
||||||
[:html
|
[:html
|
||||||
[:head
|
[:head
|
||||||
[:title "node by sluggg"]
|
[:title "node by sluggg"]
|
||||||
doerg-html/charset
|
doerg-html/charset
|
||||||
doerg-html/viewport]
|
doerg-html/viewport]
|
||||||
[:body
|
[:body
|
||||||
[:h1 "node by slug"]
|
[:h1 "node by slug"]
|
||||||
[:pre
|
[:pre
|
||||||
(with-out-str
|
(-> slug slug/from-string roam/get-node
|
||||||
(pprint (-> slug slug/from-string roam/get-node
|
roam/org-file doerg-render/to-html)]]])
|
||||||
roam/org-file)))]]])
|
#_(-> slug slug/from-string roam/get-node
|
||||||
|
roam/org-file doerg-render/to-html)
|
||||||
str
|
str
|
||||||
response/response
|
response/response
|
||||||
(response/content-type "text/html")))
|
(response/content-type "text/html")))
|
||||||
@@ -57,6 +58,15 @@
|
|||||||
(defn node-by-id [req]
|
(defn node-by-id [req]
|
||||||
(hello req))
|
(hello req))
|
||||||
|
|
||||||
|
(def exception-middleware
|
||||||
|
(reitit-exception/create-exception-middleware
|
||||||
|
(merge
|
||||||
|
reitit-exception/default-handlers
|
||||||
|
{::reitit-exception/wrap
|
||||||
|
(fn [handler e request]
|
||||||
|
(l/error e "error in fucking somwhere dude")
|
||||||
|
(handler e request))})))
|
||||||
|
|
||||||
(def router
|
(def router
|
||||||
(reitit.ring/router
|
(reitit.ring/router
|
||||||
#{["/" {:get hello}]
|
#{["/" {:get hello}]
|
||||||
@@ -70,7 +80,7 @@
|
|||||||
:spec (s/merge :reitit.spec/default-data)
|
:spec (s/merge :reitit.spec/default-data)
|
||||||
:data
|
:data
|
||||||
{:coercion reitit.coercion.spec/coercion
|
{:coercion reitit.coercion.spec/coercion
|
||||||
:middleware [reitit.ring.middleware.exception/exception-middleware
|
:middleware [exception-middleware
|
||||||
reitit.ring.coercion/coerce-request-middleware
|
reitit.ring.coercion/coerce-request-middleware
|
||||||
reitit.ring.coercion/coerce-response-middleware
|
reitit.ring.coercion/coerce-response-middleware
|
||||||
#_reitit.ring.coercion/coerce-exceptions-middleware]}}))
|
#_reitit.ring.coercion/coerce-exceptions-middleware]}}))
|
||||||
|
|||||||
Reference in New Issue
Block a user