From f982a810b3c44064a0fc3dffe651ae805fce4ecb Mon Sep 17 00:00:00 2001
From: Gabriel Horner <gabriel@logseq.com>
Date: Thu, 15 Feb 2024 17:00:14 -0500
Subject: [PATCH] fix: don't import logseq files twice

---
 src/main/frontend/components/imports.cljs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/frontend/components/imports.cljs b/src/main/frontend/components/imports.cljs
index 0c46849c6c..6c0fb1d205 100644
--- a/src/main/frontend/components/imports.cljs
+++ b/src/main/frontend/components/imports.cljs
@@ -345,9 +345,12 @@
           db-conn (db/get-db repo false)
           config (async/<! (p->c (import-config-file! config-file)))
           files (common-config/remove-hidden-files *files config :rpath)
-          doc-files (filter #(contains? #{"md" "org" "markdown" "edn"} (path/file-ext (:rpath %))) files)
+          logseq-file? #(string/starts-with? (:rpath %) "logseq/")
+          doc-files (->> files
+                         (remove logseq-file?)
+                         (filter #(contains? #{"md" "org" "markdown" "edn"} (path/file-ext (:rpath %)))))
           asset-files (filter #(string/starts-with? (:rpath %) "assets/") files)]
-      (async/<! (p->c (import-logseq-files (filter #(string/starts-with? (:rpath %) "logseq/") files))))
+      (async/<! (p->c (import-logseq-files (filter logseq-file? files))))
       (async/<! (import-from-asset-files! asset-files))
       (async/<! (import-from-doc-files! db-conn repo config doc-files
                                         {:tag-classes (set (string/split tags #",\s*"))}))