From bc69e7d5a1960f3402adaebcd8bcf99a8d433709 Mon Sep 17 00:00:00 2001
From: Gabriel Horner <gabriel@logseq.com>
Date: Fri, 22 Jul 2022 16:11:13 -0400
Subject: [PATCH] Silence noisy parsing tests

Added :verbose option to repo-handler/parse-files-and-load-to-db!
---
 src/main/frontend/handler/file.cljs      | 21 ++++++++++++---------
 src/main/frontend/handler/repo.cljs      | 14 +++++++-------
 src/test/frontend/handler/repo_test.cljs |  2 +-
 src/test/frontend/test/helper.cljs       |  2 +-
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/main/frontend/handler/file.cljs b/src/main/frontend/handler/file.cljs
index 17c50b4b8a..40bcc32fd7 100644
--- a/src/main/frontend/handler/file.cljs
+++ b/src/main/frontend/handler/file.cljs
@@ -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 [_]
diff --git a/src/main/frontend/handler/repo.cljs b/src/main/frontend/handler/repo.cljs
index 3cc285c972..628dc39f02 100644
--- a/src/main/frontend/handler/repo.cljs
+++ b/src/main/frontend/handler/repo.cljs
@@ -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))
diff --git a/src/test/frontend/handler/repo_test.cljs b/src/test/frontend/handler/repo_test.cljs
index 144b79cf8f..244a5e8e61 100644
--- a/src/test/frontend/handler/repo_test.cljs
+++ b/src/test/frontend/handler/repo_test.cljs
@@ -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))))
diff --git a/src/test/frontend/test/helper.cljs b/src/test/frontend/test/helper.cljs
index 442ea442b8..acbc3636e8 100644
--- a/src/test/frontend/test/helper.cljs
+++ b/src/test/frontend/test/helper.cljs
@@ -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}))