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

fix(native fs): Directory handle not exists 

Resolved #918
pull/927/head
Tienson Qin 2020-12-14 19:18:17 +08:00
parent 2e30872f61
commit cfed1530d3
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@
%) files)]
(if-let [file (:file/file ignore-file)]
(p/let [content (.text file)]
(when content
(let [paths (set (file-handler/ignore-files content (map :file/path files)))]
(when (seq paths)
@ -78,14 +79,18 @@
(defn- set-files!
[handles]
(doseq [[path handle] handles]
(let [handle-path (str config/local-handle-prefix path)]
(fs/add-nfs-file-handle! handle-path handle)))
(set-files-aux! handles))
(let [handles (map (fn [[path handle]]
(let [handle-path (str config/local-handle-prefix path)]
[handle-path handle]))
handles)]
(doseq [[path handle] handles]
(fs/add-nfs-file-handle! path handle))
(set-files-aux! handles)))
(defn ls-dir-files
[]
(let [path-handles (atom {})]
;; TODO: add ext filter to avoid loading .git or other ignored file handlers
(->
(p/let [result (utils/openDirectory #js {:recursive true}
(fn [path handle]
@ -104,8 +109,15 @@
(swap! path-handles (fn [handles]
(->> handles
(filter (fn [[path _handle]]
(contains? file-paths
(string/replace-first path (str dir-name "/") ""))))
(or
(contains? file-paths
(string/replace-first path (str dir-name "/") ""))
(let [last-part (last (string/split path "/"))]
(contains? #{config/app-name
config/default-draw-directory
config/default-journals-directory
config/default-pages-directory}
last-part)))))
(into {})))))
_ (set-files! @path-handles)
markup-files (filter-markup-and-built-in-files files)]