clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-30 17:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix ends-with nil issue

Browse Source
This commit is contained in:
Peng Xiao
2022-07-13 19:28:22 +08:00
parent 0b1119a61f
commit 2d4e0bef18
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
deps/graph-parser/src/logseq/graph_parser/config.cljs vendored
View File

@@ -24,7 +24,8 @@
(defn whiteboard?
[path]
(and (string/includes? path (str "/" default-whiteboards-directory "/"))
(and path
(string/includes? path (str default-whiteboards-directory "/"))
(string/ends-with? path ".edn")))
;; TODO: rename

22
deps/graph-parser/src/logseq/graph_parser/extract.cljc vendored
View File

@@ -186,17 +186,17 @@
[file content {:keys [verbose] :or {verbose true} :as options}]
(let [_ (when verbose (println "Parsing start: " file))
{:keys [pages blocks]} (gp-util/safe-read-string content)
page-block (first pages)]
(when (:block/whiteboard? page-block)
(let [page-name (filepath->page-name file)
page-entity (build-page-entity {} file page-name page-name nil options)
page-block (merge page-block page-entity {:block/uuid (d/squuid)})
blocks (->> blocks
(map #(merge % {:block/level 1
:block/uuid (gp-block/get-custom-id-or-new-id (:block/properties %))}))
(gp-block/with-parent-and-left {:block/name page-name}))]
{:pages [page-block]
:blocks blocks}))))
page-block (first pages)
page-name (filepath->page-name file)
page-entity (build-page-entity {} file page-name page-name nil options)
page-block (merge page-block page-entity {:block/uuid (d/squuid)})
blocks (->> blocks
(map #(merge % {:block/level 1
:block/uuid (gp-block/get-custom-id-or-new-id (:block/properties %))}))
(gp-block/with-parent-and-left {:block/name page-name}))
_ (when verbose (println "Parsing finished: " file))]
{:pages [page-block]
:blocks blocks}))
(defn- with-block-uuid
[pages]