diff --git a/Cargo.toml b/Cargo.toml index c4d254f..95437ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,8 @@ -[package] -name = "sfs-mc" -version = "0.1.0" -description = "More than a web server that dynamically show the status of a Minecraft server (formerly known as bukkit-server-status)" -authors = ["Elias Schriefer"] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[workspace] +members = ["sfsmcd", "sfsmcctl"] [dependencies] -clap = { version = "2.33", features = ["wrap_help"] } toml = "0.5" tokio = { version = "0.2", features = ["full"] } async-minecraft-ping = "0.2" -actix-web = "2.0" \ No newline at end of file +dbus = "0.8" \ No newline at end of file diff --git a/README.md b/README.md index 90ed315..2d6837a 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,8 @@ More than a web server that dynamically show the status of a Minecraft server (f - [ ] Start the Minecraft server if offline - [ ] Config loading (using [`toml`](https://crates.io/crates/toml/)) - [ ] Config profiles -- [ ] Running in the background (using [`screen`](https://www.gnu.org/software/screen/)) \ No newline at end of file +- [ ] Running in the background (using [`screen`](https://www.gnu.org/software/screen/)) + +# Decisions made along the way +## 4th August 2020 +For the server and "client" to be able to communicate with eachother, I'll be using [DBus](https://www.freedesktop.org/wiki/Software/dbus/) and the [`dbus`-crate](https://crates.io/crates/dbus/). Also, it will probably be better to split the server and client/daemon and control utility in two separate projects (using Cargo's [workspaces](https://doc.rust-lang.org/cargo/reference/workspaces.html)). \ No newline at end of file diff --git a/sfsmcctl/Cargo.toml b/sfsmcctl/Cargo.toml new file mode 100644 index 0000000..a5720bc --- /dev/null +++ b/sfsmcctl/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "sfsmcctl" +version = "0.1.0" +# description = "More than a web server that dynamically show the status of a Minecraft server (formerly known as bukkit-server-status)" +description = "Control the sfsmcd minecraft and status servers" +authors = ["Elias Schriefer"] +edition = "2018" + +[dependencies] +clap = { version = "2.33", features = ["wrap_help"] } \ No newline at end of file diff --git a/sfsmcd/Cargo.toml b/sfsmcd/Cargo.toml new file mode 100644 index 0000000..811d79f --- /dev/null +++ b/sfsmcd/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "sfsmcd" +version = "0.1.0" +description = "A service that controls a minecraft and a web (status) server" +authors = ["Elias Schriefer"] +edition = "2018" + +[dependencies] +actix-web = "2.0" \ No newline at end of file diff --git a/src/main.rs b/src/main.rs deleted file mode 100644 index a56d1fd..0000000 --- a/src/main.rs +++ /dev/null @@ -1,4 +0,0 @@ -#[tokio::main] -async fn main() -> Result<(), Box> { - Ok(()) -} \ No newline at end of file