diff --git a/Cargo.lock b/Cargo.lock index edb0095..e385c2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -607,7 +607,7 @@ dependencies = [ [[package]] name = "dockermcmgr" -version = "0.1.0" +version = "0.0.2" dependencies = [ "async-std", "bollard", diff --git a/Cargo.toml b/Cargo.toml index e08d641..5c7a630 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "dockermcmgr" -version = "0.1.0" +version = "0.0.2" edition = "2024" +#[[bin]] +#name = "dmm" +#path = "src/main.rs" + [dependencies] async-std = "1.13.2" bollard = "0.21.0" diff --git a/flake.nix b/flake.nix index 043bd8a..6feb0be 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ final: { pname = "dockermcmgr"; - version = "0.0.1"; + version = "0.0.2"; inherit src; cargoLock.lockFile = src + "/Cargo.lock"; @@ -46,7 +46,6 @@ buildInputs = with pkgs; [ sqlite ]; - } // specialArgs ); @@ -56,11 +55,11 @@ system: let pkgs = pkgs_gen { inherit system; }; - iloader = dmm_gen { inherit pkgs; }; + dmm = dmm_gen { inherit pkgs; }; in { - inherit iloader; - default = iloader; + inherit dmm; + default = dmm; } ); formatter = forAllSystems ( diff --git a/src/cli/remove.rs b/src/cli/remove.rs index 31c7d9a..1983030 100644 --- a/src/cli/remove.rs +++ b/src/cli/remove.rs @@ -1,7 +1,7 @@ use bollard::Docker; use clap::{Arg, ArgMatches, Command}; -use crate::{Config, DbPool, dockermgr, models::Servers}; +use crate::{Config, DbPool, dockermgr}; use std::fs; diff --git a/src/minecraft/socket.rs b/src/minecraft/socket.rs index 4844e28..665a07c 100644 --- a/src/minecraft/socket.rs +++ b/src/minecraft/socket.rs @@ -1,4 +1,4 @@ -use crate::minecraft::{client::client::Client, manager_loop}; +use crate::minecraft::{client::client::Client, server_manager_loop}; use bollard::Docker; use tokio::net::TcpStream; @@ -8,7 +8,6 @@ use tokio::net::TcpListener; use std::io; -use crate::minecraft::server_manager_loop; pub async fn mc_socket_listen(pool: DbPool, docker: Docker) -> io::Result<()> { let mc_listener = TcpListener::bind("0.0.0.0:25565").await?;