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

fix: notify users if page name already exists when parsing files

Browse Source
This commit is contained in:
Tienson Qin
2022-11-23 19:49:46 +08:00
parent 295c8c55c1
commit 26e531483a
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/frontend/handler/common/file.cljs
View File

@@ -27,7 +27,7 @@
(distinct))]
(when-let [current-file (page-exists-in-another-file repo-url first-page file)]
(when (not= file current-file)
(let [error (str "Page already exists with another file: " current-file ", current file: " file)]
(let [error (str "Page already exists with another file: " current-file ", current file: " file ". Please keep only one of them and re-index your graph.")]
(state/pub-event! [:notification/show
{:content error
:status :error

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

@@ -181,7 +181,9 @@
chan (async/to-chan! indexed-files)
graph-added-chan (async/promise-chan)
total (count supported-files)
large-graph? (> total 1000)]
large-graph? (> total 1000)
*page-names (atom #{})
*page-name->path (atom {})]
(when (seq delete-data) (db/transact! repo-url delete-data))
(state/set-current-repo! repo-url)
(state/set-parsing-state! {:total (count supported-files)})
@@ -215,7 +217,23 @@
(assoc opts' :skip-db-transact? false)
opts')
result (parse-and-load-file! repo-url file opts')
tx' (if whiteboard? tx (concat tx result))
page-name (some (fn [x] (and (map? x) (:block/name x))) result)
page-exists? (and page-name (get @*page-names page-name))
tx' (cond
whiteboard? tx
page-exists? (do
(state/pub-event! [:notification/show
{:content [:div
(util/format "The file \"%s\" will be skipped because another file \"%s\" has the same page title."
(:file/path file)
(get @*page-name->path page-name))]
:status :warning
:clear? false}])
tx)
:else (concat tx result))
_ (when (and page-name (not page-exists?))
(swap! *page-names conj page-name)
(swap! *page-name->path assoc page-name (:file/path file)))
tx' (if (or whiteboard? (zero? (rem (inc idx) 100)))
(do (db/transact! repo-url tx' {:from-disk? true})
[])