From d34fa53e9ef459dee8cd0ec8f9dde69bd8009339 Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Fri, 2 Oct 2015 10:57:55 +0200
Subject: [PATCH] Added new classes and fixed bugs

---
 ErgometerLibrary/ChatMessage.cs             | 21 ++++++++++++
 ErgometerLibrary/ErgometerLibrary.csproj    | 10 ++++++
 ErgometerLibrary/FileHandler.cs             | 19 +++++++----
 ErgometerLibrary/Helper.cs                  | 13 ++++++++
 ErgometerLibrary/Meting.cs                  |  2 +-
 ErgometerLibrary/NetCommand.cs              | 10 +++---
 ErgometerLibrary/NetHelper.cs               | 36 +++++++++++++++++++++
 ErgometerLibrary/Properties/AssemblyInfo.cs |  4 +--
 ErgometerLibrary/packages.config            |  4 +++
 9 files changed, 105 insertions(+), 14 deletions(-)
 create mode 100644 ErgometerLibrary/ChatMessage.cs
 create mode 100644 ErgometerLibrary/Helper.cs
 create mode 100644 ErgometerLibrary/NetHelper.cs
 create mode 100644 ErgometerLibrary/packages.config

diff --git a/ErgometerLibrary/ChatMessage.cs b/ErgometerLibrary/ChatMessage.cs
new file mode 100644
index 0000000..1b19465
--- /dev/null
+++ b/ErgometerLibrary/ChatMessage.cs
@@ -0,0 +1,21 @@
+namespace ErgometerLibrary
+{
+    public class ChatMessage
+    {
+        public string Message { get; }
+        public string Name { get; }
+        public double TimeStamp { get; set;}
+
+        public ChatMessage(string name, string message)
+        {
+            Name = name;
+            Message = message;
+            TimeStamp = Helper.Now;
+        }
+
+        public override string ToString()
+        {
+            return $"[{Name}] <{TimeStamp}> - {Message}";
+        }
+    }
+}
\ No newline at end of file
diff --git a/ErgometerLibrary/ErgometerLibrary.csproj b/ErgometerLibrary/ErgometerLibrary.csproj
index 74739fe..f53e6dc 100644
--- a/ErgometerLibrary/ErgometerLibrary.csproj
+++ b/ErgometerLibrary/ErgometerLibrary.csproj
@@ -30,6 +30,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -40,12 +44,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ChatMessage.cs" />
+    <Compile Include="Helper.cs" />
     <Compile Include="NetCommand.cs" />
     <Compile Include="ComPort.cs" />
     <Compile Include="FileHandler.cs" />
     <Compile Include="Meting.cs" />
+    <Compile Include="NetHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ErgometerLibrary/FileHandler.cs b/ErgometerLibrary/FileHandler.cs
index 2aab1ab..4333b82 100644
--- a/ErgometerLibrary/FileHandler.cs
+++ b/ErgometerLibrary/FileHandler.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ErgometerLibrary
 {
@@ -42,17 +40,26 @@ namespace ErgometerLibrary
             File.Create(Path.Combine(GetSessionFolder(session), "metingen.ergo"));
             File.Create(Path.Combine(GetSessionFolder(session), "chat.log"));
 
-            File.WriteAllText(GetSessionFile(session), naam);
+            File.WriteAllText(GetSessionFile(session), naam + "\n" + Helper.Now);
         }
 
-        public static void AddMeting(int session, params Meting[] metingen)
+        public static void WriteMetingen(int session, List<Meting> metingen)
         {
-
+            string json = Newtonsoft.Json.JsonConvert.SerializeObject(metingen);
+            File.WriteAllText(GetSessionMetingen(session), json);
+            Console.WriteLine("Writing metingen: " + GetSessionMetingen(session));
         }
 
-        public static void AddChat(int session, string name, string chatmessage)
+        public static void WriteChat(int session, List<ChatMessage> chat)
         {
+            string write = "";
+            foreach(ChatMessage c in chat)
+            {
+                write += c.ToString() + "\n";
+            }
 
+            File.WriteAllText(GetSessionChat(session), write);
+            Console.WriteLine("Writing chat: " + GetSessionChat(session));
         }
 
         private static string GetSessionFolder(int session)
diff --git a/ErgometerLibrary/Helper.cs b/ErgometerLibrary/Helper.cs
new file mode 100644
index 0000000..95d9c06
--- /dev/null
+++ b/ErgometerLibrary/Helper.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ErgometerLibrary
+{
+    class Helper
+    {
+        public static double Now { get { return (DateTime.Now - DateTime.Parse("1/1/1870 0:0:0")).TotalMilliseconds; } }
+    }
+}
diff --git a/ErgometerLibrary/Meting.cs b/ErgometerLibrary/Meting.cs
index 46807b7..451cde2 100644
--- a/ErgometerLibrary/Meting.cs
+++ b/ErgometerLibrary/Meting.cs
@@ -85,7 +85,7 @@ namespace ErgometerLibrary
             if (status.Length == 9)
                 timestamp = double.Parse(status[8]);
             else
-                timestamp = (DateTime.Now - DateTime.Parse("1/1/1870 0:0:0")).TotalMilliseconds;
+                timestamp = Helper.Now;
 
             string[] temp = status[6].Split(':');
             int seconds = (int.Parse(temp[0]) * 60) + (int.Parse(temp[1]));
diff --git a/ErgometerLibrary/NetCommand.cs b/ErgometerLibrary/NetCommand.cs
index ace8cce..b9f1e97 100644
--- a/ErgometerLibrary/NetCommand.cs
+++ b/ErgometerLibrary/NetCommand.cs
@@ -24,21 +24,21 @@ namespace ErgometerLibrary
         {
             Type = CommandType.SESSION;
             Session = session;
-            Timestamp = (DateTime.Now - DateTime.Parse("1/1/1870 0:0:0")).TotalMilliseconds;
+            Timestamp = Helper.Now;
         }
 
         public NetCommand(CommandType commandtype, int session)
         {
             Type = commandtype;
             Session = session;
-            Timestamp = (DateTime.Now - DateTime.Parse("1/1/1870 0:0:0")).TotalMilliseconds;
+            Timestamp = Helper.Now;
         }
 
         public NetCommand(Meting m, int session)
         {
             Type = CommandType.DATA;
             Session = session;
-            Timestamp = (DateTime.Now - DateTime.Parse("1/1/1870 0:0:0")).TotalMilliseconds;
+            Timestamp = Helper.Now;
 
             Meting = m;
         }
@@ -47,7 +47,7 @@ namespace ErgometerLibrary
         {
             Type = CommandType.CHAT;
             Session = session;
-            Timestamp = (DateTime.Now - DateTime.Parse("1/1/1870 0:0:0")).TotalMilliseconds;
+            Timestamp = Helper.Now;
 
             ChatMessage = chat;
         }
@@ -56,7 +56,7 @@ namespace ErgometerLibrary
         {
             Type = CommandType.LOGIN;
             Session = session;
-            Timestamp = (DateTime.Now - DateTime.Parse("1/1/1870 0:0:0")).TotalMilliseconds;
+            Timestamp = Helper.Now;
 
             DisplayName = name;
             IsDoctor = doctor;
diff --git a/ErgometerLibrary/NetHelper.cs b/ErgometerLibrary/NetHelper.cs
new file mode 100644
index 0000000..2814e0e
--- /dev/null
+++ b/ErgometerLibrary/NetHelper.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace ErgometerLibrary
+{
+    class NetHelper
+    {
+        public static void SendNetCommand(TcpClient client, NetCommand command)
+        {
+            byte[] b = Encoding.ASCII.GetBytes(command.ToString());
+            client.GetStream().Write(b, 0, b.Length);
+            client.GetStream().Flush();
+        }
+
+        public static NetCommand ReadNetCommand(TcpClient client)
+        {
+            byte[] bytesFrom = new byte[(int) client.ReceiveBufferSize];
+            client.GetStream().Read(bytesFrom, 0, (int)client.ReceiveBufferSize);
+            String response = Encoding.ASCII.GetString(bytesFrom);
+            NetCommand net = NetCommand.Parse(response);
+            return net;
+        }
+
+        public static IPAddress GetIP(string ipstring)
+        {
+            IPAddress ip;
+
+            bool ipIsOk = IPAddress.TryParse(ipstring, out ip);
+            if (!ipIsOk) { return null; }
+
+            return ip;
+        }
+    }
+}
diff --git a/ErgometerLibrary/Properties/AssemblyInfo.cs b/ErgometerLibrary/Properties/AssemblyInfo.cs
index 63ec27d..2865952 100644
--- a/ErgometerLibrary/Properties/AssemblyInfo.cs
+++ b/ErgometerLibrary/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
diff --git a/ErgometerLibrary/packages.config b/ErgometerLibrary/packages.config
new file mode 100644
index 0000000..64b5d8e
--- /dev/null
+++ b/ErgometerLibrary/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
+</packages>
\ No newline at end of file