fix: introduce more page-name sanity

This commit is contained in:
Junyi Du
2022-01-07 02:31:08 +08:00
committed by Tienson Qin
parent 43da23eecd
commit 7505b0dde6
14 changed files with 45 additions and 45 deletions

View File

@@ -255,13 +255,12 @@
"Convert journal file name to user' custom date format"
[original-page-name]
(when original-page-name
(let [page-name (-> (string/lower-case original-page-name)
(util/page-name-sanity))
(let [page-name (util/page-name-sanity-lc original-page-name)
day (date/journal-title->int page-name)]
(if day
(let [original-page-name (date/int->journal-title day)]
[original-page-name (string/lower-case original-page-name) day])
[original-page-name page-name day]))))
(if day
(let [original-page-name (date/int->journal-title day)]
[original-page-name (util/page-name-sanity-lc original-page-name) day])
[original-page-name page-name day]))))
(defn page-name->map
[original-page-name with-id?]
@@ -281,7 +280,7 @@
(when namespace?
(let [namespace (first (util/split-last "/" original-page-name))]
(when-not (string/blank? namespace)
{:block/namespace {:block/name (string/lower-case namespace)}}))))]
{:block/namespace {:block/name (util/page-name-sanity-lc namespace)}}))))]
(if journal-day
(merge m
{:block/journal? true
@@ -407,7 +406,7 @@
(remove string/blank?)
(map (fn [ref]
(if (string? ref)
{:block/name (string/lower-case ref)}
{:block/name (util/page-name-sanity-lc ref)}
ref)))
(remove vector?)
(remove nil?)
@@ -421,7 +420,7 @@
(if (seq tags)
(assoc block :tags (map (fn [tag]
(let [tag (text/page-ref-un-brackets! tag)]
[:block/name (string/lower-case tag)])) tags))
[:block/name (util/page-name-sanity-lc tag)])) tags))
block))
(defn src-block?