This commit is contained in:
parent
098e279eb8
commit
92c0f4a90a
@ -56,13 +56,13 @@ def printCommand():
|
|||||||
' 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> \n' +
|
' Login -> LIN <username> <password> \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> \n',
|
' Login -> LIN <username> <password> \n',
|
||||||
' Exit -> EXIT\n')
|
' Exit -> EXIT\n')
|
||||||
|
|
||||||
|
|
||||||
@ -99,14 +99,20 @@ while True:
|
|||||||
print("Invalid command format!")
|
print("Invalid command format!")
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if separatedCommand[0] == 'LIN' and len(separatedCommand) == 2:
|
if separatedCommand[0] == 'LIN' and len(separatedCommand) == 3:
|
||||||
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(separatedCommand[2])
|
network.connectToServer(separatedCommand[2])
|
||||||
|
response = network.recieveMessage().decode('UTF-8')
|
||||||
|
print(response)
|
||||||
|
if response == 'OK':
|
||||||
|
LOGGED_IN = True
|
||||||
|
else:
|
||||||
|
LOGGED_IN = False
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("Error: "+str(e))
|
print("Error: "+str(e))
|
||||||
|
LOGGED_IN = False
|
||||||
continue
|
continue
|
||||||
LOGGED_IN = True
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if separatedCommand[0] == 'EXIT':
|
if separatedCommand[0] == 'EXIT':
|
||||||
@ -181,3 +187,4 @@ while True:
|
|||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print('Error: ' + str(e))
|
print('Error: ' + str(e))
|
||||||
|
continue
|
||||||
|
Loading…
Reference in New Issue
Block a user