Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	ErgometerServer/DoctorThread.cs

ErgometerServer/ClientThread.cs

@@ -116,7 +116,9 @@ namespace ErgometerServer
                         client.Close();
                         break;
                     default:
-                       throw new FormatException("Unknown command");
+                        if(loggedin)
+                            throw new FormatException("Unknown command");
+                        break;
                 }
             }
 

ErgometerServer/DoctorThread.cs

@@ -15,7 +15,6 @@ namespace ErgometerServer
 
         bool running;
 
-
         public DoctorThread(TcpClient client, Server server)
         {
             this.client = client;
@@ -33,13 +32,6 @@ namespace ErgometerServer
 
                 switch (input.Type)
                 {
-                    //Nog toe te voegen:
-                    // - Oude data opsturen (metingen) (not tested yet)
-                    // - Oude sessies bekijken  (lijst met sessies) (not tested yet)
-                    // - Users opvragen (not tested yet)
-                    // - Gegevens van huidige sessie krijgen (gebruikersnaam enz) (not tested yet)
-                    // - Huidige sessies (not tested yet)
-                    // - 
                     case NetCommand.CommandType.LOGOUT:
                         running = false;
                         client.Close();
@@ -61,14 +53,15 @@ namespace ErgometerServer
                                 sendToDoctor(new NetCommand(NetCommand.LengthType.USERS, server.users.Count, input.Session));
                                 foreach (KeyValuePair<string, string> user in server.users)
                                 {
+                                    Thread.Sleep(10);
                                     sendToDoctor(new NetCommand(user.Key, user.Value, input.Session));
                                 }
                                 break;
                             case NetCommand.RequestType.OLDDATA:
                                 List<Meting> metingen = FileHandler.ReadMetingen(input.Session);
-                                sendToDoctor(new NetCommand(NetCommand.LengthType.DATA, metingen.Count, input.Session));
                                 foreach (Meting meting in metingen)
                                 {
+                                    Thread.Sleep(10);
                                     sendToDoctor(new NetCommand(meting, input.Session));
                                     Console.WriteLine(new NetCommand(meting, input.Session));
                                 }
@@ -79,6 +72,7 @@ namespace ErgometerServer
                                 foreach(Tuple<int,string,double> session in sessions)
                                 {
                                     sendToDoctor(new NetCommand(session.Item2, session.Item3, session.Item1));
+                                    Thread.Sleep(10);
                                 }
                                 break;
                             case NetCommand.RequestType.SESSIONDATA:
@@ -87,6 +81,7 @@ namespace ErgometerServer
                                 foreach (Tuple<int, string> ses in currentsessionsdata)
                                 {
                                     sendToDoctor(new NetCommand(ses.Item2, Helper.Now, ses.Item1));
+                                    Thread.Sleep(10);
                                 }
                                 break;
                             default:

ErgometerServer/FileHandler.cs

@@ -99,14 +99,17 @@ namespace ErgometerServer
 
         public static void WriteChat(int session, List<ChatMessage> chat)
         {
-            string write = "";
-            foreach (ChatMessage c in chat)
+            if (Directory.Exists(GetSessionFolder(session)))
             {
-                write += c.ToString() + "\n";
-            }
+                string write = "";
+                foreach (ChatMessage c in chat)
+                {
+                    write += c.ToString() + "\n";
+                }
 
-            File.WriteAllText(GetSessionChat(session), write);
-            Console.WriteLine("Writing chat: " + GetSessionChat(session));
+                File.WriteAllText(GetSessionChat(session), write);
+                Console.WriteLine("Writing chat: " + GetSessionChat(session));
+            }
         }
 
         private static string GetSessionFolder(int session)

ErgometerServer/Server.cs

@@ -31,6 +31,7 @@ namespace ErgometerServer
             clients = new List<ClientThread>();
 
             TcpListener listener = new TcpListener(NetHelper.GetIP("127.0.0.1"), 8888);
+            //TcpListener listener = new TcpListener(NetHelper.GetIP(GetIp()), 8888);
             listener.Start();
 
             Console.WriteLine("Server started successfully...");
@@ -67,6 +68,7 @@ namespace ErgometerServer
                     localIP = ip.ToString();
                 }
             }
+            Console.WriteLine(localIP);
             return localIP;
         }