From 1461e385cfda611a47fb59844c8001b376723542 Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 9 Sep 2024 20:50:33 +0200 Subject: [PATCH] chore: debugging server refactoring with channels --- src/client.rs | 1 - src/message/handlers/privileged_users.rs | 5 +---- src/message/handlers/room_list.rs | 11 +---------- src/server.rs | 4 +++- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/client.rs b/src/client.rs index e49ed97..b7d3039 100644 --- a/src/client.rs +++ b/src/client.rs @@ -16,7 +16,6 @@ impl Client { } pub fn connect(&self) { - // Attempt to create a server instance match Server::new(self.address.clone()) { Ok(mut server) => { println!( diff --git a/src/message/handlers/privileged_users.rs b/src/message/handlers/privileged_users.rs index f92985c..0160e0d 100644 --- a/src/message/handlers/privileged_users.rs +++ b/src/message/handlers/privileged_users.rs @@ -1,7 +1,4 @@ -use crate::{ - dispatcher::MessageHandler, - message::{factory::build_shared_folders_message, Message}, -}; +use crate::{dispatcher::MessageHandler, message::Message}; pub struct PrivilegedUsersHandler; impl MessageHandler for PrivilegedUsersHandler { diff --git a/src/message/handlers/room_list.rs b/src/message/handlers/room_list.rs index a986493..4ee6524 100644 --- a/src/message/handlers/room_list.rs +++ b/src/message/handlers/room_list.rs @@ -1,13 +1,4 @@ -use std::{ - collections::VecDeque, - sync::{Arc, Condvar, Mutex}, -}; - -use crate::{ - dispatcher::MessageHandler, - message::{factory::build_shared_folders_message, Message}, - server::Room, -}; +use crate::{dispatcher::MessageHandler, message::Message, server::Room}; pub struct RoomListHandler; impl MessageHandler for RoomListHandler { diff --git a/src/server.rs b/src/server.rs index 3b4d61e..9cdd443 100644 --- a/src/server.rs +++ b/src/server.rs @@ -1,6 +1,6 @@ use crate::dispatcher::MessageDispatcher; use crate::message::factory::{build_init_message, build_login_message}; -use crate::message::{MessageReader, MessageType}; +use crate::message::MessageReader; use std::collections::VecDeque; use std::io::{self, Write}; use std::net::{TcpStream, ToSocketAddrs}; @@ -172,6 +172,8 @@ impl Server { } } }); + + // introduce a channel , get rid of the thread ? thread::spawn(move || { write_barrier.wait();