Merge pull request #8 from vision-05/dev

Dev

Author: vision-05

bettercode/src/bettercode/core.clj

@@ -35,17 +35,20 @@
 
 (def *context
   (atom
-   (fx/create-context {:title "BetterCode"
-                       :file-name "foo.txt"
-                       :text-editor (slurp "/home/tim/foo.txt")
+   (fx/create-context {:title ""
+                       :file-path "/home/tim/foo.txt"
+                       :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/elements.clj

@@ -67,4 +67,7 @@
               {:fx/type editor-row
                :tclient tclient
                :v-box/vgrow :always
-               :v-box/hgrow :always}]})
+               :v-box/hgrow :always}]})
+
+(defn fs-view [{:keys [fx/context tclient]}]
+  {:fx/type :list-view})

bettercode/src/bettercode/events.clj

@@ -9,18 +9,15 @@
   (println "non event"))
 
 (defmethod handle-event ::type-text [{:keys [fx/event fx/context tclient]}]
-  (println (.getCaretPosition (.getTarget event)))
-  (println (.getAnchor (.getTarget event)))
-  @(s/put! tclient "text-edit")
-  @(s/put! tclient (fx/sub-val context :caret-pos))
-  @(s/put! tclient (fx/sub-val context :anchor-pos))
-  @(s/put! tclient (.getCharacter event))
+  @(s/put! tclient ["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))
                              :caret-pos (.getCaretPosition (.getSource event)))})
 
 
+;similar event must be made for arrow key press
 (defmethod handle-event ::mouse-click [{:keys [fx/event fx/context tclient]}]
   (println "click")
   (println (.getSource event))
@@ -31,17 +28,22 @@
 
 (defmethod handle-event ::open-file [{:keys [fx/event fx/context tclient]}]
   (println "getting file")
-  @(s/put! tclient "open-file")
-  @(s/take! tclient))
+  @(s/put! tclient ["open-file" (fx/sub-val context :file-path)])
+  {:context (fx/swap-context context
+                             assoc
+                             :text-editor
+                             @(s/take! tclient))})
 
 (defmethod handle-event ::close-file [{:keys [fx/event fx/context tclient]}]
   (println "requesting close file")
-  @(s/put! tclient "close-file"))
+  @(s/put! tclient ["close-file" (fx/sub-val context :file-path)]))
 
 (defmethod handle-event ::save-file [{:keys [fx/event fx/context tclient]}]
   (println "saving file")
-  @(s/put! tclient "save-file"))
+  @(s/put! tclient ["save-file" (fx/sub-val context :file-path)])
+  @(s/take! tclient))
 
 (defmethod handle-event ::save-all [{:keys [fx/event fx/context tclient]}]
   (println "saving all buffers")
-  @(s/put! tclient "save-all"))
+  @(s/put! tclient ["save-all"])
+  @(s/take! tclient))

bettercodeserver/project.clj

@@ -7,7 +7,8 @@
                  [org.clojure/core.cache "1.0.207"]
                  [aleph "0.4.6"]
                  [gloss "0.2.6"]
-                 [manifold "0.1.9-alpha4"]]
+                 [manifold "0.1.9-alpha4"]
+                 [me.raynes/fs "1.4.6"]]
   :main ^:skip-aot bettercodeserver.core
   :target-path "target/%s"
   :profiles {:uberjar {:aot :all

bettercodeserver/src/bettercodeserver/buffer.clj

@@ -12,7 +12,7 @@
 
 (defn add-file
   ([agent-name full-file-path]
-   (send agent-name assoc full-file-path (slurp full-file-path)))
+   (add-file agent-name full-file-path (slurp full-file-path)))
   ([agent-name full-file-path string]
    (send agent-name assoc full-file-path string)))
 
@@ -26,7 +26,21 @@
   (send agent-name update-in [full-file-path] remove-string position length))
 
 (defn del-char [agent-name full-file-path position]
-  (send agent-name update-in [full-file-path] remove-char position))
+  (send agent-name update-in [full-file-path] remove-char (- position 1)))
+
+(defn text-edit [agent-name full-file-path string index]
+  (cond
+    (and (= string "\b") (> index 0)) (del-char agent-name full-file-path index)
+    (> index -1) (add-string agent-name full-file-path index string)
+    :else false))
+
+(defn save-file [agent-name full-file-path]
+  (spit full-file-path (@agent-name full-file-path)))
+
+(defn save-all-files [agent-name]
+  (let [all-files @agent-name]
+    (doseq [file-name all-files]
+      (save-file agent-name file-name))))
 
 (defn close-all-buffers []
   (shutdown-agents))

bettercodeserver/src/bettercodeserver/core.clj

@@ -5,8 +5,7 @@
   (:gen-class))
 
 (defn -main []
-  (def files (agent {}))
+  (def files (agent {"/home/tim/foo.txt" ""}))
   (def serv (server/start-server
-              (server/event-loop server/handle-events)
-              8080))
-  (.close serv))
+              (server/event-loop server/parse-request files)
+              8080)))

bettercodeserver/src/bettercodeserver/filenav.clj

@@ -1 +1,7 @@
-(ns bettercodeserver.filenav)
+(ns bettercodeserver.filenav
+  (:require [me.raynes.fs :as fs]))
+
+(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

@@ -5,7 +5,9 @@
             [gloss.io :as io]
             [gloss.core :as gloss]
             [clojure.edn :as edn]
-            [bettercodeserver.buffer :as buffer]))
+            [clojure.string :as str]
+            [bettercodeserver.buffer :as buffer]
+            [bettercodeserver.filenav :as fnav]))
 
 (def protocol
   (gloss/compile-frame
@@ -22,20 +24,33 @@
     (s/splice out
               (io/decode-stream s protocol))))
 
-(defn event-loop [f]
+(defn parse-request [message agent-name]
+  (case (message 0)
+    "text-edit" (buffer/text-edit agent-name (message 1) (message 3) (message 2))
+    "open-file" (buffer/add-file agent-name (message 1))
+    "close-file" (buffer/remove-file agent-name (message 1))
+    "save-file" (buffer/save-file agent-name (message 1))
+    "save-all" (buffer/save-all-files agent-name)
+    "get-dir" (fnav/get-folder-contents (message 1))))
+
+(defn event-loop [f files-agent]
   (fn [s info]
     (d/loop []
-            (->
-                (d/let-flow [msg (s/take! s ::none)]
-                            (when-not (= ::none msg)
-                              (d/let-flow [msg-two (d/future (f msg))
-                                           result (s/put! s msg-two)]
-                                          (when result
-                                            (d/recur)))))
-                (d/catch
-                 (fn [exception]
-                   (s/put! s (str "ERROR: " exception))
-                   (s/close! s)))))))
+      (->
+       (d/let-flow [msg (s/take! s ::none)]
+                   (when-not (= ::none msg)
+                     (d/let-flow [msg-two (d/future (f msg files-agent))
+                                  result (cond
+                                           (= (class "") (class msg-two)) @(s/put! s msg-two)
+                                           :else @(s/put! s true))]
+                                 (when result
+                                   (println @files-agent)
+                                   (d/recur)))))
+       (d/catch
+        (fn [exception]
+          (println agent-error exception)
+          (s/put! s (str "ERROR: " exception))
+          (s/close! s)))))))
 
 (defn start-server [handler port]
   (tcp/start-server