ULTIMATE SERVER DE LA MUERTE V2.0

This commit is contained in:
sidya82 2015-04-08 21:35:52 +02:00
parent 4836141b2d
commit f0f3dbcfed

View File

@ -20,77 +20,79 @@ def handleConnection(connection, client_address):
def handleRequest(connection, data): def handleRequest(connection, data):
#try: try:
arrayData = data.split(" ") arrayData = data.split(" ")
### Command for user with nickname ### ### Command for user with nickname ###
if usersConnected[connection][1] is not None: if usersConnected[connection][1] is not None:
if not arrayData[0][0] == "/" and usersConnected[connection][2]: ### No command -> new message ###
connection.sendall("SUCC_MESSAGE_SENDED".encode()) if not arrayData[0][0] == "/" and usersConnected[connection][2]:
broadcastMsg(connection, "NEW_MSG {} {} ".format(usersConnected[connection][1], data)) connection.sendall("SUCC_MESSAGE_SENDED".encode())
return broadcastMsg(connection, "NEW_MSG {} {} ".format(usersConnected[connection][1], data))
return
else:
### Command for user enable & disable ###
if arrayData[0] == "/name":
changeName(connection, arrayData[1])
return
if arrayData[0] == "/userlist":
userListActive(connection)
return
if arrayData[0] == "/userlistaway":
userListAway(connection)
return
if arrayData[0] == "/enable":
enableUser(connection)
return
if arrayData[0] == "/disable":
disableUser(connection)
return
if arrayData[0] == "/quit":
connection.shutdown(socket.SHUT_RD)
return
### Command available for enable only ###
if not usersConnected[connection][2] :
connection.sendall("ERR_U_ARE_DISABLE".encode())
return
else :
if arrayData[0] == "/askpm":
askPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/acceptpm":
acceptPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/rejectpm":
rejectPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/pm":
privateMsg(connection, arrayData[1], " ".join(arrayData[2:]))
return
if arrayData[0] == "/pmfile":
askFile(connection,arrayData[1],arrayData[2])
return
if arrayData[0] == "/acceptfile":
acceptFile(connection, arrayData[1], arrayData[2],arrayData[3])
return
if arrayData[0] == "/rejectfile":
rejectFile(connection, arrayData[1], " ".join(arrayData[2:]))
return
connection.sendall("ERR_COMMAND_NOT_FOUND".encode())
else: else:
if arrayData[0] == "/name": ### Command for user without nickname ###
changeName(connection, arrayData[1]) if arrayData[0] == "/newname":
return newName(connection, arrayData[1])
if arrayData[0] == "/userlist":
userListActive(connection)
return
if arrayData[0] == "/userlistaway":
userListAway(connection)
return
if arrayData[0] == "/enable":
enableUser(connection)
return
if arrayData[0] == "/disable":
disableUser(connection)
return return
if arrayData[0] == "/quit": if arrayData[0] == "/quit":
connection.shutdown(socket.SHUT_RD) connection.shutdown(socket.SHUT_RD)
return return
connection.sendall("ERR_NO_NICKNAME".encode())
### Command available for enable only ### except IndexError:
if not usersConnected[connection][2] :
connection.sendall("ERR_U_ARE_DISABLE".encode())
return
else :
if arrayData[0] == "/askpm":
askPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/acceptpm":
acceptPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/rejectpm":
rejectPrivateMsg(connection, arrayData[1])
return
if arrayData[0] == "/pm":
privateMsg(connection, arrayData[1], " ".join(arrayData[2:]))
return
if arrayData[0] == "/pmfile":
askFile(connection,arrayData[1],arrayData[2])
return
if arrayData[0] == "/acceptfile":
acceptFile(connection, arrayData[1], arrayData[2],arrayData[3])
return
if arrayData[0] == "/rejectfile":
rejectFile(connection, arrayData[1], " ".join(arrayData[2:]))
return
connection.sendall("ERR_COMMAND_NOT_FOUND".encode())
else:
### Command for user without nickname
if arrayData[0] == "/newname":
newName(connection, arrayData[1])
return
if arrayData[0] == "/quit":
connection.shutdown(socket.SHUT_RD)
return
connection.sendall("ERR_NO_NICKNAME".encode())
"""except IndexError:
log.printL("Parameter missing in the request", Log.lvl.WARNING) log.printL("Parameter missing in the request", Log.lvl.WARNING)
connection.sendall("ERR_PARAMETER_MISSING".encode()) connection.sendall("ERR_PARAMETER_MISSING".encode())
except Exception as e : except Exception as e :
log.printL("Handle request fail : {}".format(str(e)), Log.lvl.FAIL) log.printL("Handle request fail : {}".format(str(e)), Log.lvl.FAIL)
connection.sendall("ERR_INTERNAL_SERVER_ERROR".encode())""" connection.sendall("ERR_INTERNAL_SERVER_ERROR".encode())
def broadcastMsg(connection, message): def broadcastMsg(connection, message):