got text-edit sending and responding successfully

Author: vision-05

bettercode/src/bettercode/core.clj

@@ -39,14 +39,16 @@
                        :file-path ""
                        :text-editor ""
                        :anchor-pos 0
-                       :caret-pos 0}
+                       :caret-pos 0
+                       :dir-contents {:dir-path ""
+                                      :directories []
+                                      :files []}}
                       #(cache/lru-cache-factory % :threshold 4096))))
 
 ;create file opening screen
 (defn -main []
   (Platform/setImplicitExit true)
   (let [c @(client "localhost" 8080)]
-    (println @(s/put! c "made connection"))
     (fx/create-app *context
                    :event-handler bettercode.events/handle-event
                    :desc-fn (fn [_]

bettercode/src/bettercode/events.clj

@@ -10,6 +10,7 @@
 
 (defmethod handle-event ::type-text [{:keys [fx/event fx/context tclient]}]
   @(s/put! tclient (str "text-edit " (fx/sub-val context :file-path) " " (fx/sub-val context :caret-pos) " " (.getCharacter event)))
+  (println @(s/take! tclient))
   {:context (fx/swap-context context
                              assoc
                              :anchor-pos (.getAnchor (.getSource event))
@@ -24,16 +25,13 @@
                              :anchor-pos (.getAnchor (.getSource event))
                              :caret-pos (.getCaretPosition (.getSource event)))})
 
-(defmethod handle-event ::open-file [{:keys [fx/event fx/context tclient file-path]}]
+(defmethod handle-event ::open-file [{:keys [fx/event fx/context tclient]}]
   (println "getting file")
-  @(s/put! tclient (str "open-file " file-path))
-  {:context (fx/swap-context (fx/swap-context context
-                                              assoc
-                                              :text-editor
-                                              @(s/take! tclient))
+  @(s/put! tclient (str "open-file " (fx/sub-val context :file-path)))
+  {:context (fx/swap-context context
                              assoc
-                             :file-name
-                             file-path)})
+                             :text-editor
+                             @(s/take! tclient))})
 
 (defmethod handle-event ::close-file [{:keys [fx/event fx/context tclient]}]
   (println "requesting close file")

bettercodeserver/src/bettercodeserver/filenav.clj

@@ -1,4 +1,7 @@
 (ns bettercodeserver.filenav
   (:require [me.raynes.fs :as fs]))
 
-(defn get-folder-contents [folder])
+(defn get-folder-contents
+  ([] (get-folder-contents fs/*cwd*))
+  ([folder-path] {:dirs (filter fs/directory? (fs/list-dir folder-path))
+                  :files (filter fs/file? (fs/list-dir folder-path))}))

bettercodeserver/src/bettercodeserver/server.clj

@@ -6,7 +6,8 @@
             [gloss.core :as gloss]
             [clojure.edn :as edn]
             [clojure.string :as str]
-            [bettercodeserver.buffer :as buffer]))
+            [bettercodeserver.buffer :as buffer]
+            [bettercodeserver.filenav :as fnav]))
 
 (def protocol
   (gloss/compile-frame
@@ -24,13 +25,16 @@
               (io/decode-stream s protocol))))
 
 (defn parse-request [message agent-name]
-  (let [split-req (conj [] (str/split message #" "))]
+  (let [split-req (str/split message #" ")]
+    (println message)
+    (println (split-req 0))
     (case (split-req 0)
       "text-edit" (buffer/text-edit agent-name (split-req 1) (split-req 3) (split-req 2))
       "open-file" (buffer/add-file agent-name (split-req 1))
       "close-file" (buffer/remove-file agent-name (split-req 1))
       "save-file" (buffer/save-file agent-name (split-req 1))
-      "save-all" (buffer/save-all-files agent-name))))
+      "save-all" (buffer/save-all-files agent-name)
+      "get-dir" (fnav/get-folder-contents (split-req 1)))))
 
 (defn event-loop [f files-agent]
   (fn [s info]
@@ -39,7 +43,9 @@
                 (d/let-flow [msg (s/take! s ::none)]
                             (when-not (= ::none msg)
                               (d/let-flow [msg-two (d/future (f msg files-agent))
-                                           result (s/put! s msg-two)]
+                                           result (cond
+                                            (= (class "") (class msg-two)) @(s/put! s msg-two)
+                                            :else @(s/put! s true))]
                                           (when result
                                             (d/recur)))))
                 (d/catch