diff options
| -rw-r--r-- | console/src/bin/nogpadc.rs | 2 | ||||
| -rw-r--r-- | console/src/bin/nogpads.rs | 2 | ||||
| -rw-r--r-- | core/examples/start_client_console.rs | 2 | ||||
| -rw-r--r-- | core/examples/start_server_console.rs | 2 | ||||
| -rw-r--r-- | core/src/lib.rs | 2 | ||||
| -rw-r--r-- | core/src/pad_service/client.rs (renamed from core/src/pad_io/client.rs) | 4 | ||||
| -rw-r--r-- | core/src/pad_service/client_debug_cli.rs (renamed from core/src/pad_io/client_debug_cli.rs) | 2 | ||||
| -rw-r--r-- | core/src/pad_service/mod.rs (renamed from core/src/pad_io/mod.rs) | 0 | ||||
| -rw-r--r-- | core/src/pad_service/server.rs (renamed from core/src/pad_io/server.rs) | 6 | ||||
| -rw-r--r-- | core/src/pad_service/server_debug_cli.rs (renamed from core/src/pad_io/server_debug_cli.rs) | 2 | ||||
| -rw-r--r-- | core_c/src/lib.rs | 16 | ||||
| -rw-r--r-- | core_c/src/test.rs | 6 |
12 files changed, 12 insertions, 34 deletions
diff --git a/console/src/bin/nogpadc.rs b/console/src/bin/nogpadc.rs index a4b6245..656c2a0 100644 --- a/console/src/bin/nogpadc.rs +++ b/console/src/bin/nogpadc.rs @@ -1,7 +1,7 @@ use crate::AccountCommands::{Add, Customize, List, Remove}; use crate::Commands::{Account, Connect}; use clap::{Args, Parser, Subcommand}; -use nogamepads_core::pad_io::client::nogamepads_client::PadClient; +use nogamepads_core::pad_service::client::nogamepads_client::PadClient; use nogamepads_core::pad_data::pad_player_info::nogamepads_player_info::PlayerInfo; use nogamepads_core::DEFAULT_PORT; use prettytable::{row, Table}; diff --git a/console/src/bin/nogpads.rs b/console/src/bin/nogpads.rs index 7328b47..f42495a 100644 --- a/console/src/bin/nogpads.rs +++ b/console/src/bin/nogpads.rs @@ -1,5 +1,5 @@ use clap::{arg, Args, Parser, Subcommand}; -use nogamepads_core::pad_io::server::nogamepads_server::{PadServer}; +use nogamepads_core::pad_service::server::nogamepads_server::{PadServer}; use nogamepads_core::DEFAULT_PORT; use serde::{Deserialize, Serialize}; use std::env::current_dir; diff --git a/core/examples/start_client_console.rs b/core/examples/start_client_console.rs index 3d6653b..d138047 100644 --- a/core/examples/start_client_console.rs +++ b/core/examples/start_client_console.rs @@ -1,6 +1,6 @@ use std::net::{IpAddr, Ipv4Addr}; use nogamepads_core::pad_data::pad_player_info::nogamepads_player_info::PlayerInfo; -use nogamepads_core::pad_io::client::nogamepads_client::PadClient; +use nogamepads_core::pad_service::client::nogamepads_client::PadClient; const PASSWORD : &str = "password"; diff --git a/core/examples/start_server_console.rs b/core/examples/start_server_console.rs index 4b34cdd..4b42849 100644 --- a/core/examples/start_server_console.rs +++ b/core/examples/start_server_console.rs @@ -1,5 +1,5 @@ use nogamepads_core::pad_data::game_profile::game_profile::GameProfile; -use nogamepads_core::pad_io::server::nogamepads_server::PadServer; +use nogamepads_core::pad_service::server::nogamepads_server::PadServer; use nogamepads_core::DEFAULT_PORT; use std::net::{IpAddr, Ipv4Addr}; diff --git a/core/src/lib.rs b/core/src/lib.rs index f70fc4e..1abb191 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -1,7 +1,7 @@ use bincode::config; use bincode::config::Configuration; -pub mod pad_io; +pub mod pad_service; pub mod pad_data; pub const DEFAULT_PORT : u16 = 5989; diff --git a/core/src/pad_io/client.rs b/core/src/pad_service/client.rs index bd8bc2c..3114330 100644 --- a/core/src/pad_io/client.rs +++ b/core/src/pad_service/client.rs @@ -17,7 +17,7 @@ pub mod nogamepads_client { use nogamepads::console_utils::debug_console::read_cli; use nogamepads::convert_utils::convert_deque_to_vec; use nogamepads::logger_utils::logger_build; - use crate::pad_io::client_debug_cli::{process_debug_cmd, Pcc}; + use crate::pad_service::client_debug_cli::{process_debug_cmd, Pcc}; use crate::DEFAULT_PORT; use crate::pad_data::game_profile::game_profile::GameProfile; use crate::pad_data::pad_messages::nogamepads_message_encoder::NgpdMessageEncoder; @@ -157,7 +157,7 @@ pub mod nogamepads_client { // 部署环境 let runtime = tokio::runtime::Builder::new_multi_thread() - .thread_name("nogpad-pad_io") + .thread_name("nogpad-pad_service") .thread_stack_size(32 * 1024 * 1024) .enable_time() .enable_io() diff --git a/core/src/pad_io/client_debug_cli.rs b/core/src/pad_service/client_debug_cli.rs index b34bef5..988bf39 100644 --- a/core/src/pad_io/client_debug_cli.rs +++ b/core/src/pad_service/client_debug_cli.rs @@ -1,4 +1,4 @@ -use crate::pad_io::client::nogamepads_client::PadClient; +use crate::pad_service::client::nogamepads_client::PadClient; use crate::pad_data::pad_messages::nogamepads_messages::{ControlMessage, GameMessage}; use clap::{Args, Parser, Subcommand}; use std::sync::Arc; diff --git a/core/src/pad_io/mod.rs b/core/src/pad_service/mod.rs index ae10f2d..ae10f2d 100644 --- a/core/src/pad_io/mod.rs +++ b/core/src/pad_service/mod.rs diff --git a/core/src/pad_io/server.rs b/core/src/pad_service/server.rs index 59241f1..3c60864 100644 --- a/core/src/pad_io/server.rs +++ b/core/src/pad_service/server.rs @@ -24,7 +24,7 @@ pub mod nogamepads_server { use crate::pad_data::pad_messages::nogamepads_messages::GameMessage::Leave; use crate::pad_data::pad_messages::nogamepads_messages::LeaveReason::ServerClosed; use crate::pad_data::pad_player_info::nogamepads_player_info::PlayerInfo; - use crate::pad_io::server_debug_cli::{process_debug_cmd, Psc}; + use crate::pad_service::server_debug_cli::{process_debug_cmd, Psc}; type PlayerMap = Arc<Mutex<HashMap<String, PlayerInfo>>>; type WriteList = Arc<Mutex<HashMap<String, VecDeque<GameMessage>>>>; @@ -490,7 +490,7 @@ pub mod nogamepads_server { warn!("Received an error message from {}.", addr.to_string()); } Err(_) => { - warn!("Received an error message from unknown pad_io."); + warn!("Received an error message from unknown pad_service."); } } } @@ -502,7 +502,7 @@ pub mod nogamepads_server { warn!("Received unknown connection message from {}.", addr.to_string()); } Err(_) => { - warn!("Received unknown connection message from unknown pad_io."); + warn!("Received unknown connection message from unknown pad_service."); } } } diff --git a/core/src/pad_io/server_debug_cli.rs b/core/src/pad_service/server_debug_cli.rs index 39e1868..ab9e5a5 100644 --- a/core/src/pad_io/server_debug_cli.rs +++ b/core/src/pad_service/server_debug_cli.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; use crate::pad_data::pad_messages::nogamepads_messages::{ControlMessage, GameMessage}; -use crate::pad_io::server::nogamepads_server::PadServer; +use crate::pad_service::server::nogamepads_server::PadServer; use clap::{Args, Parser, Subcommand}; use std::ops::{Index}; use std::sync::{Arc, MutexGuard, PoisonError}; diff --git a/core_c/src/lib.rs b/core_c/src/lib.rs index 1e28dc6..e69de29 100644 --- a/core_c/src/lib.rs +++ b/core_c/src/lib.rs @@ -1,16 +0,0 @@ -mod test; - -pub fn add(left: u64, right: u64) -> u64 { - left + right -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn it_works() { - let result = add(2, 2); - assert_eq!(result, 4); - } -} diff --git a/core_c/src/test.rs b/core_c/src/test.rs deleted file mode 100644 index 6399278..0000000 --- a/core_c/src/test.rs +++ /dev/null @@ -1,6 +0,0 @@ -use std::ffi::c_schar; - -#[unsafe(no_mangle)] -pub extern "C" fn test (a: i32, b: c_schar) -> bool { - true -}
\ No newline at end of file |
