Просмотр исходного кода

Revert "refactor: move electron imp to handler"

This reverts commit f0210a37b06f8190220204528bcf9e47b10fcb1e.
Weihua Lu 4 лет назад
Родитель
Сommit
65cd3e9739
2 измененных файлов с 10 добавлено и 6 удалено
  1. 2 4
      src/electron/electron/handler.cljs
  2. 8 2
      src/main/frontend/fs.cljs

+ 2 - 4
src/electron/electron/handler.cljs

@@ -120,12 +120,10 @@
     (.. ^js window -webContents
         (send "open-dir-confirmed"
               (bean/->js {:opened? true})))
-    (let [[dir & paths] (bean/->clj (get-files path))]
-      [(:path dir) paths])))
+    (get-files path)))
 
 (defmethod handle :getFiles [window [_ path]]
-  (let [result (bean/->clj (get-files path))]
-    (rest result)))
+  (get-files path))
 
 (defmethod handle :persistent-dbs-saved [window _]
   (async/put! state/persistent-dbs-chan true)

+ 8 - 2
src/main/frontend/fs.cljs

@@ -118,13 +118,19 @@
   [ok-handler]
   (let [record (if (util/electron?) node-record nfs-record)]
     (p/let [result (protocol/open-dir record ok-handler)]
-      result)))
+      (if (util/electron?)
+        (let [[dir & paths] (bean/->clj result)]
+          [(:path dir) paths])
+        result))))
 
 (defn get-files
   [path-or-handle ok-handler]
   (let [record (if (util/electron?) node-record nfs-record)]
     (p/let [result (protocol/get-files record path-or-handle ok-handler)]
-      result)))
+      (if (util/electron?)
+        (let [result (bean/->clj result)]
+          (rest result))
+        result))))
 
 (defn watch-dir!
   [dir]