fix all warnings, make the UI function better, fix last two warnings

Author: Sturdyfool11

src/AppState.rs src/app_state.rssrc/AppState.rs renamed to src/app_state.rs

@@ -2,8 +2,8 @@ use std::sync::{atomic::AtomicBool, Arc};
 use tokio::sync::Mutex;
 
 use crate::{
-    configuration::Config, master::SlaveConnection, messages::ServerInfo,
-    ControlledProgram::ControlledProgramInstance,
+    configuration::Config, controlled_program::ControlledProgramInstance, master::SlaveConnection,
+    messages::ServerInfo,
 };
 use tokio::sync::broadcast;
 #[derive(Clone)]

src/configuration.rs

@@ -8,7 +8,7 @@ use crate::master::SlaveConnectionDescriptor;
 pub struct Config {
     pub interface: String,
     pub port: String,
-    pub servers: Vec<crate::ControlledProgram::ControlledProgramDescriptor>,
+    pub servers: Vec<crate::controlled_program::ControlledProgramDescriptor>,
     pub slave: bool,
     pub slave_connections: Vec<SlaveConnectionDescriptor>,
 }

src/ControlledProgram.rs src/controlled_program.rssrc/ControlledProgram.rs renamed to src/controlled_program.rs

@@ -1,7 +1,7 @@
-mod AppState;
-mod ControlledProgram;
 mod ansi_to_html;
+mod app_state;
 mod configuration;
+mod controlled_program;
 mod files;
 mod macros;
 mod master;
@@ -32,7 +32,7 @@ async fn main() -> Result<(), String> {
         .without_time()
         .init();
     let (tx, _rx) = broadcast::channel(100);
-    let mut app_state = AppState::AppState::new(tx, config);
+    let mut app_state = app_state::AppState::new(tx, config);
     let handles: Vec<tokio::task::JoinHandle<()>>;
     if slave {
         handles = spawn_tasks!(app_state.clone(), start_servers, start_slave)

src/main.rs

@@ -6,7 +6,7 @@ use tokio::{net::TcpStream, time};
 use tokio_tungstenite::{connect_async, tungstenite::Message, MaybeTlsStream, WebSocketStream};
 use tracing::error;
 
-use crate::{configuration::Config, messages::*, AppState::AppState};
+use crate::{app_state::AppState, configuration::Config, messages::*};
 
 #[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct SlaveConnectionDescriptor {

src/master.rs

@@ -8,16 +8,16 @@ pub struct ServerInfo {
     pub output: String,
     pub active: bool,
     pub host: Option<SlaveConnectionDescriptor>,
-    pub specialization: Option<crate::ControlledProgram::SpecializedServerTypes>,
-    pub specialized_info: Option<crate::ControlledProgram::SpecializedServerInformation>,
+    pub specialization: Option<crate::controlled_program::SpecializedServerTypes>,
+    pub specialized_info: Option<crate::controlled_program::SpecializedServerInformation>,
 }
 
 #[derive(Clone, Serialize, Deserialize)]
 pub struct ConsoleOutput {
     pub r#type: String,
     pub output: String,
     pub server_name: String,
-    pub server_type: Option<crate::ControlledProgram::SpecializedServerTypes>,
+    pub server_type: Option<crate::controlled_program::SpecializedServerTypes>,
 }
 
 #[derive(Clone, Serialize, Deserialize)]

src/messages.rs

@@ -1,5 +1,5 @@
 use crate::{
-    messages::ConsoleOutput, AppState::AppState, ControlledProgram::ControlledProgramDescriptor,
+    app_state::AppState, controlled_program::ControlledProgramDescriptor, messages::ConsoleOutput,
 };
 use tracing::*;
 
@@ -8,7 +8,7 @@ pub async fn send_termination_message(
     state: &AppState,
     server_name: String,
     exit_code: i32,
-    server_type: Option<crate::ControlledProgram::SpecializedServerTypes>,
+    server_type: Option<crate::controlled_program::SpecializedServerTypes>,
 ) {
     let termination_msg = ConsoleOutput {
         r#type: "ServerOutput".to_owned(),

src/servers.rs

@@ -1,7 +1,7 @@
 use axum::{routing::get, Router};
 use tracing::info;
 
-use crate::{websocket::handle_ws_upgrade, AppState::AppState};
+use crate::{app_state::AppState, websocket::handle_ws_upgrade};
 
 async fn get_router(_state: AppState) -> Router<AppState> {
     let router: Router<AppState> = Router::new().route("/ws", get(handle_ws_upgrade));

src/slave.rs

@@ -11,7 +11,7 @@ use axum_extra::response::*;
 use tower_http::services::ServeDir;
 use tracing::*;
 
-use crate::AppState::AppState;
+use crate::app_state::AppState;
 
 async fn js_serve(State(_state): State<AppState>) -> JavaScript<String> {
     JavaScript::from(include_str!("html_src/index.js").to_owned())

src/webserver.rs

@@ -11,8 +11,8 @@ use tokio::io::AsyncWriteExt;
 use tracing::*;
 
 use crate::{
-    configuration::Config, messages::*, servers::send_termination_message, AppState::AppState,
-    ControlledProgram::ControlledProgramDescriptor,
+    app_state::AppState, configuration::Config, controlled_program::ControlledProgramDescriptor,
+    master::SlaveConnection, messages::*, servers::send_termination_message,
 };
 #[no_mangle]
 pub async fn handle_ws_upgrade(ws: WebSocketUpgrade, State(state): State<AppState>) -> Response {
@@ -188,7 +188,7 @@ async fn process_message(text: String, state: AppState) {
                     for slave in slave_servers.iter_mut() {
                         info!(
                             "Writing to slave: {}",
-                            serde_json::to_string_pretty(slave).unwrap()
+                            serde_json::to_string_pretty::<SlaveConnection>(slave).unwrap()
                         );
                         let res = slave
                             .write_stdin(value.server_name.clone(), value.value.clone())