组合模块中 structs.rs 和 implements.rs 文件

7 files changed, 29 insertions, 40 deletions

diff --git a/core/src/service/tcp_network/long_connection.rs b/core/src/service/tcp_network/long_connection.rs
index 200cf61..c8916fa 100644
--- a/core/src/service/tcp_network/long_connection.rs
+++ b/core/src/service/tcp_network/long_connection.rs
@@ -1,6 +1,3 @@
-use crate::data::player::structs::Player;
-use crate::service::tcp_network::pad_client::structs::PadClientNetwork;
-use crate::service::tcp_network::pad_server::structs::PadServerNetwork;
 use std::sync::Arc;
 use std::sync::atomic::Ordering::SeqCst;
 use log::{error, info, trace, warn};
@@ -9,12 +6,15 @@ use tokio::net::tcp::{OwnedReadHalf, OwnedWriteHalf};
 use tokio::net::TcpStream;
 use tokio::spawn;
 use nogamepads::entry_mutex;
-use crate::data::message::enums::{ControlMessage, GameMessage};
-use crate::data::message::enums::ExitReason::GameOver;
-use crate::data::message::enums::GameMessage::{End, LetExit};
+use crate::data::message::message_enums::{ControlMessage, GameMessage};
+use crate::data::message::message_enums::ExitReason::GameOver;
+use crate::data::message::message_enums::GameMessage::{End, LetExit};
 use crate::data::message::traits::{MessageEncoder, MessageManager};
+use crate::data::player::player_data::Player;
 use crate::service::service_types::ServiceType;
 use crate::service::service_types::ServiceType::TCPConnection;
+use crate::service::tcp_network::pad_client::pad_client_service::PadClientNetwork;
+use crate::service::tcp_network::pad_server::pad_server_service::PadServerNetwork;
 
 impl PadServerNetwork {
 
diff --git a/core/src/service/tcp_network/pad_client/mod.rs b/core/src/service/tcp_network/pad_client/mod.rs
index 0ff870f..4e9794d 100644
--- a/core/src/service/tcp_network/pad_client/mod.rs
+++ b/core/src/service/tcp_network/pad_client/mod.rs
@@ -1,2 +1 @@
-pub mod implements;
-pub mod structs;
\ No newline at end of file
+pub mod pad_client_service;
\ No newline at end of file
diff --git a/core/src/service/tcp_network/pad_client/implements.rs b/core/src/service/tcp_network/pad_client/pad_client_service.rs
index 021b325..9b1826b 100644
--- a/core/src/service/tcp_network/pad_client/implements.rs
+++ b/core/src/service/tcp_network/pad_client/pad_client_service.rs
@@ -6,16 +6,20 @@ use log::{error, info, warn};
 use tokio::{join, spawn};
 use tokio::time::sleep;
 use nogamepads::entry_mutex;
-use crate::data::controller::runtime::structs::ControllerRuntime;
-use crate::data::message::enums::ConnectionMessage::{Join, RequestGameInfos};
-use crate::data::message::enums::ConnectionResponseMessage;
+use crate::data::controller::controller_runtime::ControllerRuntime;
+use crate::data::message::message_enums::ConnectionMessage::{Join, RequestGameInfos};
+use crate::data::message::message_enums::ConnectionResponseMessage;
 use crate::service::service_runner::NoGamepadsService;
 use crate::service::service_types::ServiceType;
-use crate::service::tcp_network::pad_client::structs::PadClientNetwork;
 use crate::service::tcp_network::DEFAULT_PORT;
 use crate::service::tcp_network::utils::stream_utils::{read_msg, send_msg};
 use crate::service::tcp_network::utils::tokio_utils::build_tokio_runtime;
 
+pub struct PadClientNetwork {
+    pub(crate) addr: SocketAddr,
+    pub(crate) runtime: Arc<Mutex<ControllerRuntime>>
+}
+
 macro_rules! connect_once {
     ($addr:expr, |$conn:ident| $code:block) => {{
         use tokio::net::TcpStream;
diff --git a/core/src/service/tcp_network/pad_client/structs.rs b/core/src/service/tcp_network/pad_client/structs.rs
deleted file mode 100644
index 10c93c4..0000000
--- a/core/src/service/tcp_network/pad_client/structs.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use std::net::SocketAddr;
-use std::sync::{Arc, Mutex};
-use crate::data::controller::runtime::structs::ControllerRuntime;
-
-pub struct PadClientNetwork {
-    pub(crate) addr: SocketAddr,
-    pub(crate) runtime: Arc<Mutex<ControllerRuntime>>
-}
\ No newline at end of file
diff --git a/core/src/service/tcp_network/pad_server/mod.rs b/core/src/service/tcp_network/pad_server/mod.rs
index b37b320..43d81a9 100644
--- a/core/src/service/tcp_network/pad_server/mod.rs
+++ b/core/src/service/tcp_network/pad_server/mod.rs
@@ -1,2 +1 @@
-pub mod implements;
-pub mod structs;
+pub mod pad_server_service;
\ No newline at end of file
diff --git a/core/src/service/tcp_network/pad_server/implements.rs b/core/src/service/tcp_network/pad_server/pad_server_service.rs
index d4288bf..1b665a0 100644
--- a/core/src/service/tcp_network/pad_server/implements.rs
+++ b/core/src/service/tcp_network/pad_server/pad_server_service.rs
@@ -5,19 +5,26 @@ use std::time::Duration;
 use log::{error, info, trace, warn};
 use tokio::{join, select, spawn};
 use tokio::net::{TcpListener, TcpStream};
-use tokio::sync::watch::{channel};
+use tokio::sync::watch::{channel, Receiver, Sender};
 use tokio::time::sleep;
 use nogamepads::entry_mutex;
-use crate::data::game::runtime::structs::GameRuntime;
-use crate::data::message::enums::ConnectionMessage;
-use crate::data::message::enums::ConnectionMessage::{Join, RequestGameInfos, RequestLayoutConfigure, RequestSkinPackage, Ready};
-use crate::data::message::enums::ConnectionResponseMessage::{Deny, GameInfos, Welcome};
+use crate::data::game::game_runtime::GameRuntime;
+use crate::data::message::message_enums::ConnectionMessage;
+use crate::data::message::message_enums::ConnectionMessage::{Join, RequestGameInfos, RequestLayoutConfigure, RequestSkinPackage, Ready};
+use crate::data::message::message_enums::ConnectionResponseMessage::{Deny, GameInfos, Welcome};
 use crate::service::service_runner::NoGamepadsService;
 use crate::service::tcp_network::DEFAULT_PORT;
-use crate::service::tcp_network::pad_server::structs::PadServerNetwork;
 use crate::service::tcp_network::utils::stream_utils::{get_target_address, read_msg, send_msg};
 use crate::service::tcp_network::utils::tokio_utils::build_tokio_runtime;
 
+pub struct PadServerNetwork {
+    pub(crate) addr: SocketAddr,
+    pub(crate) runtime: Arc<Mutex<GameRuntime>>,
+
+    pub(crate) close_tx: Sender<bool>,
+    pub(crate) close_rx: Receiver<bool>,
+}
+
 impl PadServerNetwork {
 
     pub fn build(runtime: Arc<Mutex<GameRuntime>>) -> PadServerNetwork {
diff --git a/core/src/service/tcp_network/pad_server/structs.rs b/core/src/service/tcp_network/pad_server/structs.rs
deleted file mode 100644
index f46608a..0000000
--- a/core/src/service/tcp_network/pad_server/structs.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use crate::data::game::runtime::structs::GameRuntime;
-use std::net::SocketAddr;
-use std::sync::{Arc, Mutex};
-use tokio::sync::watch::{Receiver, Sender};
-
-pub struct PadServerNetwork {
-    pub(crate) addr: SocketAddr,
-    pub(crate) runtime: Arc<Mutex<GameRuntime>>,
-
-    pub(crate) close_tx: Sender<bool>,
-    pub(crate) close_rx: Receiver<bool>,
-}
\ No newline at end of file