clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-02 09:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: more import fixes after testing more graphs

Browse Source 
- collapsed:: false was failing an import
- ignore more attributes for existing pages
- also fixed import script not handling macros and absolute paths
  correctly
This commit is contained in:
Gabriel Horner
2024-02-29 15:05:23 -05:00
parent 49cc17dea5
commit 0b0299b28f
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
deps/graph-parser/script/db_import.cljs vendored
View File

@@ -37,6 +37,14 @@
(p/let [s (fsp/readFile (:rpath file))]
(str s)))
(defn- build-import-options [conn config options]
(-> (gp-exporter/setup-import-options
@conn
{}
(select-keys options [:tag-classes :property-classes])
{:notify-user prn :macros (:macros config)})
(assoc-in [:extract-options :verbose] (:verbose options))))
(defn- import-file-graph-to-db [file-graph-dir conn options]
(p/let [*files (build-graph-files file-graph-dir)
config-file (first (filter #(string/ends-with? (:rpath %) "logseq/config.edn") *files))
@@ -44,12 +52,7 @@
;; TODO: Add :default-config option
config (gp-exporter/import-config-file! conn config-file <read-file {:notify-user prn})
files (remove-hidden-files file-graph-dir config *files)
import-options (-> (gp-exporter/setup-import-options
@conn
{}
(select-keys options [:tag-classes :property-classes])
{:notify-user prn})
(assoc-in [:extract-options :verbose] (:verbose options)))
import-options (build-import-options conn config options)
logseq-file? #(string/includes? (:rpath %) "logseq/")
doc-files (remove logseq-file? files)
logseq-files (filter logseq-file? files)]
@@ -58,16 +61,17 @@
(gp-exporter/import-logseq-files conn logseq-files <read-file {:notify-user prn})
(gp-exporter/import-from-doc-files! conn doc-files <read-file import-options))))
(defn- resolve-path
"If relative path, resolve with $ORIGINAL_PWD"
[path]
(if (node-path/isAbsolute path)
path
(node-path/join (or js/process.env.ORIGINAL_PWD ".") path)))
(defn- import-files-to-db [file conn {:keys [files] :as options}]
(let [import-options (-> (gp-exporter/setup-import-options
@conn
{}
(select-keys options [:tag-classes :property-classes])
{:notify-user prn})
(assoc-in [:extract-options :verbose] (:verbose options)))
(let [import-options (build-import-options conn {:macros {}} options)
files' (mapv #(hash-map :rpath %)
(into [file]
(map #(node-path/join (or js/process.env.ORIGINAL_PWD ".") %) files)))]
(into [file] (map resolve-path files)))]
(gp-exporter/import-from-doc-files! conn files' <read-file import-options)))
(def spec
@@ -94,11 +98,10 @@
(cli/format-opts {:spec spec})))
(js/process.exit 1))
[dir db-name] (if (string/includes? db-graph-dir "/")
(let [graph-dir'
(node-path/join (or js/process.env.ORIGINAL_PWD ".") db-graph-dir)]
(let [graph-dir' (resolve-path db-graph-dir)]
((juxt node-path/dirname node-path/basename) graph-dir'))
[(node-path/join (os/homedir) "logseq" "graphs") db-graph-dir])
file-graph' (node-path/join (or js/process.env.ORIGINAL_PWD ".") file-graph)
file-graph' (resolve-path file-graph)
conn (create-graph/init-conn dir db-name)
directory? (.isDirectory (fs/statSync file-graph'))]
(p/do!