From 61dcd862d8041c1f63bde467ec6f5921b03f67f6 Mon Sep 17 00:00:00 2001
From: Andre Mateus Silva <mateussa@coventry.ac.uk>
Date: Wed, 22 Nov 2017 12:17:46 +0000
Subject: [PATCH] Added 'END' word to server to proper close the server

---
 Server.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/Server.py b/Server.py
index bca400b..c2b6985 100644
--- a/Server.py
+++ b/Server.py
@@ -25,10 +25,13 @@ def receiveMessage(): # Andre
         if not message: # Couldn't receive message, exit
             sendMessage("Sorry, I not able to receive that, plese try again another day.")
             exit()
+    print(message)
+    if (message != "END"):
+        print ("CLIENT: {}".format(message))
             
-    print ("CLIENT: {}".format(message))
-        
-    answerUserInput = determineUserInput(message)
+        answerUserInput = determineUserInput(message)
+    else:
+        answerUserInput = message
     
     return(answerUserInput)
 
@@ -41,6 +44,9 @@ def askSomething(answerType, sendMessages, noAnswers, defaultAnswer): # Andre
         sendMessage(item, (True if i == len(sendMessages) - 1 else False))
         
     answer = receiveMessage()
+    if (type(answer) != tuple):
+        return(answer)
+    
     while (answer[1] != answerType or answer[0] == ""  and len(noAnswers) > 0):
         
         if(answerType == -1):
@@ -219,6 +225,11 @@ print(conn)
 clientName = askSomething(1, ["Hi! I am Jeff.", "I can give really nice challanges!", "What's your name?"],
                               ["I would prefer to know your name.",
                               "I see you don't want to tell me."], "Mr. Nobody")
+if (clientName == "END"):
+    sendMessage("See you next time! Bye!")
+    conn.close()
+    thisSocket.close
+    exit()
 
 sendMessage("YOURNAMEWILLBE " + clientName, False)