SantaSpeen/KuiToi-Server
1
0
Fork 0
mirror of https://github.com/kuitoi/kuitoi-Server.git synced 2025-08-17 16:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add client.identifiers;

Browse Source
This commit is contained in:
Maxim Khomutov 2023-07-21 02:41:45 +03:00
parent b345588c02
commit 98b4878339
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/Client.py
View File

@ -33,6 +33,7 @@ class Client:
self.roles = None self.roles = None
self._guest = True self._guest = True
self._ready = False self._ready = False
self._identifiers = []
self._cars = [None] * 21 # Max 20 cars per player + 1 snowman self._cars = [None] * 21 # Max 20 cars per player + 1 snowman
self._snowman = {"id": -1, "packet": ""} self._snowman = {"id": -1, "packet": ""}
self._connect_time = 0 self._connect_time = 0
@ -65,6 +66,10 @@ class Client:
def ready(self): def ready(self):
return self._ready return self._ready
@property
def identifiers(self):
return self._identifiers
@property @property
def cars(self): def cars(self):
return self._cars return self._cars
@ -381,8 +386,13 @@ class Client:
des = f"Od:{self.cid}-{car_id}" des = f"Od:{self.cid}-{car_id}"
await self._send(des) await self._send(des)
async def _delete_car(self, raw_data): async def _delete_car(self, raw_data=None, car_id=None):
cid, car_id = self._get_cid_vid(raw_data)
if not car_id and raw_data:
cid, car_id = self._get_cid_vid(raw_data)
else:
cid = self.cid
raw_data = f"Od:{self.cid}-{car_id}"
if car_id != -1 and self.cars[car_id]: if car_id != -1 and self.cars[car_id]:

5
src/core/Client.pyi
View File

@ -33,6 +33,7 @@ class Client:
self._guest = True self._guest = True
self.__alive = True self.__alive = True
self._ready = False self._ready = False
self._identifiers = []
self._cars: List[Optional[Dict[str, int]]] = [] self._cars: List[Optional[Dict[str, int]]] = []
self._snowman: Dict[str, Union[int, str]] = {"id": -1, "packet": ""} self._snowman: Dict[str, Union[int, str]] = {"id": -1, "packet": ""}
@ -51,6 +52,8 @@ class Client:
@property @property
def ready(self) -> bool: ... def ready(self) -> bool: ...
@property @property
def identifiers(self) -> list: ...
@property
def cars(self) -> List[dict | None]: ... def cars(self) -> List[dict | None]: ...
def is_disconnected(self) -> bool: ... def is_disconnected(self) -> bool: ...
async def kick(self, reason: str) -> None: ... async def kick(self, reason: str) -> None: ...
@ -62,7 +65,7 @@ class Client:
async def _split_load(self, start: int, end: int, d_sock: bool, filename: str, sl: float) -> None: ... async def _split_load(self, start: int, end: int, d_sock: bool, filename: str, sl: float) -> None: ...
async def _get_cid_vid(self, s: str) -> Tuple[int, int]: ... async def _get_cid_vid(self, s: str) -> Tuple[int, int]: ...
async def _spawn_car(self, data: str) -> None: ... async def _spawn_car(self, data: str) -> None: ...
async def _delete_car(self, raw_data: str) -> None: ... async def _delete_car(self, raw_data: str = None, car_id : int =None) -> None: ...
async def _edit_car(self, raw_data: str, data: str) -> None: ... async def _edit_car(self, raw_data: str, data: str) -> None: ...
async def _reset_car(self, raw_data: str) -> None: ... async def _reset_car(self, raw_data: str) -> None: ...
async def _handle_car_codes(self, data: str) -> None: ... async def _handle_car_codes(self, data: str) -> None: ...

1
src/core/tcp_server.py
View File

@ -56,6 +56,7 @@ class TCPServer:
client.nick = res["username"] client.nick = res["username"]
client.roles = res["roles"] client.roles = res["roles"]
client._guest = res["guest"] client._guest = res["guest"]
client._identifiers = {k: v for s in res["identifiers"] for k, v in [s.split(':')]}
# noinspection PyProtectedMember # noinspection PyProtectedMember
client._update_logger() client._update_logger()
except Exception as e: except Exception as e: