1 files changed, 48 insertions, 8 deletions

diff --git a/lib/cli/cli.ex b/lib/cli/cli.ex
index 28ef5d0..0402b3f 100644
--- a/lib/cli/cli.ex
+++ b/lib/cli/cli.ex
@@ -1,30 +1,70 @@
 defmodule SCLI do
   def run() do
-    str = "say: " |> IO.gets |> String.trim
+    run(nil)
+  end
+
+  defp run(pid) do
+    nick = Shard.Identity.get_nickname
+    prompt = case pid do
+      nil -> "(no channel) #{nick}: "
+      _ -> 
+        {:chat, chan} = GenServer.call(pid, :manifest)
+        "##{chan} #{nick}: "
+    end
+
+    str = prompt |> IO.gets |> String.trim
     cond do
       str == "/quit" ->
         nil
       String.slice(str, 0..0) == "/" ->
         command = str |> String.slice(1..-1) |> String.split(" ")
-        handle_command(command)
-        run()
+        pid2 = handle_command(pid, command)
+        run(pid2)
       true -> 
-        SApp.Chat.send(str)
-        run()
+        GenServer.cast(pid, {:chat_send, str})
+        run(pid)
     end
   end
 
-  def handle_command(["connect", ipstr, portstr]) do
+  def handle_command(pid, ["connect", ipstr, portstr]) do
     {:ok, ip} = :inet.parse_address (to_charlist ipstr)
     {port, _} = Integer.parse portstr
     SNet.Manager.add_peer(ip, port)
+    pid
+  end
+
+  def handle_command(pid, ["list"]) do
+    IO.puts "List of known channels:"
+    list = GenServer.call(Shard.Manager, :list)
+    for {_chid, chpid} <- list do
+      {:chat, chan} = GenServer.call(chpid, :manifest)
+      IO.puts "##{chan}"
+    end
+    pid
+  end
+
+  def handle_command(pid, ["join", qchan]) do
+    list = GenServer.call(Shard.Manager, :list)
+    list = for {_chid, chpid} <- list,
+               {:chat, chan} = GenServer.call(chpid, :manifest),
+               do: {chan, chpid}
+    case List.keyfind(list, qchan, 0) do
+      nil ->
+        {:ok, pid} = DynamicSupervisor.start_child(Shard.DynamicSupervisor, {SApp.Chat, qchan})
+        pid
+      {_, pid} ->
+        IO.puts "Switching to ##{qchan}"
+        pid
+    end
   end
 
-  def handle_command(["nick", nick]) do
+  def handle_command(pid, ["nick", nick]) do
     Shard.Identity.set_nickname nick
+    pid
   end
 
-  def handle_command(_cmd) do
+  def handle_command(pid, _cmd) do
     IO.puts "Invalid command"
+    pid
   end
 end