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

Silence noisy parsing tests

Browse Source 
Added :verbose option to repo-handler/parse-files-and-load-to-db!
This commit is contained in:
Gabriel Horner
2022-07-22 16:11:13 -04:00
committed by Andelf
parent 5f8a4ed0bf
commit bc69e7d5a1
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/frontend/handler/file.cljs
View File

@@ -106,7 +106,7 @@
(defn reset-file!
([repo-url file content]
(reset-file! repo-url file content {}))
([repo-url file content options]
([repo-url file content {:keys [verbose] :as options}]
(let [electron-local-repo? (and (util/electron?)
(config/local-db? repo-url))
file (cond
@@ -135,18 +135,20 @@
(db/get-db repo-url false)
file
content
(merge options
(merge (dissoc options :verbose)
{:new? new?
:delete-blocks-fn (partial get-delete-blocks repo-url)
:extract-options {:user-config (state/get-config)
:date-formatter (state/get-date-formatter)
:page-name-order (state/page-name-order)
:block-pattern (config/get-block-pattern (gp-util/get-format file))
:supported-formats (gp-config/supported-formats)}}))))))
:extract-options (merge
{:user-config (state/get-config)
:date-formatter (state/get-date-formatter)
:page-name-order (state/page-name-order)
:block-pattern (config/get-block-pattern (gp-util/get-format file))
:supported-formats (gp-config/supported-formats)}
(when (some? verbose) {:verbose verbose}))}))))))
;; TODO: Remove this function in favor of `alter-files`
(defn alter-file
[repo path content {:keys [reset? re-render-root? from-disk? skip-compare? new-graph?]
[repo path content {:keys [reset? re-render-root? from-disk? skip-compare? new-graph? verbose]
:or {reset? true
re-render-root? false
from-disk? false
@@ -166,7 +168,8 @@
[[:db/retract page-id :block/alias]
[:db/retract page-id :block/tags]]
opts))
(reset-file! repo path content opts))
(reset-file! repo path content (merge opts
(when (some? verbose) {:verbose verbose}))))
(db/set-file-content! repo path content opts))
(util/p-handle (write-file!)
(fn [_]

14
src/main/frontend/handler/repo.cljs
View File

@@ -183,14 +183,15 @@
(load-pages-metadata! repo file-paths files force?)))
(defn- parse-and-load-file!
[repo-url file new-graph?]
[repo-url file {:keys [new-graph? verbose]}]
(try
(file-handler/alter-file repo-url
(:file/path file)
(:file/content file)
{:new-graph? new-graph?
:re-render-root? false
:from-disk? true})
(merge {:new-graph? new-graph?
:re-render-root? false
:from-disk? true}
(when (some? verbose) {:verbose verbose})))
(catch :default e
(state/set-parsing-state! (fn [m]
(update m :failed-parsing-files conj [(:file/path file) e])))))
@@ -215,7 +216,6 @@
(defn- parse-files-and-create-default-files-inner!
[repo-url files delete-files delete-blocks file-paths db-encrypted? re-render? re-render-opts opts]
(let [supported-files (graph-parser/filter-files files)
new-graph? (:new-graph? opts)
delete-data (->> (concat delete-files delete-blocks)
(remove nil?))
chan (async/to-chan! supported-files)
@@ -229,7 +229,7 @@
(doseq [file supported-files]
(state/set-parsing-state! (fn [m]
(assoc m :current-parsing-file (:file/path file))))
(parse-and-load-file! repo-url file new-graph?))
(parse-and-load-file! repo-url file (select-keys opts [:new-graph? :verbose])))
(after-parse repo-url files file-paths db-encrypted? re-render? re-render-opts opts graph-added-chan))
(async/go-loop []
(if-let [file (async/<! chan)]
@@ -237,7 +237,7 @@
(state/set-parsing-state! (fn [m]
(assoc m :current-parsing-file (:file/path file))))
(async/<! (async/timeout 10))
(parse-and-load-file! repo-url file new-graph?)
(parse-and-load-file! repo-url file (select-keys opts [:new-graph? :verbose]))
(recur))
(after-parse repo-url files file-paths db-encrypted? re-render? re-render-opts opts graph-added-chan))))
graph-added-chan))

2
src/test/frontend/handler/repo_test.cljs
View File

@@ -14,7 +14,7 @@
(let [graph-dir "src/test/docs"
_ (docs-graph-helper/clone-docs-repo-if-not-exists graph-dir)
files (gp-cli/build-graph-files graph-dir)
_ (repo-handler/parse-files-and-load-to-db! test-helper/test-db files {:re-render? false})
_ (repo-handler/parse-files-and-load-to-db! test-helper/test-db files {:re-render? false :verbose false})
db (conn/get-db test-helper/test-db)]
(docs-graph-helper/docs-graph-assertions db (map :file/path files))))

2
src/test/frontend/test/helper.cljs
View File

@@ -22,4 +22,4 @@
(conn/start! current-repo)))
(defn load-test-files [files]
(repo-handler/parse-files-and-load-to-db! test-db files {:re-render? false}))
(repo-handler/parse-files-and-load-to-db! test-db files {:re-render? false :verbose false}))