From fb832d24931eed268ef79f5b97b9ea2cf9be48d2 Mon Sep 17 00:00:00 2001
From: Peng Xiao <pengxiao@outlook.com>
Date: Mon, 4 Jul 2022 00:41:29 +0800
Subject: [PATCH] fix: indexing whiteboard page files

---
 .../graph-parser/src/logseq/graph_parser.cljs |  5 ++--
 .../src/logseq/graph_parser/config.cljs       |  6 ++++
 .../src/logseq/graph_parser/extract.cljc      | 28 +++++++++++--------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/deps/graph-parser/src/logseq/graph_parser.cljs b/deps/graph-parser/src/logseq/graph_parser.cljs
index fc71717d6..3edb1afb9 100644
--- a/deps/graph-parser/src/logseq/graph_parser.cljs
+++ b/deps/graph-parser/src/logseq/graph_parser.cljs
@@ -67,8 +67,9 @@
                        files)
         support-files (sort-by :file/path support-files)
         {journals true non-journals false} (group-by (fn [file] (string/includes? (:file/path file) "journals/")) support-files)
+        {whiteboards true non-whiteboards false} (group-by (fn [file] (string/includes? (:file/path file) "whiteboards/")) non-journals)
         {built-in true others false} (group-by (fn [file]
                                                  (or (string/includes? (:file/path file) "contents.")
                                                      (string/includes? (:file/path file) ".edn")
-                                                     (string/includes? (:file/path file) "custom.css"))) non-journals)]
-    (concat (reverse journals) built-in others)))
+                                                     (string/includes? (:file/path file) "custom.css"))) non-whiteboards)]
+    (concat (reverse journals) (reverse whiteboards) built-in others)))
diff --git a/deps/graph-parser/src/logseq/graph_parser/config.cljs b/deps/graph-parser/src/logseq/graph_parser/config.cljs
index 5d516ef37..f441d2cbd 100644
--- a/deps/graph-parser/src/logseq/graph_parser/config.cljs
+++ b/deps/graph-parser/src/logseq/graph_parser/config.cljs
@@ -15,11 +15,17 @@
   (gp-util/safe-re-find (re-pattern (str "^[./]*" local-assets-dir)) s))
 
 (defonce default-draw-directory "draws")
+;; TODO read configurable value?
+(defonce default-whiteboards-directory "whiteboards")
 
 (defn draw?
   [path]
   (string/starts-with? path default-draw-directory))
 
+(defn whiteboard?
+  [path]
+  (string/includes? path (str "/" default-whiteboards-directory "/")))
+
 ;; TODO: rename
 (defonce mldoc-support-formats
   #{:org :markdown :md})
diff --git a/deps/graph-parser/src/logseq/graph_parser/extract.cljc b/deps/graph-parser/src/logseq/graph_parser/extract.cljc
index 518fda5c2..79cdbd9a4 100644
--- a/deps/graph-parser/src/logseq/graph_parser/extract.cljc
+++ b/deps/graph-parser/src/logseq/graph_parser/extract.cljc
@@ -71,20 +71,24 @@
       (assoc
        (gp-block/page-name->map page false db true date-formatter)
        :block/file {:file/path (gp-util/path-normalize file)}))
-     (seq properties)
-     (assoc :block/properties properties)
+      
+      (seq properties)
+      (assoc :block/properties properties)
 
-     (seq aliases)
-     (assoc :block/alias aliases)
+      (seq aliases)
+      (assoc :block/alias aliases)
 
-     (:tags properties)
-     (assoc :block/tags (let [tags (:tags properties)
-                              tags (if (string? tags) [tags] tags)
-                              tags (remove string/blank? tags)]
-                          (swap! ref-tags set/union (set tags))
-                          (map (fn [tag] {:block/name (gp-util/page-name-sanity-lc tag)
-                                          :block/original-name tag})
-                               tags))))))
+      (gp-config/whiteboard? file)
+      (assoc :block/whiteboard? true)
+
+      (:tags properties)
+      (assoc :block/tags (let [tags (:tags properties)
+                               tags (if (string? tags) [tags] tags)
+                               tags (remove string/blank? tags)]
+                           (swap! ref-tags set/union (set tags))
+                           (map (fn [tag] {:block/name (gp-util/page-name-sanity-lc tag)
+                                           :block/original-name tag})
+                                tags))))))
 
 ;; TODO: performance improvement
 (defn- extract-pages-and-blocks