diff --git a/rust/Cargo.lock b/rust/Cargo.lock index c57f2a6..ef6394c 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -456,31 +456,6 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "cli_player" -version = "0.1.0" -dependencies = [ - "clap", - "crossterm", - "env_logger", - "futures", - "hostname", - "hyper-rustls", - "lazy_static", - "log", - "num", - "num-derive", - "num-traits", - "rustls", - "sea_battle_backend", - "serde_json", - "serde_urlencoded", - "textwrap", - "tokio", - "tokio-tungstenite", - "tui", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -1564,6 +1539,31 @@ dependencies = [ "uuid", ] +[[package]] +name = "sea_battle_cli_player" +version = "0.1.0" +dependencies = [ + "clap", + "crossterm", + "env_logger", + "futures", + "hostname", + "hyper-rustls", + "lazy_static", + "log", + "num", + "num-derive", + "num-traits", + "rustls", + "sea_battle_backend", + "serde_json", + "serde_urlencoded", + "textwrap", + "tokio", + "tokio-tungstenite", + "tui", +] + [[package]] name = "security-framework" version = "2.7.0" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index c4ee906..fd0176e 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -2,5 +2,5 @@ members = [ "sea_battle_backend", - "cli_player" + "sea_battle_cli_player" ] diff --git a/rust/sea_battle_backend/Cargo.toml b/rust/sea_battle_backend/Cargo.toml index 280e659..4947fda 100644 --- a/rust/sea_battle_backend/Cargo.toml +++ b/rust/sea_battle_backend/Cargo.toml @@ -2,6 +2,10 @@ name = "sea_battle_backend" version = "0.1.0" edition = "2021" +license = "GPL-2.0-or-later" +description = "A Sea Battle game backend server" +repository = "https://gitea.communiquons.org/pierre/SeaBattle" +readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rust/sea_battle_backend/README.md b/rust/sea_battle_backend/README.md new file mode 100644 index 0000000..fb67f35 --- /dev/null +++ b/rust/sea_battle_backend/README.md @@ -0,0 +1,5 @@ +# Sea battle backend + +A backend server for the Sea Battle game. + +A command-line client is available in the `sea_battle_cli_player` crate. diff --git a/rust/cli_player/Cargo.toml b/rust/sea_battle_cli_player/Cargo.toml similarity index 78% rename from rust/cli_player/Cargo.toml rename to rust/sea_battle_cli_player/Cargo.toml index 74c371c..1cc6c70 100644 --- a/rust/cli_player/Cargo.toml +++ b/rust/sea_battle_cli_player/Cargo.toml @@ -1,7 +1,11 @@ [package] -name = "cli_player" +name = "sea_battle_cli_player" version = "0.1.0" edition = "2021" +license = "GPL-2.0-or-later" +description = "A Sea Battle game shell client" +repository = "https://gitea.communiquons.org/pierre/SeaBattle" +readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -24,4 +28,4 @@ futures = "0.3.23" serde_json = "1.0.85" hostname = "0.3.1" rustls = "0.20.6" -hyper-rustls = { version = "0.23.0", features = ["rustls-native-certs"] } \ No newline at end of file +hyper-rustls = { version = "0.23.0", features = ["rustls-native-certs"] } diff --git a/rust/sea_battle_cli_player/README.md b/rust/sea_battle_cli_player/README.md new file mode 100644 index 0000000..c5f1203 --- /dev/null +++ b/rust/sea_battle_cli_player/README.md @@ -0,0 +1,3 @@ +# Sea battle player + +A sea battle shell client player for the `sea_battle_backend` crate. diff --git a/rust/cli_player/src/cli_args.rs b/rust/sea_battle_cli_player/src/cli_args.rs similarity index 100% rename from rust/cli_player/src/cli_args.rs rename to rust/sea_battle_cli_player/src/cli_args.rs diff --git a/rust/cli_player/src/client.rs b/rust/sea_battle_cli_player/src/client.rs similarity index 100% rename from rust/cli_player/src/client.rs rename to rust/sea_battle_cli_player/src/client.rs diff --git a/rust/cli_player/src/constants.rs b/rust/sea_battle_cli_player/src/constants.rs similarity index 100% rename from rust/cli_player/src/constants.rs rename to rust/sea_battle_cli_player/src/constants.rs diff --git a/rust/cli_player/src/lib.rs b/rust/sea_battle_cli_player/src/lib.rs similarity index 100% rename from rust/cli_player/src/lib.rs rename to rust/sea_battle_cli_player/src/lib.rs diff --git a/rust/cli_player/src/main.rs b/rust/sea_battle_cli_player/src/main.rs similarity index 90% rename from rust/cli_player/src/main.rs rename to rust/sea_battle_cli_player/src/main.rs index 88c3496..8d0ae0f 100644 --- a/rust/cli_player/src/main.rs +++ b/rust/sea_battle_cli_player/src/main.rs @@ -12,20 +12,22 @@ use env_logger::Env; use tui::backend::{Backend, CrosstermBackend}; use tui::Terminal; -use cli_player::cli_args::{cli_args, TestDevScreen}; -use cli_player::client::Client; -use cli_player::server::run_server; -use cli_player::ui_screens::configure_game_rules::GameRulesConfigurationScreen; -use cli_player::ui_screens::game_screen::GameScreen; -use cli_player::ui_screens::input_screen::InputScreen; -use cli_player::ui_screens::popup_screen::PopupScreen; -use cli_player::ui_screens::select_play_mode_screen::{SelectPlayModeResult, SelectPlayModeScreen}; -use cli_player::ui_screens::*; use sea_battle_backend::consts::{ INVITE_CODE_LENGTH, MAX_PLAYER_NAME_LENGTH, MIN_PLAYER_NAME_LENGTH, }; use sea_battle_backend::data::GameRules; use sea_battle_backend::utils::res_utils::Res; +use sea_battle_cli_player::cli_args::{cli_args, TestDevScreen}; +use sea_battle_cli_player::client::Client; +use sea_battle_cli_player::server::run_server; +use sea_battle_cli_player::ui_screens::configure_game_rules::GameRulesConfigurationScreen; +use sea_battle_cli_player::ui_screens::game_screen::GameScreen; +use sea_battle_cli_player::ui_screens::input_screen::InputScreen; +use sea_battle_cli_player::ui_screens::popup_screen::PopupScreen; +use sea_battle_cli_player::ui_screens::select_play_mode_screen::{ + SelectPlayModeResult, SelectPlayModeScreen, +}; +use sea_battle_cli_player::ui_screens::*; /// Test code screens async fn run_dev( diff --git a/rust/cli_player/src/server.rs b/rust/sea_battle_cli_player/src/server.rs similarity index 100% rename from rust/cli_player/src/server.rs rename to rust/sea_battle_cli_player/src/server.rs diff --git a/rust/cli_player/src/ui_screens/configure_game_rules.rs b/rust/sea_battle_cli_player/src/ui_screens/configure_game_rules.rs similarity index 100% rename from rust/cli_player/src/ui_screens/configure_game_rules.rs rename to rust/sea_battle_cli_player/src/ui_screens/configure_game_rules.rs diff --git a/rust/cli_player/src/ui_screens/confirm_dialog_screen.rs b/rust/sea_battle_cli_player/src/ui_screens/confirm_dialog_screen.rs similarity index 100% rename from rust/cli_player/src/ui_screens/confirm_dialog_screen.rs rename to rust/sea_battle_cli_player/src/ui_screens/confirm_dialog_screen.rs diff --git a/rust/cli_player/src/ui_screens/game_screen.rs b/rust/sea_battle_cli_player/src/ui_screens/game_screen.rs similarity index 100% rename from rust/cli_player/src/ui_screens/game_screen.rs rename to rust/sea_battle_cli_player/src/ui_screens/game_screen.rs diff --git a/rust/cli_player/src/ui_screens/input_screen.rs b/rust/sea_battle_cli_player/src/ui_screens/input_screen.rs similarity index 100% rename from rust/cli_player/src/ui_screens/input_screen.rs rename to rust/sea_battle_cli_player/src/ui_screens/input_screen.rs diff --git a/rust/cli_player/src/ui_screens/mod.rs b/rust/sea_battle_cli_player/src/ui_screens/mod.rs similarity index 100% rename from rust/cli_player/src/ui_screens/mod.rs rename to rust/sea_battle_cli_player/src/ui_screens/mod.rs diff --git a/rust/cli_player/src/ui_screens/popup_screen.rs b/rust/sea_battle_cli_player/src/ui_screens/popup_screen.rs similarity index 100% rename from rust/cli_player/src/ui_screens/popup_screen.rs rename to rust/sea_battle_cli_player/src/ui_screens/popup_screen.rs diff --git a/rust/cli_player/src/ui_screens/select_bot_type_screen.rs b/rust/sea_battle_cli_player/src/ui_screens/select_bot_type_screen.rs similarity index 100% rename from rust/cli_player/src/ui_screens/select_bot_type_screen.rs rename to rust/sea_battle_cli_player/src/ui_screens/select_bot_type_screen.rs diff --git a/rust/cli_player/src/ui_screens/select_play_mode_screen.rs b/rust/sea_battle_cli_player/src/ui_screens/select_play_mode_screen.rs similarity index 100% rename from rust/cli_player/src/ui_screens/select_play_mode_screen.rs rename to rust/sea_battle_cli_player/src/ui_screens/select_play_mode_screen.rs diff --git a/rust/cli_player/src/ui_screens/set_boats_layout_screen.rs b/rust/sea_battle_cli_player/src/ui_screens/set_boats_layout_screen.rs similarity index 100% rename from rust/cli_player/src/ui_screens/set_boats_layout_screen.rs rename to rust/sea_battle_cli_player/src/ui_screens/set_boats_layout_screen.rs diff --git a/rust/cli_player/src/ui_screens/utils.rs b/rust/sea_battle_cli_player/src/ui_screens/utils.rs similarity index 100% rename from rust/cli_player/src/ui_screens/utils.rs rename to rust/sea_battle_cli_player/src/ui_screens/utils.rs diff --git a/rust/cli_player/src/ui_widgets/button_widget.rs b/rust/sea_battle_cli_player/src/ui_widgets/button_widget.rs similarity index 100% rename from rust/cli_player/src/ui_widgets/button_widget.rs rename to rust/sea_battle_cli_player/src/ui_widgets/button_widget.rs diff --git a/rust/cli_player/src/ui_widgets/checkbox_widget.rs b/rust/sea_battle_cli_player/src/ui_widgets/checkbox_widget.rs similarity index 100% rename from rust/cli_player/src/ui_widgets/checkbox_widget.rs rename to rust/sea_battle_cli_player/src/ui_widgets/checkbox_widget.rs diff --git a/rust/cli_player/src/ui_widgets/game_map_widget.rs b/rust/sea_battle_cli_player/src/ui_widgets/game_map_widget.rs similarity index 100% rename from rust/cli_player/src/ui_widgets/game_map_widget.rs rename to rust/sea_battle_cli_player/src/ui_widgets/game_map_widget.rs diff --git a/rust/cli_player/src/ui_widgets/mod.rs b/rust/sea_battle_cli_player/src/ui_widgets/mod.rs similarity index 100% rename from rust/cli_player/src/ui_widgets/mod.rs rename to rust/sea_battle_cli_player/src/ui_widgets/mod.rs diff --git a/rust/cli_player/src/ui_widgets/text_editor_widget.rs b/rust/sea_battle_cli_player/src/ui_widgets/text_editor_widget.rs similarity index 100% rename from rust/cli_player/src/ui_widgets/text_editor_widget.rs rename to rust/sea_battle_cli_player/src/ui_widgets/text_editor_widget.rs