Разбиение проекта на подпроекты

Cargo.toml

@@ -1,19 +1,13 @@
-[package]
-name = "checkers"
+[workspace]
+members = [
+    # Исполняемая программа
+    "crates/checkers-app",
+    # Библиотека логики поведения шашек
+    "crates/checkers-lib"
+]
+resolver = "2"
+
+[workspace.package]
 authors = ["Сырцев Вадим Игоревич <syrtcevvi@gmail.com>"]
 description = "Игра Шашки"
-version = "0.1.0"
 edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-bincode = "1.3.3"
-derive_more = "0.99.17"
-iced = { version = "0.10.0", features = ["canvas"] }
-itertools = "0.12.0"
-once_cell = "1.18.0"
-serde = { version = "1.0.193", features = ["derive"] }
-
-[profile.release]
-panic = "abort"

README.md

@@ -96,9 +96,10 @@ cargo run --release
 ## Дальнейшие планы?
 На момент написания этого файла, планируется сделать следующие улучшения:
 - Покрыть игровую логику автотестами 
+- Мигрировать к использованию библиотеки [tauri](https://github.com/tauri-apps/tauri) для создания интерфейса
 - Оптимизировать использование программой оперативной памяти
 - Расширить доступный инструментарий программы
 - Внедрить возможность добавления переводов текстовых сообщений
 - Добавить возможность собственной стилизации элементов интерфейса
-
+### Маловероятно, но вдруг?)
 - Добавить возможность игры по сети?

crates/checkers-app/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "checkers-app"
+authors.workspace = true
+description.workspace = true
+version = "0.1.0"
+edition.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+checkers-lib = { path = "../checkers-lib" }
+
+serde = { version = "1.0.193", features = ["derive"] }
+bincode = "1.3.3"
+once_cell = "1.18.0"
+itertools = "0.12.0"
+iced = { version = "0.10.0", features = ["canvas"] }
+
+[profile.release]
+panic = "abort"

crates/checkers-app/src/application/enums/mod.rs

@@ -0,0 +1,3 @@
+mod message;
+
+pub use message::Message;

src/application/structs/board/board.rs → crates/checkers-app/src/application/structs/board/board.rs

@@ -24,12 +24,15 @@ use iced::{
 };
 use once_cell::sync::Lazy;
 
-use crate::application::{
+use checkers_lib::{
     enums::{Piece, Route, Side},
-    structs::{GameData, Position},
+    structs::Position,
 };
 
-use super::{Message, State};
+use crate::application::structs::{
+    board::{Message, State},
+    GameData,
+};
 
 // Преднастроенная конфигурация текстового элемента, отображаемого в overlay
 static OVERLAY_TEXT_PRESET: Lazy<Text> = Lazy::new(|| Text {

src/application/structs/board/message.rs → crates/checkers-app/src/application/structs/board/message.rs

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-use crate::application::{enums::Side, structs::Position};
+use checkers_lib::{enums::Side, structs::Position};
 
 #[derive(Debug, Clone)]
 pub enum Message {

src/application/structs/board/state.rs → crates/checkers-app/src/application/structs/board/state.rs

@@ -13,8 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-
-use crate::application::{enums::Piece, structs::Position};
+use checkers_lib::{enums::Piece, structs::Position};
 
 #[derive(Default)]
 pub enum State {

src/application/structs/game_data.rs → crates/checkers-app/src/application/structs/game_data.rs

@@ -14,10 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, ops::RangeInclusive};
 
-use crate::application::{
+use serde::{Deserialize, Serialize};
+
+use checkers_lib::{
     enums::{Direction, Piece, Route, Side},
     structs::Position,
 };

src/application/structs/mod.rs → crates/checkers-app/src/application/structs/mod.rs

@@ -1,9 +1,7 @@
 pub mod board;
 mod game_data;
-mod position;
 
 pub use self::{
     board::{Board, Message as BoardMessage},
     game_data::GameData,
-    position::Position,
 };

src/main.rs → crates/checkers-app/src/main.rs

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#![windows_subsystem = "windows"]
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 mod application;
 use iced::{window, Application, Result, Settings};
 

crates/checkers-lib/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "checkers-lib"
+authors.workspace = true
+description.workspace = true
+version = "0.1.0"
+edition.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+serde = { version = "1.0.193", features = ["derive"] }
+derive_more = "0.99.17"

crates/checkers-lib/src/enums/mod.rs

@@ -0,0 +1,6 @@
+mod direction;
+mod piece;
+mod route;
+mod side;
+
+pub use self::{direction::Direction, piece::Piece, route::Route, side::Side};

src/application/enums/piece.rs → crates/checkers-lib/src/enums/piece.rs

@@ -27,6 +27,7 @@ pub enum Piece {
     King,
 }
 
+// TODO заменить на enum-as-inner?
 impl Piece {
     pub fn is_man(&self) -> bool {
         matches!(self, Piece::Man)

src/application/enums/route.rs → crates/checkers-lib/src/enums/route.rs

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-use crate::application::structs::Position;
+use crate::structs::Position;
 
 /// Маршрут перемещения фигуры
 #[derive(Debug, Clone)]
@@ -23,7 +23,7 @@ pub enum Route {
     Movement(Position),
     /// Взятие фигур противника
     ///
-    /// Конечная позиция и позиция вражеских фигур, которые были "съедены" во время взятия
+    /// Конечная позиция и позиции вражеских фигур, которые были "съедены" во время взятия
     Taking(Position, Vec<Position>),
 }
 

crates/checkers-lib/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod enums;
+pub mod structs;

crates/checkers-lib/src/structs/mod.rs

@@ -0,0 +1,3 @@
+mod position;
+
+pub use self::position::Position;

src/application/structs/position.rs → crates/checkers-lib/src/structs/position.rs

@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-use derive_more::Display;
+use derive_more::{Display, From};
 use serde::{Deserialize, Serialize};
 
-use crate::application::enums::Direction;
+use crate::enums::Direction;
 
 /// Положение фигуры на игральной доске
-#[derive(Debug, Display, Hash, PartialEq, Eq, Clone, Copy, Deserialize, Serialize)]
+#[derive(Debug, Display, From, Hash, PartialEq, Eq, Clone, Copy, Deserialize, Serialize)]
 #[display(fmt = "({}, {})", row, column)]
 pub struct Position {
     pub row: i8,
@@ -84,11 +84,11 @@ impl Position {
     }
 }
 
-impl From<(i8, i8)> for Position {
-    fn from(value: (i8, i8)) -> Self {
-        Self {
-            row: value.0,
-            column: value.1,
-        }
-    }
-}
+// impl From<(i8, i8)> for Position {
+//     fn from(value: (i8, i8)) -> Self {
+//         Self {
+//             row: value.0,
+//             column: value.1,
+//         }
+//     }
+// }