Merge oublié #1

Merged
EndMove merged 7 commits from dev into main 2022-08-09 12:20:12 +02:00
2 changed files with 5 additions and 4 deletions
Showing only changes of commit 63772e7d11 - Show all commits

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:
@ -41,7 +42,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 +118,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):

BIN
ffe.labo.swilabus.com.p12 Normal file

Binary file not shown.