diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index a833ecc..bdab84e 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -59,12 +59,12 @@ services: - postgres:/var/lib/postgresql/13/main restart: always - # adminer: - # container_name: adminer - # image: adminer:latest - # restart: always - # networks: - # - transcendence + # adminer: + # container_name: adminer + # image: adminer:latest + # restart: always + # networks: + # - transcendence volumes: postgres: diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/changePrivateInfo.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/changePrivateInfo.py index a7b2164..a534d8f 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/changePrivateInfo.py +++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/changePrivateInfo.py @@ -6,7 +6,7 @@ # By: edbernar +#+ +:+ +#+ # +# By: edbernar = GameSettings.nbSkins): - socket.sendError("Skin id out of range", 9033) - return; - goalId = content.get("goalId",0) - if(goalId < 0 or goalId >= GameSettings.nbGoals): - socket.sendError("Goal id out of range", 9039) - return; - if("code" in content and len(content["code"])): - if(content["code"] in Tournament.currentTournaments): - Tournament.currentTournaments[content["code"]].join(socket, skin, goal) - else: - socket.sync_send("tournament",{"action":0, "exist":False}) - else: - nbBot = content.get("nbBot", 0) - if(nbBot < 0 or nbBot > 7): - socket.sendError("invalid number of bots", 9040) + try: + skinId = content.get("skinId", 0) + if(skinId < 0 or skinId >= GameSettings.nbSkins): + socket.sendError("Skin id out of range", 9033) return; - Tournament(socket, nbBot, skinId, goalId) + goalId = content.get("goalId",0) + if(goalId < 0 or goalId >= GameSettings.nbGoals): + socket.sendError("Goal id out of range", 9039) + return; + if("code" in content and len(content["code"])): + if(content["code"] in Tournament.currentTournaments): + Tournament.currentTournaments[content["code"]].join(socket, skinId, goalId) + else: + socket.sync_send("tournament",{"action":0, "exist":False}) + else: + nbBot = content.get("nbBot", 0) + if(nbBot < 0 or nbBot > 7): + socket.sendError("invalid number of bots", 9040) + return; + Tournament(socket, nbBot, skinId, goalId) + except Exception as e: + socket.sendError("error tournament", 9140, e) diff --git a/docker-compose/requirements/djangoserver/file/server/server/websocket.py b/docker-compose/requirements/djangoserver/file/server/server/websocket.py index 4137d74..d96b9dd 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/websocket.py +++ b/docker-compose/requirements/djangoserver/file/server/server/websocket.py @@ -6,7 +6,7 @@ # By: edbernar