From 0273a18a5f4a69c58ea16147590c989aa5ec6141 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Mon, 22 Nov 2021 18:55:34 +0800 Subject: [PATCH] fix: don't delete files if it's triggered by third-party sync services --- src/main/frontend/fs/watcher_handler.cljs | 3 +-- src/main/frontend/handler/page.cljs | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/frontend/fs/watcher_handler.cljs b/src/main/frontend/fs/watcher_handler.cljs index b617eadbd..344f79937 100644 --- a/src/main/frontend/fs/watcher_handler.cljs +++ b/src/main/frontend/fs/watcher_handler.cljs @@ -36,7 +36,6 @@ (not (:encryption/graph-parsing? @state/state))) (cond (and (= "add" type) - (not= (string/trim content) (string/trim db-content)) (not (string/includes? path "logseq/pages-metadata.edn"))) (p/let [_ (file-handler/alter-file repo path content {:re-render-root? true :from-disk? true})] @@ -69,7 +68,7 @@ (db/file-exists? repo path)) (when-let [page-name (db/get-file-page path)] (println "Delete page: " page-name ", file path: " path ".") - (page-handler/delete! page-name #())) + (page-handler/delete! page-name #() :delete-file? false)) (contains? #{"add" "change" "unlink"} type) nil diff --git a/src/main/frontend/handler/page.cljs b/src/main/frontend/handler/page.cljs index ae9e7ae9c..6321fa3f3 100644 --- a/src/main/frontend/handler/page.cljs +++ b/src/main/frontend/handler/page.cljs @@ -294,7 +294,8 @@ (config-handler/set-config! :favorites favorites)))) (defn delete! - [page-name ok-handler] + [page-name ok-handler & {:keys [delete-file?] + :or {delete-file? true}}] (when page-name (when-let [repo (state/get-current-repo)] (let [page-name (string/lower-case page-name) @@ -305,7 +306,7 @@ blocks)] (db/transact! tx-data) - (delete-file! repo page-name) + (when delete-file? (delete-file! repo page-name)) ;; if other page alias this pagename, ;; then just remove some attrs of this entity instead of retractEntity