modern project structure

.gitignore

@@ -1,6 +1,5 @@
 Cargo.lock
+*/target
 /target
 .vscode/
-**/*.rs.bk
-*.glade~
 

Cargo.toml

@@ -1,31 +1,6 @@
-[package]
-name = "opensi"
-version = "0.1.0"
-authors = ["barsoosayque <[email protected]>", "snpefk <[email protected]>"]
-edition = "2018"
-
-[lib]
-name = "core"
-path = "src/core/lib.rs"
-
-[[bin]]
-name = "editor"
-path = "src/editor/main.rs"
-
-[[bin]]
-name = "client"
-path = "src/client/main.rs"
-
-
-[dependencies]
-serde = { version = "1.0", features = [ "derive" ] }
-quick-xml = { version = "0.17", features = [ "serialize" ] }
-zip = "0.5.4"
-
-gtk = "^0.8.0"
-relm = "^0.19.0"
-relm-derive = "^0.19.0"
-gdk = "^0.12.0"
-gdk-pixbuf = "^0.8.0"
-
-percent-encoding = "2.1.0"
+[workspace]
+members = [
+    "opensi",
+    "opensi-client",
+    "opensi-editor"
+]

README.md

@@ -34,8 +34,8 @@ $ sudo yum install gtk3-devel glib2-devel
 
 ```shell
 # Клиент
-$ cargo run --bin client
+$ cargo run --bin opensi-client
 
 # Редактор
-$ cargo run --bin editor
+$ cargo run --bin opensi-editor
 ```

opensi-client/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "opensi-client"
+version = "0.1.0"
+authors = ["barsoosayque <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+opensi = { version = "*", path = "../opensi" }
+
+druid = "0.6.0"

opensi-client/src/main.rs

@@ -0,0 +1,12 @@
+use druid::{AppLauncher, WindowDesc, Widget, PlatformError};
+use druid::widget::Label;
+
+fn build_ui() -> impl Widget<()> {
+        Label::new("Hello world")
+}
+
+fn main() -> Result<(), PlatformError> {
+        AppLauncher::with_window(WindowDesc::new(build_ui)).launch(())?;
+            Ok(())
+}
+

opensi-editor/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "opensi-editor"
+version = "0.1.0"
+authors = ["snpefk <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+opensi = { version = "*", path = "../opensi" }
+
+gtk = "^0.8.0"
+relm = "^0.19.0"
+relm-derive = "^0.19.0"
+gdk = "^0.12.0"
+gdk-pixbuf = "^0.8.0"
+zip = "0.5.4"

src/editor/main.rs → opensi-editor/src/main.rs

@@ -1,6 +1,3 @@
-#[path = "../core/lib.rs"]
-mod opensi;
-
 use gtk::prelude::*;
 use relm::{connect, Relm, Update, Widget};
 use relm_derive::Msg;
@@ -327,4 +324,4 @@ pub enum Chunk {
 
 fn main() {
     Win::run(()).expect("Window failed to run");
-}
+}

opensi/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "opensi"
+version = "0.1.0"
+authors = ["barsoosayque <[email protected]>", "snpefk <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+serde = { version = "1.0", features = [ "derive" ] }
+quick-xml = { version = "0.17", features = [ "serialize" ] }
+zip = "0.5.4"
+percent-encoding = "2.1.0"