Merge branch 'master' of https://git.kmlabz.com/BiztProtoBois/client into master
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Torma Kristóf 2021-04-26 16:58:27 +02:00
commit 58606caf3f
Signed by: tormakris
GPG Key ID: DC83C4F2C41B1047

View File

@ -50,19 +50,19 @@ def loadAddress() -> str:
def printCommand(): def printCommand():
print('\nInvalid command! Available commands:\n' + print('\nInvalid command! Available commands:\n' +
' Create directory -> MKD <directory name> \n' + ' Create directory -> MKD <directory name> \n' +
' Remove directory -> RMV <directory name> \n' + ' Remove directory -> RMD <directory name> \n' +
' Get current directory -> GWD \n' + ' Get current directory -> GWD \n' +
' Change current directory -> CWD <path> \n' + ' Change current directory -> CWD <path> \n' +
' List content of current directory -> LST \n' + ' List content of current directory -> LST \n' +
' Upload file to current directory -> UPL <filename> \n' + ' Upload file to current directory -> UPL <filename> \n' +
' Download file from current directory -> DNL <filename> \n' + ' Download file from current directory -> DNL <filename> \n' +
' Login -> LIN <username> <password> \n' + ' Login -> LIN <username> \n' +
' Logout -> LOUT \n') ' Logout -> LOUT \n')
def printCommandsWihtoutLogin(): def printCommandsWihtoutLogin():
print('\nYou must log in before issuing other commads!\n', print('\nYou must log in before issuing other commads!\n',
' Login -> LIN <username> <password> \n', ' Login -> LIN <username> \n',
' Exit -> EXIT\n') ' Exit -> EXIT\n')
@ -99,7 +99,7 @@ while True:
print("Invalid command format!") print("Invalid command format!")
continue continue
if separatedCommand[0] == 'LIN' and len(separatedCommand) == 3: if separatedCommand[0] == 'LIN' and len(separatedCommand) == 2:
network = NetWrapper(CLIENT_PRIVATE_KEY, CLIENT_ADDRESS, separatedCommand[1], SERVER_PUBLIC_KEY) network = NetWrapper(CLIENT_PRIVATE_KEY, CLIENT_ADDRESS, separatedCommand[1], SERVER_PUBLIC_KEY)
try: try:
network.connectToServer() network.connectToServer()