diff --git a/src/lib/Foundation/mod.rs b/src/lib/Foundation/mod.rs deleted file mode 100644 index 6333649..0000000 --- a/src/lib/Foundation/mod.rs +++ /dev/null @@ -1,18 +0,0 @@ -use std::sync::{Weak,Arc}; - -pub trait IOwned { - fn set_owner(&self, owner: Weak); -} - -pub trait IOwner { - fn add_child(&self, child: Arc); - fn get_ref(&self) -> Weak; -} - -pub trait IMessagable { - fn send_message(&self, msg: M); -} - -pub trait ICooperative { - fn tick(&self); -} \ No newline at end of file diff --git a/src/lib/foundation/mod.rs b/src/lib/foundation/mod.rs new file mode 100644 index 0000000..a5269c4 --- /dev/null +++ b/src/lib/foundation/mod.rs @@ -0,0 +1,7 @@ +pub trait IMessagable { + fn send_message(&self, msg: M); +} + +pub trait ICooperative { + fn tick(&self); +} \ No newline at end of file diff --git a/src/lib/mod.rs b/src/lib/mod.rs index 4ef91b1..1e515f8 100644 --- a/src/lib/mod.rs +++ b/src/lib/mod.rs @@ -1,7 +1,7 @@ // pub mod commands; pub mod prelude; pub mod server; -pub mod Foundation; +pub mod foundation; pub mod commands; use std::sync::Arc; diff --git a/src/lib/server/client_management/client/mod.rs b/src/lib/server/client_management/client/mod.rs index e198e89..d0ace26 100644 --- a/src/lib/server/client_management/client/mod.rs +++ b/src/lib/server/client_management/client/mod.rs @@ -14,7 +14,7 @@ use serde::{Serialize, Deserialize}; use crossbeam_channel::{Sender, Receiver, unbounded}; use traits::IClient; -use crate::lib::Foundation::{ICooperative, IMessagable}; +use crate::lib::foundation::{ICooperative, IMessagable}; use crate::lib::server::ServerMessages; /// # ClientMessage diff --git a/src/lib/server/client_management/client/traits.rs b/src/lib/server/client_management/client/traits.rs index 887a7b1..b0e3b23 100644 --- a/src/lib/server/client_management/client/traits.rs +++ b/src/lib/server/client_management/client/traits.rs @@ -1,6 +1,5 @@ use std::sync::Arc; use std::net::TcpStream; -use std::collections::HashMap; use crossbeam_channel::Sender; diff --git a/src/lib/server/client_management/mod.rs b/src/lib/server/client_management/mod.rs index d092f8d..206af7e 100644 --- a/src/lib/server/client_management/mod.rs +++ b/src/lib/server/client_management/mod.rs @@ -13,11 +13,13 @@ use self::client::Client; use self::client::ClientMessage; use self::traits::TClientManager; use crate::lib::server::ServerMessages; -use crate::lib::Foundation::IMessagable; -use crate::lib::Foundation::ICooperative; +use crate::lib::foundation::IMessagable; +use crate::lib::foundation::ICooperative; enum ClientManagerMessages { + #[allow(dead_code)] DropAll, + #[allow(dead_code)] MessageClient, } diff --git a/src/lib/server/mod.rs b/src/lib/server/mod.rs index 06c5c4e..a2af064 100644 --- a/src/lib/server/mod.rs +++ b/src/lib/server/mod.rs @@ -1,36 +1,31 @@ pub mod client_management; pub mod network_manager; -use crate::lib::server::network_manager::NetworkManager; -use std::collections::HashMap; -use std::net::TcpListener; -use std::sync::Arc; -use std::io::Write; -use std::io::Read; - - use uuid::Uuid; -use crossbeam_channel::{Sender, Receiver, unbounded}; +use crate::lib::server::network_manager::NetworkManager; +use std::sync::Arc; + +use crossbeam_channel::{Receiver, unbounded}; use crate::lib::server::client_management::ClientManager; use crate::lib::server::client_management::traits::TClientManager; -use crate::lib::Foundation::{ICooperative}; +use crate::lib::foundation::{ICooperative}; use client_management::client::Client; -use crate::lib::commands::Commands; /// # ServerMessages /// This is used internally #[derive(Debug)] pub enum ServerMessages { ClientConnected(Arc), - ClientDisconnected(Uuid) + + #[allow(dead_code)] + ClientDisconnected(Uuid), } pub struct Server { client_manager: Arc, network_manager: Arc, - sender: Sender, receiver: Receiver, } @@ -42,8 +37,6 @@ impl Server { client_manager: ClientManager::new(sender.clone()), network_manager: NetworkManager::new("5600".to_string(), sender.clone()), - - sender, receiver, }) } diff --git a/src/lib/server/network_manager/mod.rs b/src/lib/server/network_manager/mod.rs index d322707..532b2a3 100644 --- a/src/lib/server/network_manager/mod.rs +++ b/src/lib/server/network_manager/mod.rs @@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize}; use crossbeam_channel::Sender; use crate::lib::server::ServerMessages; -use crate::lib::Foundation::ICooperative; +use crate::lib::foundation::ICooperative; use crate::lib::server::client_management::client::traits::IClient; @@ -31,9 +31,9 @@ enum NetworkSockOut<'a> { } // these are control signals from the server. -pub enum NetworkMessages { +// pub enum NetworkMessages { -} +// } pub struct NetworkManager { listener: TcpListener, diff --git a/src/main.rs b/src/main.rs index bdf0c97..1f92c55 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,7 +3,7 @@ mod lib; use clap::{App, Arg}; use crate::lib::server::Server; -use crate::lib::Foundation::ICooperative; +use crate::lib::foundation::ICooperative; fn main() { let _args = App::new("--rust chat server--")