clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sync allows to pick a non-empty folder to sync with remote

Browse Source
This commit is contained in:
Tienson Qin
2022-09-06 17:29:36 +08:00
committed by Andelf
parent d822f5928a
commit 34d3ffe122
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/frontend/components/file_sync.cljs
View File

@@ -340,39 +340,37 @@
[:div.-mt-1
(ui/button
(str "Open a local directory")
:class "w-full rounded-t-none py-4"
:on-click #(-> (page-handler/ls-dir-files!
(fn [{:keys [url]}]
(file-sync-handler/init-remote-graph url)
;; TODO: wait for switch done
(js/setTimeout (fn [] (repo-handler/refresh-repos!)) 200))
(str "Open a local directory")
:class "w-full rounded-t-none py-4"
:on-click #(page-handler/ls-dir-files!
(fn [{:keys [url]}]
(file-sync-handler/init-remote-graph url)
;; TODO: wait for switch done
(js/setTimeout (fn [] (repo-handler/refresh-repos!)) 200))
{:empty-dir?-or-pred
(fn [ret]
(let [empty-dir? (nil? (second ret))]
(if-let [root (first ret)]
{:empty-dir?-or-pred
(fn [ret]
(let [empty-dir? (nil? (second ret))]
(if-let [root (first ret)]
;; verify directory
(-> (if empty-dir?
(p/resolved nil)
(if (util/electron?)
(ipc/ipc :readGraphTxIdInfo root)
(fs-util/read-graph-txid-info root)))
;; verify directory
(-> (if empty-dir?
(p/resolved nil)
(if (util/electron?)
(ipc/ipc :readGraphTxIdInfo root)
(fs-util/read-graph-txid-info root)))
(p/then (fn [^js info]
(when (and (not empty-dir?)
(or (nil? info)
(nil? (second info))
(not= (second info) (:GraphUUID graph))))
(throw (js/Error. "AssertDirectoryError"))))))
(p/then (fn [^js info]
(when (and (not empty-dir?)
(or (nil? info)
(nil? (second info))
(not= (second info) (:GraphUUID graph))))
(if (js/confirm "This directory is not empty, are you sure to sync the remote graph with it? Make sure to back up the directory first.")
(p/resolved nil)
(throw (js/Error. nil)))))))
;; cancel pick a directory
(throw (js/Error. nil)))))})
(p/catch (fn [^js e]
(when (= "AssertDirectoryError" (.-message e))
(notifications/show! "Please select an empty directory or an existing remote graph!" :error))))))
;; cancel pick a directory
(throw (js/Error. nil)))))}))
[:p.text-xs.opacity-50.px-1 (ui/icon "alert-circle") " An empty directory or an existing remote graph!"]]])
(defn pick-dest-to-sync-panel [graph]