some progress

1 files changed, 75 insertions, 15 deletions

diff --git a/client/client.erl b/client/client.erl
index 9781b74..f8d5de2 100644
--- a/client/client.erl
+++ b/client/client.erl
@@ -1,8 +1,14 @@
 -module(client).
--export([register/3, login/3, list/0, logged_in/1]).
+-export([register/3, login/3, list/0, handle/3]).
+
+buildNode(Server) ->
+    list_to_atom("distributed_music_system_main_node@" ++ Server).
+
+rpc(Server, Function, Params) ->
+    rpc:call(buildNode(Server), client, Function, Params).
 
 register(Server, Name, Password) ->
-    rpc:call(Server, client, register, [self(), {Name, Password}]),
+    rpc(Server, register, [self(), {Name, Password}]),
     receive
 	{_, ok, Msg} ->
 	    Msg;
@@ -11,21 +17,75 @@ register(Server, Name, Password) ->
     end.
 
 login(Server, Name, Password) ->
-    rpc:call(Server, client, login, [self(), {Name, Password}]),
-    receive
-	{_, ok, {ok, {logged_in, Client}}} ->
-	    register(cli, spawn(client, logged_in, [Client]));
-	{_, error, Msg} ->
-	    Msg
+    try checkLogin(false) of
+	_ ->
+	    rpc(Server, login, [self(), {Name, Password}]),
+	    receive
+		{_, ok, {ok, {logged_in, Client}}} ->
+		    code:purge(server),
+		    code:load_abs("../common/server"),
+		    case server:start(cli, client, Client) of
+			true ->
+			    {ok, logged_in};
+			_ ->
+			    {error, unable_to_login}
+		    end;
+		{_, error, Msg} ->
+		    Msg;
+		Msg ->
+		    Msg
+	    end
+    catch
+	{error, login_state} ->
+	    {error, logged_in}
     end.
 
-list() ->
-    cli ! {list}.
+contains([], _) ->
+    false;
+contains([H|_], H) ->
+    true;
+contains([_|T], Search) ->
+    contains(T, Search).
 
-logged_in(Client) ->
-    receive
-	{list} ->
-	    Client ! {list};
+checkLogin(Value) ->
+    checkLogin(Value, contains(registered(), cli)).
+checkLogin(Value, Value) ->
+    true;
+checkLogin(_, _) ->
+    throw({error, login_state}).
+
+list() ->
+    try checkLogin(true) of
 	_ ->
-	    logged_in(Client)
+	    cli ! {self(), list},
+	    receive
+		{_, ok, Msg} ->
+		    Msg;
+		{_, error, Msg} ->
+		    {error, Msg};
+		Msg ->
+		    {error, Msg}
+	    end
+    catch
+	{error, login_state} ->
+	    {error, not_logged_in}
     end.
+
+handle(Cli, list, Client) ->
+    Client ! {list},
+    receive
+	{_, {ok, List}} ->
+	    io:format("List: ~w~n", List),
+	    {{ok}, Client}
+    end;
+
+handle(Cli, {test, X}, Client) ->
+    Client ! {X},
+    receive
+	Msg ->
+	    io:format("Test: ~w~n~n", [Msg]),
+	    {{ok}, Client}
+    end;
+
+handle(_, Cmd, Client) ->
+    {{error, {unknown_command, Cmd}}, Client}.