controller/AppController.py

@@ -3,7 +3,6 @@ from model.Protocol import *
 import traceback
 import os.path
 
-
 class AppController:
     def __init__(self, parser):
         self.parser = parser
@@ -20,8 +19,8 @@ class AppController:
         print("[AppController::on_sign]")
         try:
             if not self.connection.is_connected:
-                print("[AppController::on_sign] connecting ... calling UnicastConnection::connect")
+               print("[AppController::on_sign] connecting ... calling UnicastConnection::connect")
-                self.connect(host, port, tls)
+               self.connect(host, port, tls)
             if not register:
                 message = self.parser.build_SIGNIN(login, passw)
             else:
@@ -32,10 +31,9 @@ class AppController:
             if message_id == Protocol.PARSE_SIGNOK:
                 self.window_controller.switch_connected_mode()
                 self.show_message("Connection done", False)
-                self.on_filelist()
             elif message_id == Protocol.PARSE_SIGNERROR:
                 self.show_message("Error during SIGN_IN / SIGN_UP", True)
-                self.connection.close()
+            self.on_filelist()
         except Exception as ex:
             print(ex)
             traceback.print_exc()
@@ -43,7 +41,7 @@ class AppController:
     def get_filename_size_from_item(self, item):
         tokens = item.split('!')
         if len(tokens) == 2:
-            return (tokens[0], tokens[1])
+            return (tokens[0],tokens[1])
         else:
             return None
 
@@ -119,7 +117,7 @@ class AppController:
         elif message_id == Protocol.PARSE_REMOVEFILEERROR:
             self.show_message("Error while erasing file.", True)
 
-    def show_message(self, message, is_error):
+    def show_message(self,message, is_error):
         self.window_controller.show_message(message, is_error)
 
     def connect(self, host, port, tls):

gui/MainWindow.py

@@ -11,15 +11,10 @@ class MainWindow:
         self.root.title("SecCon - © Louis SWINNEN 2022")
         self.root.config(bd=5)
         self.host = tk.StringVar()
-        self.host.set("ffe.labo.swilabus.com")
         self.passw = tk.StringVar()
-        self.passw.set("aaaaa")
         self.login = tk.StringVar()
-        self.login.set("aaaaa")
         self.tls = tk.BooleanVar()
-        self.tls.set(True)
         self.port = tk.IntVar()
-        self.port.set(8000)
         self.draw_window()
 
     def start_main_loop(self):

net/UnicastConnection.py

@@ -107,11 +107,5 @@ class UnicastConnection:
 
     def close(self):
         self.sock.close()
-        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.is_connected = False
-        self.is_tls = False
-        self.ssock = None
-        self.ca_path = None
-        self.ssl_info = None