Răsfoiți Sursa

refactor: move electron imp to handler

Weihua Lu 4 ani în urmă
părinte
comite
957ea84284
2 a modificat fișierele cu 6 adăugiri și 10 ștergeri
  1. 4 2
      src/electron/electron/handler.cljs
  2. 2 8
      src/main/frontend/fs.cljs

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

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

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

@@ -112,19 +112,13 @@
   [ok-handler]
   (let [record (if (util/electron?) node-record nfs-record)]
     (p/let [result (protocol/open-dir record ok-handler)]
-      (if (util/electron?)
-        (let [[dir & paths] (bean/->clj result)]
-          [(:path dir) paths])
-        result))))
+      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)]
-      (if (util/electron?)
-        (let [result (bean/->clj result)]
-          (rest result))
-        result))))
+      result)))
 
 (defn watch-dir!
   [dir]