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-10 17:12:14 +08:00
committed by GitHub
parent a5f8ca01f8 504b47b67a
commit edf4943298
50 changed files with 904 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,8 @@
[frontend.mobile.util :as mobile-util]
[logseq.graph-parser.util :as gp-util]
[logseq.graph-parser.config :as gp-config]
[clojure.core.async :as async]))
[clojure.core.async :as async]
[frontend.encrypt :as encrypt]))
(defn remove-ignore-files
[files]
@@ -168,7 +169,8 @@
(-> (p/all (map (fn [file]
(p/let [content (if nfs?
(.text (:file/file file))
(:file/content file))]
(:file/content file))
content (encrypt/decrypt content)]
(assoc file :file/content content))) markup-files))
(p/then (fn [result]
(let [files (map #(dissoc % :file/file) result)]
@@ -247,7 +249,8 @@
(when-let [file (get-file-f path new-files)]
(p/let [content (if nfs?
(.text (:file/file file))
(:file/content file))]
(:file/content file))
content (encrypt/decrypt content)]
(assoc file :file/content content)))) added-or-modified))
(p/then (fn [result]
(let [files (map #(dissoc % :file/file :file/handle) result)