clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-24 22:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: lint and remove unused ast in file graph exporter

Browse Source 
Also remove unused options on d/transact!
This commit is contained in:
Gabriel Horner
2024-02-12 15:52:14 -05:00
parent 06ad57efff
commit 6dc1272bf2
3 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/graph-parser/.carve/ignore vendored
View File

@@ -22,3 +22,5 @@ logseq.graph-parser.block/extract-refs-from-text
logseq.graph-parser.text/get-page-name
;; API
logseq.graph-parser.whiteboard/shape->block
;; API
logseq.graph-parser.exporter/add-file-to-db-graph

84
deps/graph-parser/src/logseq/graph_parser/exporter.cljs vendored
View File

@@ -160,55 +160,47 @@
* :extract-options - Options map to pass to extract/extract
* :user-options - User provided options that alter how a file is converted to db graph
* :page-tags-uuid - uuid of pageTags property"
[conn file content {:keys [extract-options user-options page-tags-uuid]
:as options}]
[conn file content {:keys [extract-options user-options page-tags-uuid]}]
(let [format (common-util/get-format file)
tag-classes (set (map string/lower-case (:tag-classes user-options)))
{:keys [tx ast]}
(let [extract-options' (merge {:block-pattern (common-config/get-block-pattern format)
:date-formatter "MMM do, yyyy"
:uri-encoded? false
:db-graph-mode? true
:filename-format :legacy}
extract-options
{:db @conn})
{:keys [pages blocks ast refs]
:or {pages []
blocks []
ast []}}
(cond (contains? common-config/mldoc-support-formats format)
(extract/extract file content extract-options')
extract-options' (merge {:block-pattern (common-config/get-block-pattern format)
:date-formatter "MMM do, yyyy"
:uri-encoded? false
:db-graph-mode? true
:filename-format :legacy}
extract-options
{:db @conn})
{:keys [refs] :as extracted}
(cond (contains? common-config/mldoc-support-formats format)
(extract/extract file content extract-options')
(common-config/whiteboard? file)
(extract/extract-whiteboard-edn file content extract-options')
(common-config/whiteboard? file)
(extract/extract-whiteboard-edn file content extract-options')
:else
(println "Skipped file since its format is not supported:" file))
;; Build page and block txs
pages (build-pages-tx conn pages blocks tag-classes page-tags-uuid)
whiteboard-pages (->> pages
(filter #(= "whiteboard" (:block/type %)))
(map (fn [page-block]
(-> page-block
(assoc :block/journal? false
:block/format :markdown
:else
(println "Skipped file since its format is not supported:" file))
;; Build page and block txs
pages (build-pages-tx conn (:pages extracted) (:blocks extracted) tag-classes page-tags-uuid)
whiteboard-pages (->> pages
(filter #(= "whiteboard" (:block/type %)))
(map (fn [page-block]
(-> page-block
(assoc :block/journal? false
:block/format :markdown
;; fixme: missing properties
:block/properties {(get-pid @conn :ls-type) :whiteboard-page})))))
blocks (map #(update-imported-block conn % tag-classes) blocks)
;; Build indices
pages-index (map #(select-keys % [:block/name]) pages)
block-ids (map (fn [block] {:block/uuid (:block/uuid block)}) blocks)
block-refs-ids (->> (mapcat :block/refs blocks)
(filter (fn [ref] (and (vector? ref)
(= :block/uuid (first ref)))))
(map (fn [ref] {:block/uuid (second ref)}))
(seq))
;; To prevent "unique constraint" on datascript
block-ids (set/union (set block-ids) (set block-refs-ids))]
{:tx (concat refs whiteboard-pages pages-index pages block-ids blocks)
:ast ast})
:block/properties {(get-pid @conn :ls-type) :whiteboard-page})))))
blocks (map #(update-imported-block conn % tag-classes) (:blocks extracted))
;; Build indices
pages-index (map #(select-keys % [:block/name]) pages)
block-ids (map (fn [block] {:block/uuid (:block/uuid block)}) blocks)
block-refs-ids (->> (mapcat :block/refs blocks)
(filter (fn [ref] (and (vector? ref)
(= :block/uuid (first ref)))))
(map (fn [ref] {:block/uuid (second ref)}))
(seq))
;; To prevent "unique constraint" on datascript
block-ids (set/union (set block-ids) (set block-refs-ids))
tx (concat refs whiteboard-pages pages-index pages block-ids blocks)
tx' (common-util/fast-remove-nils tx)
result (d/transact! conn tx' (select-keys options [:new-graph? :from-disk?]))]
{:tx-report result
:ast ast}))
result (d/transact! conn tx')]
result))

2
src/main/frontend/components/imports.cljs
View File

@@ -189,7 +189,7 @@
:file/content content}))
(p/then (fn [m]
;; Write to frontend first as writing to worker first is poor ux with slow streaming changes
(let [{:keys [tx-report]}
(let [tx-report
(gp-exporter/add-file-to-db-graph
db-conn
(:file/path m)