From a5c8be2651db6d490c540910a0e145ff1ac6318b Mon Sep 17 00:00:00 2001 From: Aidan Hahn Date: Tue, 16 Jul 2019 20:10:10 -0700 Subject: [PATCH] use correct string concatenation method --- .#README.md | 1 - src/whisper/core.clj | 6 +++--- src/whisper/signald.clj | 2 +- src/whisper/ui.clj | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) delete mode 120000 .#README.md diff --git a/.#README.md b/.#README.md deleted file mode 120000 index 192ca7b..0000000 --- a/.#README.md +++ /dev/null @@ -1 +0,0 @@ -ink@Magellan.6427:1563239860 \ No newline at end of file diff --git a/src/whisper/core.clj b/src/whisper/core.clj index bc2815b..5fb48fb 100644 --- a/src/whisper/core.clj +++ b/src/whisper/core.clj @@ -6,10 +6,10 @@ (defn main-loop "updates UI with data from Signald" [content] - (update mainWindow content) - (recur (get-next-update))) + (update-window mainWindow content) + (recur (str (get-next-update)))) (defn -main "packs and shows main window with signald version string" [& args] - ()) + (main-loop "whisper is online")) diff --git a/src/whisper/signald.clj b/src/whisper/signald.clj index 90b91c3..48fc625 100644 --- a/src/whisper/signald.clj +++ b/src/whisper/signald.clj @@ -15,5 +15,5 @@ (defn get-next-update "Retrieves and parses next line of incoming data from signald" [] - (:data (json/read-str (.sigdRead readLine) :key-fn keyword))) + (map :data (json/read-str (. sigdRead readLine) :key-fn keyword))) diff --git a/src/whisper/ui.clj b/src/whisper/ui.clj index 8e90808..ff4bfe6 100644 --- a/src/whisper/ui.clj +++ b/src/whisper/ui.clj @@ -10,9 +10,9 @@ :height 40)) ;; UI Functions -(defn update +(defn update-window "Updates WINDOW to display additional content: CONTENT" [window content] (config! window :content - (concat (:content window) content)) + (str (:content window) content "\n")) window)