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

Compare commits

base: lightcontainer:main
Branches Tags
lightcontainer:main
lightcontainer:maximilien
lightcontainer:dev
lightcontainer:jeremi
lightcontainer:benjamin
lightcontainer:swinnen
lightcontainer:Final-fixed
lightcontainer:Final
..
compare: lightcontainer:swinnen
Branches Tags
lightcontainer:main
lightcontainer:maximilien
lightcontainer:dev
lightcontainer:jeremi
lightcontainer:benjamin
lightcontainer:swinnen
lightcontainer:Final-fixed
lightcontainer:Final

No commits in common. "main" and "swinnen" have entirely different histories.
main ... swinnen

3 changed files with 5 additions and 18 deletions
Show Stats Expand all files Collapse all files

8
controller/AppController.py
View File

@ -3,7 +3,6 @@ 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
@ -32,10 +31,9 @@ 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.connection.close() self.on_filelist()
except Exception as ex: except Exception as ex:
print(ex) print(ex)
traceback.print_exc() traceback.print_exc()
@ -43,7 +41,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
@ -119,7 +117,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,15 +11,10 @@ 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,11 +107,5 @@ 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