lightcontainer/Client
2
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge oublié #1

Merged
EndMove merged 7 commits from dev into main 2022-08-09 12:20:12 +02:00
Conversation 1 Commits 7 Files Changed 3 +18 -5
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
controller/AppController.py
View File

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

5
gui/MainWindow.py
View File

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

6
net/UnicastConnection.py
View File

@ -107,5 +107,11 @@ class UnicastConnection:
def close(self): def close(self):
self.sock.close() 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