From 4bd161de547594ab79a41c93aacc1186c3b51ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Sun, 25 Apr 2021 17:55:05 +0200
Subject: [PATCH] create init function

---
 server/main.py   |  1 +
 server/server.py | 25 ++++++++++---------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/server/main.py b/server/main.py
index b34adbc..e136a2b 100644
--- a/server/main.py
+++ b/server/main.py
@@ -3,4 +3,5 @@ from server import Server
 
 if __name__ == '__main__':
     server = Server()
+    server.initServer()
     server.startServer()
diff --git a/server/server.py b/server/server.py
index 9b0c16f..b4dba55 100644
--- a/server/server.py
+++ b/server/server.py
@@ -12,13 +12,18 @@ class Server:
         self.sessionTimeout = sessionTimeout
         self.availableServer = availableServer
         self.executor = Executor(homeDirectory)
-        self.auth=Authetication()
-        self.networkInstance = NetWrapper(self.auth.loadUserPublicKeys(),self.auth.loadServerPrivateKey(),self)
+
+    def initServer(self):
+        print("Please enter your private key passphrase")
+        passphrase = input()
+        self.auth = Authetication()
+        self.networkInstance = NetWrapper(self.auth.loadUserPublicKeys(), self.auth.loadServerPrivateKey(passphrase),
+                                          self)
 
     def login(self, username: str, password: str) -> bool:
         self.isAuthenticated = True
         home_directory = self.auth.login(username, password)
-        self.executor.baseDir=Executor(home_directory)
+        self.executor.baseDir = Executor(home_directory)
         if not home_directory:
             return False
         else:
@@ -28,7 +33,7 @@ class Server:
         self.isAuthenticated = False
         self.availableServer = False
         self.homeDirectory = ""
-        self.executor.baseDir=Executor(self.homeDirectory)
+        self.executor.baseDir = Executor(self.homeDirectory)
 
     def parseCommand(self, command: str) -> str:
         if command == "LINOK":
@@ -107,14 +112,4 @@ class Server:
     def startServer(self):
         while True:
             message = self.networkInstance.recieveMessage().decode('UTF-8')
-            command = self.parseCommand(message)
-            #ha LINOK vagy LINERROR donothing
-            if command == "LINERROR" or command == "LINOK" or command == "ERROR":
-                print("not right commands")
-            elif len(command) == 1:
-                execute_message = self.execute(self,command, "", "")
-            elif len(command) == 2:
-                execute_message = self.execute(self, command, command[1], "")
-            elif len(command) == 3:
-                execute_message = self.execute(self, command, command[1], command[2])
-            self.networkInstance.sendMessage(self, execute_message)
+            self.parseCommand(message)