From 6afe62b68e5ad80a00de9720d0d28f5f4c527ec7 Mon Sep 17 00:00:00 2001 From: SantaSpeen Date: Thu, 13 Jul 2023 18:08:47 +0300 Subject: [PATCH] Move sync_resources logic before insert to clients. --- src/core/core.py | 8 +------- src/core/tcp_server.py | 2 ++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/core/core.py b/src/core/core.py index 0327eb9..f36f4dd 100644 --- a/src/core/core.py +++ b/src/core/core.py @@ -77,7 +77,7 @@ class Client: await client.tcp_send(data) return - self.log.debug(f"tcp_send({data})") + # self.log.debug(f"tcp_send({data})") if len(data) == 10: data += b"." header = len(data).to_bytes(4, "little", signed=True) @@ -138,10 +138,6 @@ class Client: async def sync_resources(self): while True: data = await self.recv() - if not data: - await asyncio.sleep(.1) - continue - self.log.debug(f"Received: {data}") if data.startswith(b"f"): # TODO: SendFile file = data[1:].decode("utf-8") @@ -166,8 +162,6 @@ class Client: async def looper(self): # self.is_disconnected() - await self.tcp_send(b"P" + bytes(f"{self.cid}", "utf-8")) - await self.sync_resources() while self.alive: data = await self.recv() if data == b"": diff --git a/src/core/tcp_server.py b/src/core/tcp_server.py index 53e8ee6..c5365f5 100644 --- a/src/core/tcp_server.py +++ b/src/core/tcp_server.py @@ -72,6 +72,8 @@ class TCPServer: return False, None else: self.log.info("Identification success") + await client.tcp_send(b"P" + bytes(f"{client.cid}", "utf-8")) + await client.sync_resources() await self.Core.insert_client(client) return True, client