greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: avoid "file modified" notice after refreshing

pull/2607/head
Tienson Qin 2021-08-25 09:53:21 +08:00
parent a378170c26
commit 03bcf017fc
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/electron/electron/git.cljs
View File

@ -34,9 +34,11 @@
result))))) result)))))
(defn init! (defn init!
[] ([]
(when-let [git ^js (get-git)] (init! (get-git)))
(.init git false))) ([^js git]
(when git
(.init git false))))
(defn add-all! (defn add-all!
([] ([]
@ -50,7 +52,8 @@
(add-all-and-commit! "Auto saved by Logseq")) (add-all-and-commit! "Auto saved by Logseq"))
([message] ([message]
(when-let [git ^js (get-git)] (when-let [git ^js (get-git)]
(p/let [_ (add-all! git)] (p/let [_ (init! git)
_ (add-all! git)]
(.commit git message))))) (.commit git message)))))
(defonce quotes-regex #"\"[^\"]+\"") (defonce quotes-regex #"\"[^\"]+\"")

6
src/main/frontend/handler/web/nfs.cljs
View File

@ -190,7 +190,11 @@
new-file-paths (file-path-set-f new-files) new-file-paths (file-path-set-f new-files)
added (set/difference new-file-paths old-file-paths) added (set/difference new-file-paths old-file-paths)
deleted (set/difference old-file-paths new-file-paths) deleted (set/difference old-file-paths new-file-paths)
modified (set/difference new-file-paths added)] modified (->> (set/intersection new-file-paths old-file-paths)
(filter (fn [path]
(not= (:file/last-modified-at (get-file-f old-files path))
(:file/last-modified-at (get-file-f new-files path)))))
(set))]
{:added added {:added added
:modified modified :modified modified
:deleted deleted})) :deleted deleted}))