Avans/ErgometerServer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unused code. Fixed reading old metingen from file.

Browse Source
This commit is contained in:
kennyboy55
2015-10-20 00:27:57 +02:00
parent 18dc45d604
commit d5bb2d555d
2 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErgometerServer/DoctorThread.cs
+1 -8
View File
@@ -70,6 +70,7 @@ namespace ErgometerServer
foreach (Meting meting in metingen)
{
sendToDoctor(new NetCommand(meting, input.Session));
Console.WriteLine(new NetCommand(meting, input.Session));
}
break;
case NetCommand.RequestType.ALLSESSIONS:
@@ -80,14 +81,6 @@ namespace ErgometerServer
sendToDoctor(new NetCommand(NetCommand.CommandType.SESSION, sessions[i]));
}
break;
case NetCommand.RequestType.CURRENTSESSIONS:
List<int> currentsessions = server.GetRunningSessions();
sendToDoctor(new NetCommand(NetCommand.LengthType.CURRENTSESSIONS, currentsessions.Count, input.Session));
foreach (int session in currentsessions)
{
sendToDoctor(new NetCommand(NetCommand.CommandType.SESSION, session));
}
break;
case NetCommand.RequestType.SESSIONDATA:
List<Tuple<int, string>> currentsessionsdata = server.GetRunningSessionsData();
sendToDoctor(new NetCommand(NetCommand.LengthType.SESSIONDATA, currentsessionsdata.Count, input.Session));
ErgometerServer/FileHandler.cs
+11 -16
View File
@@ -61,13 +61,13 @@ namespace ErgometerServer
public static void WriteMetingen(int session, List<Meting> metingen)
{
if (metingen.Count <= 15 && Directory.Exists(GetSessionFolder(session)))
if (metingen.Count <= 5 && Directory.Exists(GetSessionFolder(session)))
{
Directory.Delete(GetSessionFolder(session), true);
}
else
{
string json = Newtonsoft.Json.JsonConvert.SerializeObject(metingen);
string json = Newtonsoft.Json.JsonConvert.SerializeObject(metingen.ToArray());
File.WriteAllText(GetSessionMetingen(session), json);
Console.WriteLine("Writing metingen: " + GetSessionMetingen(session));
}
@@ -75,9 +75,11 @@ namespace ErgometerServer
public static List<Meting> ReadMetingen(int session)
{
object metingString = Newtonsoft.Json.JsonConvert.DeserializeObject(GetSessionMetingen(session));
string json = File.ReadAllText(GetSessionMetingen(session));
List<Meting> metingen = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Meting>>(json);
Console.WriteLine("Reading metingen: " + GetSessionMetingen(session));
return (List<Meting>)metingString;
return metingen;
}
public static int[] GetAllSessions()
@@ -93,21 +95,14 @@ namespace ErgometerServer
public static void WriteChat(int session, List<ChatMessage> chat)
{
if (chat.Count <= 15 && Directory.Exists(GetSessionFolder(session)))
string write = "";
foreach (ChatMessage c in chat)
{
Directory.Delete(GetSessionFolder(session), true);
write += c.ToString() + "\n";
}
else
{
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)