clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-02 09:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into disable-webview-resize

Browse Source
This commit is contained in:
llcc
2022-05-23 21:09:38 +08:00
committed by GitHub
parent b13f0e336e 9bcfb9783d
commit df33aba4e6
25 changed files with 510 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,12 +26,12 @@
[frontend.encrypt :as encrypt]))
(defn remove-ignore-files
[files]
[files dir-name nfs?]
(let [files (remove (fn [f]
(let [path (:file/path f)]
(or (string/starts-with? path ".git/")
(string/includes? path ".git/")
(and (util-fs/ignored-path? "" path)
(and (util-fs/ignored-path? (if nfs? "" dir-name) path)
(not= (:file/name f) ".gitignore")))))
files)]
(if-let [ignore-file (some #(when (= (:file/name %) ".gitignore")
@@ -55,7 +55,7 @@
:file/last-modified-at mtime
:file/size size
:file/content content})
result)
result)
electron?
(map (fn [{:keys [path stat content]}]
@@ -64,7 +64,7 @@
:file/last-modified-at mtime
:file/size size
:file/content content}))
result)
result)
:else
(let [result (flatten (bean/->clj result))]
@@ -147,7 +147,7 @@
(nfs/add-nfs-file-handle! root-handle-path root-handle))
result (nth result 1)
files (-> (->db-files mobile-native? electron? dir-name result)
remove-ignore-files)
(remove-ignore-files dir-name nfs?))
_ (when nfs?
(let [file-paths (set (map :file/path files))]
(swap! path-handles (fn [handles]
@@ -297,7 +297,7 @@
(when nfs?
(swap! path-handles assoc path handle))))
new-files (-> (->db-files mobile-native? electron? dir-name files-result)
remove-ignore-files)
(remove-ignore-files dir-name nfs?))
_ (when nfs?
(let [file-paths (set (map :file/path new-files))]
(swap! path-handles (fn [handles]